diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a17790778ef2..ad738d73a1de 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ You'll need to sign one of these before any code contributions will be accepted
 (Currently, the signed CLA must be posted or scanned/emailed directly to Gradleware. We're still working on our electronic signing process).
     1. Download, print and fill out the CLA, entering all of the requested personal information (Name, E-Mail, Mailing Address, Telephone, Country).
     2. Sign the CLA.
-    3. Post the document to one of the Gradleware offices listed at http://www.gradleware.com/contact, or scan and email the document to info@gradleware.com.
+    3. Post the document to one of the Gradleware offices listed at http://www.gradleware.com/contact, or scan and email the document to info@gradleware.com (please include your GitHub username in the email or letter so we know who you are).
 2. Before starting to work on a feature or a fix, it's generally a good idea to open a discussion about your proposed changes on the Gradle Developer List (dev@gradle.codehaus.org). 
 Doing so helps to ensure that:
     1. You understand how your proposed changes fit with the strategic goals of the Gradle project.
diff --git a/build.gradle b/build.gradle
index 4de6d0fcd7ed..be0e137ded2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,7 @@ import org.gradle.build.Install
 import org.gradle.build.BuildTypes
 import org.gradle.build.TestReportAggregator
 
+
 defaultTasks 'assemble'
 apply plugin: 'java-base'
 archivesBaseName = 'gradle'
@@ -110,6 +111,7 @@ apply from: "gradle/classycle.gradle"
 apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle"
 apply from: "gradle/testSetup.gradle"
 apply from: "gradle/testGroupings.gradle"
+apply from: "gradle/analytics.gradle"
 
 allprojects {
     group = 'org.gradle'
@@ -158,6 +160,7 @@ dependencies {
     runtime project(':wrapper')
     gradlePlugins pluginProjects
     gradlePlugins project(':coreImpl')
+    gradlePlugins project(':pluginUse')
 }
 
 task verifyIsProductionBuildEnvironment << {
diff --git a/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/docbook/JavadocConverter.java b/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/docbook/JavadocConverter.java
index 64f27b65d07d..56293581e2e2 100644
--- a/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/docbook/JavadocConverter.java
+++ b/buildSrc/src/main/groovy/org/gradle/build/docs/dsl/docbook/JavadocConverter.java
@@ -330,6 +330,7 @@ private HtmlElementTranslatingHandler(DocBookBuilder nodes, Document document) {
             elementToElementMap.put("ol", "orderedlist");
             elementToElementMap.put("li", "listitem");
             elementToElementMap.put("em", "emphasis");
+            elementToElementMap.put("strong", "emphasis");
             elementToElementMap.put("i", "emphasis");
             elementToElementMap.put("b", "emphasis");
             elementToElementMap.put("code", "literal");
diff --git a/buildSrc/src/test/groovy/org/gradle/build/docs/dsl/docbook/JavadocConverterTest.groovy b/buildSrc/src/test/groovy/org/gradle/build/docs/dsl/docbook/JavadocConverterTest.groovy
index 3124e3b09c81..c348aa6d8614 100644
--- a/buildSrc/src/test/groovy/org/gradle/build/docs/dsl/docbook/JavadocConverterTest.groovy
+++ b/buildSrc/src/test/groovy/org/gradle/build/docs/dsl/docbook/JavadocConverterTest.groovy
@@ -287,6 +287,16 @@ literal code</programlisting><para> does something.
         format(result.docbook) == '''<para><emphasis>text</emphasis></para>'''
     }
 
+    def convertsAStrongElementToAnEmphasisElement() {
+        _ * classMetaData.rawCommentText >> '<strong>text</strong>'
+
+        when:
+        def result = parser.parse(classMetaData, listener)
+
+        then:
+        format(result.docbook) == '''<para><emphasis>text</emphasis></para>'''
+    }
+
     def convertsBAndIElementToAnEmphasisElement() {
         _ * classMetaData.rawCommentText >> '<i>text</i> <b>other</b>'
 
diff --git a/design-docs/component-metadata.md b/design-docs/component-metadata.md
index 243d8275bbf7..8978d07e45eb 100644
--- a/design-docs/component-metadata.md
+++ b/design-docs/component-metadata.md
@@ -132,12 +132,13 @@ Add a "changing" property to `ComponentMetadataDetails`.
     * Static dependency
     * Dynamic dependency (that is, the dependency may refer to different components over time, but the components themselves do not change)
 
-## Use Ivy extra attributes to determine status of module
+## Use Ivy extra info properties to determine status of module
 
-This story makes extra attributes defined in ivy.xml files available to component metadata rules, on request.
+An ivy.xml `<info>` element permits arbitrary child elements with string values. This story makes these extra info properties available to component metadata rules,
+on request.
 
-A rule should declare that these extra attributes form an input to the rule, in which case they will be provided.
-While this is perhaps not important for Ivy extra attributes, which are cheap to determine, this will be more important for
+A rule should declare that these extra info properties form an input to the rule, in which case they will be provided.
+While this is perhaps not important for Ivy properties, which are cheap to determine, this will be more important for
 Artifactory properties (see below).
 
 A medium-term goal is to sync the Component Metadata Rules DSL with the new general-purpose Rules DSL. So the same mechanism will be
@@ -146,59 +147,42 @@ simply attempt to introduce a DSL to declare such rules.
 
 ### User visible changes
 
-Option1: Typed ComponentMetadataDetails:
-
-    componentMetadata {
-        eachComponent { IvyModuleMetadataDetails details ->
-            if (details.ivyExtraAttributes['my-custom-attribute'] == 'value') {
-                details.status == 'release'
-            }
-        }
+    interface IvyModuleDescriptor {
+        Map<String, String> extraInfo
     }
 
-Option2: Additional parameters:
-
     componentMetadata {
-        eachComponent { ComponentMetadataDetails details, IvyExtraAttributes ivyAttributes ->
-            if (ivyAttributes['my-custom-attribute'] == 'value') {
+        eachComponent { ComponentMetadataDetails details, IvyModuleDescriptor ivyModule ->
+            if (ivyModule.extraInfo['my-custom-attribute'] == 'value') {
                 details.status == 'release'
             }
         }
     }
 
-Option3: Limit rule applicability (this might be useful in addition to one of the above):
-
-    componentMetadata {
-        eachComponent.withType(IvyModule) {
-            if (it.ivyAttributes['my-custom-attribute'] == 'value') {
-                it.status == 'release'
-            }
-        }
-    }
-
-    // This could later be extended with
-    eachComponent.withType(IvyModule).matching({ group == 'myorg' }) {
-        // custom rule that only applies to my internal modules
-    }
-
 ### Implementation
 
 * Add a model for Ivy-specific module metadata and make this available via `ModuleVersionMetaData`
+    * Include any name/value pairs defined as child elements of the `<info>` element. Do not include the namespace qualifier.
     * The actual values should already be available (and cached) via the underlying Ivy ModuleDescriptor
-    * The API should assume that a number of custom domain metadata elements may be present
-* For any rule defined that requires Ivy extra attributes to be processed, then Ivy extra attributes will be made available as per the DSL chosen
+    * The API should assume that other metadata models may be present as well
+* For any rule that declares IvyModuleDescriptor as an input:
+    * Provide the IvyModuleDescriptor as input where the resolved module came from an ivy repository
+    * Do not execute the rule where the resolved module does not have an associated ivy.xml file
 
 ### Test coverage
 
-* Publish with arbitrary extra attributes, and ensure these are available in resolve.
+* Publish with arbitrary extra info properties, and ensure these are available in resolve.
 * Publish again with changed values:
     * Original values are take from cache
     * New values are obtained when changing module is refreshed
-* Component metadata rule does not have access to ivy extra attributes if not declared as rule input
+* Component metadata rule does not have access to ivy extra info properties if not declared as rule input
 * Component metadata rule is not evaluated for non-ivy module when rule declares ivy attributes as input
 * Resolve with rule that does not have ivy extra attributes as input. Modify rule to include those inputs and resolve again
   Attributes are made available to rule (extra HTTP requests are OK, but not required).
 
+### Open issues
+
+
 ## Use Artifactory properties to determine status of module
 
 This story makes it possible to access published Artifactory properties from within a Component Metadata Rule:
diff --git a/design-docs/continuous-delivery-for-c-plus-plus.md b/design-docs/continuous-delivery-for-c-plus-plus.md
index 66e7ab604d5f..1defc8a4050c 100644
--- a/design-docs/continuous-delivery-for-c-plus-plus.md
+++ b/design-docs/continuous-delivery-for-c-plus-plus.md
@@ -570,6 +570,7 @@ The implementation will also remove stale object files.
 
 - Need to handle `#import` with Visual C++, which may reference a `.tld` file.
 - Should not parse headers that we deem to be unchanging: 'system' libraries, unchanging repository libraries, etc.
+- Implementation currently locks the task artifact cache while compiling
 
 ## Story: Modify command line arguments for binary tool prior to execution
 
@@ -1121,6 +1122,8 @@ This story introduces a set of headers that are visible to all the source files
 
 - Default location for the implementation headers
 - Rename `lib()` to `dependsOn()` or similar?
+- Model 'implicit' headers: in the same directory as the source files or included via relative path.
+    - Need to make these available in the IDE and include in compile task inputs
 
 ### Story: Introduce public headers for native libraries
 
@@ -1239,6 +1242,7 @@ This story moves definition and configuration of the source sets for a component
   built-in tools.
 - Fix `TargetPlatformConfiguration` and `PlatformToolChain` to make them extensible, so that not every configuration supports every tool.
 - Gcc and Clang tool chains need to provide the correct compile and link time arguments on OS X and Linux.
+- Add test coverage on Windows
 
 ### Story: Incremental compilation for Objective-C and Objective-C++
 
@@ -1267,6 +1271,8 @@ this consistent with the way that tool arguments are configured in a tool chain.
 * Replace `PlatformConfigurableToolChain.addPlatformConfiguration` with `PlatformConfigurableToolChain.target(Platform..., Action<ConfigurableToolChain>)`
 * Replace the built-in `TargetPlatformConfiguration` actions with `Action<ConfigurableToolChain>`
 * If `PlatformConfigurableToolChain.target()` is called on a tool chain, then the default target configurations are removed.
+* Documentation describes how to define a new platform.
+* Documentation describes how to configure a tool for an existing platform.
 
 ### User visible changes
 
@@ -1305,6 +1311,56 @@ this consistent with the way that tool arguments are configured in a tool chain.
 * When no Platform architecture/os is defined, assume the current platform architecture/os, not the tool chain default.
     * This will require detecting the current platform, and supplying the correct tool chain arguments when building.
 
+
+## Story: Modify command line arguments for visualCpp toolchain prior execution
+
+provide a 'hook' allowing the build author to control the exact set of arguments passed to a visualcpp toolchain executable.
+This will allow a build author to work around any limitations in Gradle, or incorrect assumptions that Gradle makes.
+
+### Implementation
+
+* Change `VisualCppToolChain` to extend `ExtendableToolChain` and register `linker` and `staticLibArchiver` tools
+* Move registration of cpp, windows-rc and assembler tools in VisualCppToolChain to according plugins
+* Extract `CommandLineToolChain` interface out of `Gcc` and introduce similar functionality to VisualCpp and Clang tool chains.
+* Move setter/getter of executables in into GccCommandLineToolConfiguration
+* Add according documentation to userguide/DSL reference and update release notes
+
+### User visible changes
+    	
+		apply plugin:'cpp'    
+		
+		model {
+            toolChains {
+                visualCpp(VisualCpp) {
+                    cppCompiler.withArguments { args ->
+                            args << "-DFRENCH"
+                    }
+                }
+            }
+        }
+
+
+### Test coverage
+
+* Can tweak arguments for VisualCpp, Gcc and Clang
+
+## Story: Allow configuration of tool chain executables on a per-platform basis (Gcc based toolchains)
+
+### Implementation
+
+* In AbstractGccCompatibleToolChain change initTools method to configure configurableToolChain instead after targetPlatformConfigurationConfiguration is applied 
+
+### Test coverage
+
+* Can use g++ instead of gcc for compiling C sources
+* Can use custom executable
+
+### Open issues
+
+* path configuration is currently not possible on a per platform basis. full paths to executables must be used or executable must be on 
+system path.
+
+
 ## Story: Improved DSL for tool chain configuration
 
 This story improves the DSL for tweaking arguments for a command-line tool that is part of a tool chain, and extends this
@@ -1316,8 +1372,7 @@ ability to all command-line based tool chains. It also permits the configuration
 * Rename `GccTool` to `CommandLineTool` and change to have `withInvocation(Action<CommandLineToolInvocation>)` in place of `withArguments`
 * Remove tool-specific getters from `Gcc`, and instead make `Gcc` serve as a NamedDomainObjectSet of `CommandLineTool` instances.
     * Continue to register a `CommandLineTool` for every supported language.
-* Allow the `eachInvocation` method to override the default executable to use.
-* Extract `CommandLineToolChain` interface out of `Gcc` and introduce similar functionality to VisualCpp and Clang tool chains.
+* Allow the `withInvocation` method to override the default executable to use.
 * Add a sample, user-guide documentation and note the breaking change in the release notes.
 * Consolidate various `ArgsTransformer` implementations so that most/all simply set/modify args on a `CommandLineToolInvocation`.
 
@@ -1354,6 +1409,7 @@ ability to all command-line based tool chains. It also permits the configuration
 
 * Only to register a `CommandLineTool` for languages that are supported by build.
    * Need to make it easy to have centralised tool chain configuration that works regardless of languages in effect.
+* Make it simpler to add support for new languages to existing tool chain implementations
 
 ## Story: Only use gcc/g++ front-ends for GCC tool chain
 
@@ -1421,6 +1477,12 @@ This story also aggregates a bunch of review items that relate to Architecture a
 - How to make Platform instance immutable
 - Consistent API for Architecture and OperatingSystem: either public method on both [os.isWindows(),arch.isAmd64()] or only on internal api.
 - Include ABI in architecture so that the correct prebuilt library can be selected for a tool chain
+- When no Platform architecture/os is defined, assume the current platform architecture/os, not the tool chain default.
+    - This will require detecting the current platform, and supplying the correct tool chain arguments when building.
+    - We can then remove the concept of the "tool chain default" platform, and always explicitly tell the tool chain which platform to build for.
+- For GCC, need to probe the output of the compiler to determine exactly what is being created
+- For Clang, need to provide the full `-target <triple>` to define the exact output, or provide a subset and probe the output.
+    - see http://clang.llvm.org/docs/CrossCompilation.html
 
 ## Story: Include all macro definitions in Visual Studio project configuration
 
@@ -1878,6 +1940,11 @@ TBD
 - Don't create compile tasks for empty source sets
 - Compile windows resource files with gcc/clang using [`windres`](http://sourceware.org/binutils/docs/binutils/windres.html)
 
+### Incremental compile
+
+- Perform incremental compile when header is included via simple macro definition
+- Keep a separate, build-scoped cache of file -> parsed includes. This would prevent need for reparsing per-variant and per-component.
+- Detect changes to headers that are implicit on the include path via the tool chain
 
 ## Target platforms
 
@@ -1913,11 +1980,14 @@ TBD
     - A component packaging that satisfies multiple points in the variant space.
     - Use `lipo` to merge two binaries into a single universal binary.
     - Transforms the meta-data for the component - same set of variants but different set of binaries.
+- Use separate directories for output binaries, rather than encoding all dimensions in the name: eg `flavor/platform/buildType/myLib.so`
 
 ## Toolchains
 
 - DSL to declare that a toolchain supports certain target platform, and how to invoke the tools to do so.
 - Introduce `XCode`, `Cygwin`, `MinGW` toolchains, to allow selection of specific gcc or clang implementations.
+    - Use the `XCode` tool chain to determine mac-specific gcc args
+    - Use the `Cygwin` and `MinGW` toolchains to provide additional path requirements for `InstallExecutable` task
 
     toolchains {
         gcc {
@@ -1936,6 +2006,8 @@ TBD
         }
     }
 
+- Prevent configuration of tool chains after availability has been determined.
+
 ## Structure
 
 - Some common plugin that determines which tool-chains to apply
@@ -1953,6 +2025,11 @@ TBD
 - Need to make standard 'build', 'check' lifecycle tasks available too. The `assemble` task should build all buildable variants.
     - Reasonable behaviour when nothing is buildable on the current machine.
 - Come up with consistent naming scheme for language plugins: 'cpp', 'c', 'assembler', 'java-lang', 'scala-lang', etc
+- Windows resources
+    - Automatically add `/noentry` and `/machine` linker args when building resource-only DLL
+    - Actually inspect the binary to determine if there are any exported symbols
+    - Use a model rule to determine if library sources contain windows resources
+
 
 ### Performance
 
@@ -1967,8 +2044,16 @@ TBD
 - Better way to see how the compiler is being invoked
 - Make names less important
 
+## Test coverage
+
+- Update the UnknownOS CI build to run on java 7, and remove the "CAN_INSTALL_EXECUTABLE" test requirement
+- Integration test coverage for 64-bit assembler on all platforms/tool chains.
+- Verify that the correct windows system libraries are available at link time
+    - Use a test app that uses something like WriteFile() to write its hello world message to stdout. If it can link and run, then the paths are probably ok.
+
 # Open issues
 
+* For incremental build with visual c++, use `dumpbin  /RAWDATA` to strip timestamps from binary files before comparison
 * Add ABI as an aspect of target platform.
 * Output of any custom post link task should be treated as input to anything that depends on the binary.
 * Route stdout to info level when linking a shared library using visual studio, to get rid of the pointless notice.
@@ -2003,3 +2088,6 @@ TBD
 * JNI plugin generates native header, and sets up the JNI stuff in $java.home as a platform library.
 * Model minimum OS version.
     * For OS X can use -mmacosx-version-min option.
+* Clean task for a binary
+* Update CDT support to match Visual Studio support
+* Rename 'install' task to indicate that it's installing a developer image
diff --git a/design-docs/dependency-management-bug-fixes.md b/design-docs/dependency-management-bug-fixes.md
index 76694f9c87d8..1d4c70cfd892 100644
--- a/design-docs/dependency-management-bug-fixes.md
+++ b/design-docs/dependency-management-bug-fixes.md
@@ -3,32 +3,6 @@ This feature is really a bucket for key things we want to fix in the short-term
 
 As this 'feature' is a list of bug fixes, this feature spec will not follow the usual template.
 
-# GRADLE-2861 Handle parent pom with unknown placeholders
-
-See [GRADLE-2861](http://issues.gradle.org/browse/GRADLE-2861)
-
-Currently, the POM parser (inherited from Ivy) attaches special extra attributes to the `ModuleDescriptor` for a POM. These are later used by the POM parser
-when it parses a child POM. Sometimes these attributes cause badly formed XML to be generated, hence the failure listed in the jira issue.
-
-The solution is to have the parser request the parent POM artifact directly, rather than indirectly via the module meta-data:
-
-1. Add a `LocallyAvailableExternalResource getArtifact(Artifact)` method to `DescriptorParseContext`.
-    - Implementation can reuse the `ModuleVersionResolveResult` from the existing `getModuleDescriptor()` method. This result includes an `ArtifactResolver` which
-      can be used to resolve an `Artifact` to a `File`. There's an example of how to adapt a `File` to a `LocallyAvailableExternalResource` instance in
-      `AbstractModuleDescriptorParser.parseMetaData()`.
-2. Change the `GradlePomModuleDescriptorParser.parseOtherPom()` to use this new method to fetch and parse the parent POM artifact, rather than using the parsed
-   `ModuleDescriptor` for the parent. For this step, can continue to represent the parent pom using a `ModuleDescriptor` inside the parser.
-3. Change `GradlePomModuleDescriptorParser` to represent the parent POM using a `PomReader` rather than a `ModuleDescriptor`.
-4. Clean out `GradlePomModuleDescriptorBuilder` so that it no longer defines any extra properties on the parsed `ModuleDescriptor`.
-5. Change `IvyXmlModuleDescriptorParser.parseOtherIvyFile()` to use the new method to fetch and parse the Ivy descriptor artifact.
-6. Remove `DescriptorParseContext.getModuleDescriptor()`. It should no longer be required.
-
-## Test coverage
-
-* Unignore the existing test case in `BadPomFileResolveIntegrationTest`.
-* Add a test case to `MavenParentPomResolveIntegrationTest` to cover two Maven modules that share a common parent.
-* Add a test case to `MavenParentPomResolveIntegrationTest` to cover a Maven module that has a parent and grandparent module.
-
 # Conflict resolution considers conflicts on production classes
 
 See [this post](http://forums.gradle.org/gradle/topics/npe_in_dependencygraphbuilder_dependencyedge_getfailure)
@@ -54,65 +28,6 @@ See [GRADLE-2516](http://issues.gradle.org/browse/GRADLE-2516)
 
 - Change the local dependencies (eg `gradleApi()`, `localGroovy()`) to imply the various modules that they contribute to the result.
 
-# Latest status dynamic versions work across multiple repositories
-
-See [GRADLE-2502](http://issues.gradle.org/browse/GRADLE-2502)
-
-### Test coverage
-
-1. Using `latest.integration`
-    1. Empty repository fails with not found.
-    2. Publish `1.0` and `1.1` with status `integration`. Resolves to `1.1`.
-    3. Publish `1.2` with status `release`. Resolves to `1.2`
-    4. Publish `1.3` with no ivy.xml. Resolves to `1.3`.
-2. Using `latest.milestone`
-    1. Empty repository fails with not found.
-    2. Publish `2.0` with no ivy.xml. Fails with not found.
-    3. Publish `1.3` with status `integration`. Fails with not found.
-    4. Publish `1.0` and `1.1` with ivy.xml and status `milestone`. Resolves to `1.1`.
-    5. Publish `1.2` with status `release`. Resolves to `1.2`
-3. Using `latest.release`
-    1. Empty repository fails with not found.
-    2. Publish `2.0` with no ivy.xml. Fails with not found.
-    3. Publish `1.3` with status `milestone`. Fails with not found.
-    4. Publish `1.0` and `1.1` with ivy.xml and status `release`. Resolves to `1.1`.
-4. Multiple repositories.
-5. Checking for changes. Using `latest.release`
-    1. Publish `1.0` with status `release` and `2.0` with status `milestone`.
-    2. Resolve and assert directory listing and `1.0` artifacts downloaded.
-    3. Resolve and assert directory listing downloaded.
-    4. Publish `1.1` with status `release`.
-    5. Resolve and assert directory listing and `1.1` artifacts downloaded.
-6. Maven integration
-    1. Publish `1.0`. Check `latest.integration` resolves to `1.0` and `latest.release` fails with not found.
-    2. Publish `1.1-SNAPSHOT`. Check `latest.integration` resolves to `1.1-SNAPSHOT` and `latest.release` fails with not found.
-7. Version ranges
-8. Repository with multiple patterns.
-9. Repository with `[type]` in pattern before `[revision]`.
-10. Multiple dynamic versions match the same remote revision.
-
-### Implementation strategy
-
-Change ExternalResourceResolver.getDependency() to use the following algorithm:
-1. Calculate an ordered list of candidate versions.
-    1. For a static version selector the list contains a single candidate.
-    2. For a dynamic version selector the list is the full set of versions for the module.
-        * For a Maven repository, this is determined using `maven-metadata.xml` if available, falling back to a directory listing.
-        * For an Ivy repository, this is determined using a directory listing.
-        * Fail if directory listing is not available.
-2. For each candidate version:
-    1. If the version matcher does not accept the module version, continue.
-    2. Fetch the module version meta-data, as described below. If not found, continue.
-    3. If the version matcher requires the module meta-data and it does not accept the meta-data, continue.
-    4. Use the module version.
-3. Return not found.
-
-To fetch the meta-data for a module version:
-1. Download the meta data descriptor resource, via the resource cache. If found, parse.
-    1. Validate module version in meta-data == the expected module version.
-2. Check for a jar artifact, via the resource cache. If found, use default meta-data. The meta-data must have `default` set to `true` and `status` set to `integration`.
-3. Return not found.
-
 # Correctness issues in HTTP resource caching
 
 * GRADLE-2328 - invalidate cached HTTP/HTTPS resource when user credentials change.
@@ -171,59 +86,6 @@ TODO - flesh this out
 
 TODO - flesh this out
 
-# Correct handling of packaging and dependency type declared in poms
-
-* GRADLE-2188: Artifact not found resolving dependencies with packaging/type "orbit"
-
-### Description
-Our engine for parsing Maven pom files is borrowed from ivy, and assumes the 'packaging' element equals the artifact type, with a few exceptions (ejb, bundle, eclipse-plugin, maven-plugin).
-This is different from the way Maven does the calculation, which is:
-* Type defaults to 'jar' but can be explicitly declared.
-* Maven maps the type to an [extension, classifier] combination using some hardcoded rules. Unknown types are mapped to [type, ""].
-* To resolve the artefact, maven looks for an artefact with the given artifactId, version, classifier and extension.
-
-### Strategic solution
-
-At present, our model of an Artifact is heavily based on ivy; for this fix we can introduce the concept of mapping between our internal model and a repository-centric
-artifact model. This will be a small step toward an independent Gradle model of artifacts, which then maps to repository specific things link extension, classifier, etc.
-
-### User visible changes
-
-* When the dependency declaration has no 'type' specified, or a 'type' that maps to the extension 'jar'
-    * Resolution of a POM module with packaging in ['', 'pom', 'jar', 'ejb', 'bundle', 'maven-plugin', 'eclipse-plugin'] will not change
-    * Resolution of a POM with packaging 'foo' that maps to 'module.foo', a deprecation warning will be emitted and the artifact 'module.foo' will be used
-    * Resolution of a POM with packaging 'foo' that maps to 'module.jar', the artifact 'module.jar' will be successfully found. (ie 'orbit'). An extra HTTP
-      request will be required to first look for 'module.foo'.
-* When the dependency declaration has a 'type' specified that maps to an extension 'ext' (other than 'jar')
-    * Resolution of a POM module with packaging in ['pom', 'jar', 'ejb', 'bundle', 'maven-plugin', 'eclipse-plugin'] will emit a deprecation warning before using 'module.jar' if it exists
-    * Resolution of a POM with packaging 'foo' and actual artifact 'module.foo', a deprecation warning will be emitted and the artifact 'module.foo' will be used
-    * Resolution of a POM with packaging 'foo' and actual artifact 'module.ext', the artifact 'module.ext' will be successfully found. An extra HTTP
-      request will be required to first look for 'module.foo'.
-
-### Integration test coverage
-
-* Coverage for resolving pom dependencies referenced in various ways:
-    * Need modules published in maven repositories with packaging = ['', 'pom', 'jar', 'war', 'eclipse-plugin', 'custom']
-    * Test resolution of artifacts in these modules via
-        1. Direct dependency in a Gradle project
-        2. Transitive dependency in a maven module (pom) which is itself a dependency of a Gradle project
-        3. Transitive dependency in an ivy module (ivy.xml) which is itself a dependency of a Gradle project
-    * For 1. and 2., need dependency declaration with and without type attribute specified
-    * Must verify that deprecation warning is logged appropriately
-* Sad-day coverage for the case where neither packaging nor type can successfully locate the maven artifact. Error message should report 'type'-based location.
-
-### Implementation approach
-
-* Determine 2 locations for the primary artifact:
-    * The 'packaging' location: apply the current logic to determine location from module packaging attribute
-        * Retain current packaging->extension mapping for specific packaging types
-    * The 'type' location: Use maven3 rules to map type->extension+classifier, and construct a location
-* If both locations are the same, use the artifact at that location.
-* If not, look for the artifact in the packaging location
-    * If found, emit a deprecation warning and use that location
-    * If not found, use the artifact from the type location
-* In 2.0, we will remove the packaging->extension mapping and the deprecation warning
-
 # RedHat finishes porting gradle to fedora
 
 * GRADLE-2210: Migrate to maven 3
@@ -280,7 +142,6 @@ And a test that regular resolve succeeds from http repository when settings.xml
 
 # Allow resolution of java-source and javadoc types from maven repositories (and other types: tests, ejb-client)
 
-* GRADLE-201: Enable support for retrieving source artifacts of a module
 * GRADLE-1444: Sources are not downloaded when dependency is using a classifier
 * GRADLE-2320: Support for multiple artifacts with source jars in Eclipse plugin
 
@@ -361,11 +222,6 @@ Until we map these types into the ivy repository model as well:
 
 * GRADLE-2211: Resolved binary executables and libraries do not use the platform specific naming scheme
 
-# Handle pom-only modules in mavenLocal
-
-* GRADLE-2034: Existence of pom file requires that declared artifacts can be found in the same repository
-* GRADLE-2369: Dependency resolution fails for mavenLocal(), mavenCentral() if artifact partially in mavenLocal()
-
 # Support for kerberos and custom authentication
 
 * GRADLE-2335: Provide the ability to implement a custom HTTP authentication scheme for repository access
diff --git a/design-docs/dependency-management-for-jvm-components.md b/design-docs/dependency-management-for-jvm-components.md
new file mode 100644
index 000000000000..8d160c576f95
--- /dev/null
+++ b/design-docs/dependency-management-for-jvm-components.md
@@ -0,0 +1,630 @@
+
+This spec describes some work to allow plugins to define the kinds of components that they produce and consume.
+
+## A note on terminology
+
+There is currently a disconnect in the terminology used for the dependency management component model, and that used
+for the component model provided by the native plugins.
+
+The dependency management model uses the term `component instance` or `component` to refer to what is known as a `binary`
+in the native model. A `component` in the native model doesn't really have a corresponding concept in the dependency
+management model (a `module` is the closest we have, and this is not the same thing).
+
+Part of the work for this spec is to unify the terminology. This is yet to be defined.
+
+For now, this spec uses the terminology from the native component model, using `binary` to refer to what is also
+known as a `component instance` or `variant`.
+
+# Features
+
+## Feature: Build author creates a JVM library with Java sources
+
+### Story: Build author defines JVM library
+
+#### DSL
+
+Project defining single jvm libraries
+
+    apply plugin: 'jvm-component'
+
+    jvm {
+        libraries {
+            main
+        }
+    }
+
+Project defining multiple jvm libraries
+
+    apply plugin: 'jvm-component'
+
+    jvm {
+        libraries {
+            main
+            extra
+        }
+    }
+
+Combining native and jvm libraries in single project
+
+    apply plugin: 'jvm-component'
+    apply plugin: 'native-component'
+
+    jvm {
+        libraries {
+            myJvmLib
+        }
+    }
+    nativeCode
+        libraries {
+            myNativeLib
+        }
+    }
+
+#### Implementation plan
+
+- Introduce `org.gradle.jvm.JvmLibrary`
+- Rename `org.gradle.nativebinaries.Library` to `org.gradle.nativebinaries.NativeLibrary`
+    - Similar renames for `Executable`, `TestSuite` and all related classes
+- Introduce a common superclass for `Library`.
+- Extract `org.gradle.nativebinaries.LibraryContainer` out of `nativebinaries` project into `language-base` project,
+  and make it an extensible polymorphic container.
+    - Different 'library' plugins will register a factory for library types.
+- Add a `jvm-component` plugin, that:
+    - Registers support for `JvmLibrary`.
+    - Adds a single `JvmLibraryBinary` instance to the `binaries` container for every `JvmLibrary`
+    - Creates a binary lifecycle task for generating this `JvmLibraryBinary`
+    - Wires the binary lifecycle task into the main `assemble` task.
+- Rename `NativeBinariesPlugin` to `NativeComponentPlugin` with id `native-component`.
+- Move `Binary` and `ClassDirectoryBinary` to live with the runtime support classes (and not the language support classes)
+- Extract a common supertype `Application` for NativeExecutable, and a common supertype `Component` for `Library` and `Application`
+- Introduce a 'filtered' view of the ExtensiblePolymorphicDomainObjectContainer, such that only elements of a particular type are returned
+  and any element created is given that type.
+    - Add a backing 'components' container that contains all Library and Application elements
+    - Add 'jvm' and 'nativeCode' extensions for namespacing different library containers
+    - Add 'nativeCode.libraries' and 'jvm.libraries' as filtered containers on 'components', with appropriate library type
+    - Add 'nativeCode.executables' as filtered view on 'components
+    - Use the 'components' container in native code where currently must iterate separately over 'libraries' and 'executables'
+
+#### Test cases
+
+- Can apply `jvm-component` plugin without defining library
+    - No binaries defined
+    - No lifecycle task added
+- Define a jvm library component
+    - `JvmLibraryBinary` added to binaries container
+    - Lifecycle task available to build binary: skipped when no sources for binary
+    - Binary is buildable: can add dependent tasks which are executed when building binary
+- Define and build multiple java libraries in the same project
+  - Build library jars individually using binary lifecycle task
+  - `gradle assemble` builds single jar for each library
+- Can combine native and JVM libraries in the same project
+  - `gradle assemble` executes lifecycle tasks for each native library and each jvm library
+
+#### Open issues
+
+- Come up with a better name for JvmLibraryBinary, or perhaps add a `JarBinary` subtype
+- Consider splitting up `assemble` into various lifecycle tasks. There are several use cases:
+    - As a developer, build me a binary I can play with or test in some way.
+    - As part of some workflow, build all binaries that should be possible to build in this specific environment. Fail if a certain binary cannot be built.
+      For example, if I'm on Windows build all the Windows variants and fail if the Windows SDK (with 64bit support) is not installed.
+      Or, if I'm building for Android, fail if the SDK is not installed.
+    - Build everything. Fail if a certain binary cannot be built.
+
+### Story: Build author creates JVM library jar from Java sources
+
+When a JVM library is defined with Java language support, then binary is built from conventional source set locations:
+
+- Has a single Java source set hardcoded to `src/myLib/java`
+- Has a single resources source set hardcoded to `src/myLib/resources`
+
+#### DSL
+
+Java library using conventional source locations
+
+    apply plugin: 'jvm-component'
+    apply plugin: 'java-lang'
+
+    jvm {
+        libraries {
+            myLib(JvmLibrary)
+        }
+    }
+
+
+Combining jvm-java and native (multi-lang) libraries in single project
+
+    apply plugin: 'jvm-component'
+    apply plugin: 'java-lang'
+
+    apply plugin: 'native-component'
+    apply plugin: 'cpp-lang'
+    apply plugin: 'c-lang'
+
+    jvm {
+        libraries {
+            myJvmLib
+        }
+    }
+    nativeCode {
+        libraries {
+            myNativeLib
+        }
+    }
+
+#### Implementation plan
+
+- Replace the current 'java-lang' plugin with a simpler one that does not know about legacy conventions
+- For each JvmLibrary:
+    - Adds a single ResourceSet for 'src/${component}/resources'
+    - Adds a single JavaSourceSet for 'src/${component}/java'
+- Each created JvmLibraryBinary has the source sets of it's JvmLibrary
+- Create a ProcessResources task for each ResourceSet for a JvmLibraryBinary
+    - copy resources to `build/classes/${binaryName}`
+- Create a CompileJava task for each JavaSourceSet for a JvmLibraryBinary
+    - compile classes to `build/classes/${binaryName}`
+- Create a Jar task for each JvmLibraryBinary
+    - produce jar file at `build/binaries/${binaryName}/${componentName}.jar
+- Rejig the native language plugins so that '*-lang' + 'native-components' is sufficient to apply language support
+    - Existing 'cpp', 'c', etc plugins will simply apply '*-lang' and 'native-components'
+
+#### Test cases
+
+- Define and build the jar for a java library (assert jar contents for each case)
+    - With no sources or resources
+    - With sources but no resources
+    - With resources but no sources
+    - With both sources and resources
+- Reports failure to compile source
+- Compiled sources and resources are available in a common directory
+- All generated resources are removed when all resources source files are removed.
+- Can build native and JVM libraries in the same project
+  - `gradle assemble` builds each native library and each jvm library
+
+#### Open issues
+
+- Need `groovy-lang` and `scala-lang` plugins
+- All compiled classes are removed when all java source files are removed.
+
+### Story: Legacy JVM language plugins declare a jvm library
+
+#### Test cases
+
+- JVM library with name `main` is defined with any combination of `java`, `groovy` and `scala` plugins applied
+- Can build legacy jvm library jar using standard lifecycle task
+
+#### Open issues
+
+- The legacy application plugin should also declare a jvm application.
+
+## Feature: Custom plugin defines a custom library type
+
+### Story: plugin declares its own library type
+
+Add a sample plugin that declares a custom library type:
+
+    apply plugin: 'my-sample'
+
+    mySample {
+        // can use its own DSL
+        ...
+    }
+
+    // Library is also visible in libraries container
+    assert libraries.withType(SampleLibrary).size() == 1
+
+A custom library type:
+- Extends or implements some public base `Library` type.
+- Has no dependencies.
+- Produces no artifacts.
+
+### Story: Custom library produces custom binaries
+
+Change the sample plugin so that it declares its own binary type for the libraries it defines:
+
+    apply plugin: 'my-sample'
+
+    mySample {
+        // can use its own DSL
+        ...
+    }
+
+    // Binaries are also visible in the binaries container
+    assert binaries.withType(SampleBinary).size() == 2
+
+Allow a plugin to declare the binaries for a custom library.
+
+A custom binary:
+- Extends or implements some public base `LibraryBinary` type.
+- Has some lifecycle task to build its outputs.
+
+Running `gradle assemble` will build each library binary.
+
+### Story: Custom binary is build from Java sources
+
+Change the sample plugin so that it compiles Java source to produce its binaries
+
+- Uses same conventions as a Java library.
+- No dependencies.
+
+## Feature: Build author declares that a Java library depends on a Java library produced by another project
+
+For example:
+
+    apply plugin: 'new-java'
+
+    jvm {
+        libraries {
+            myLib {
+                dependencies {
+                    project 'other-project' // Infer the target library
+                    project 'other-project' library 'my-lib'
+                }
+            }
+        }
+    }
+
+When the project attribute refers to a project with a component plugin applied:
+
+- Select the target library from the libraries of the project. Assert that there is exactly one matching JVM library.
+- At compile time, include the library's jar binary only.
+- At runtime time, include the library's jar binary and runtime dependencies.
+
+When the project attribute refers to a project without a component plugin applied:
+
+- At compile and runtime, include the artifacts and dependencies from the `default` configuration.
+
+### Open issues
+
+- Should be able to depend on a library in the same project.
+- Need an API to query the various classpaths.
+- Need to be able to configure the resolution strategy for each usage.
+
+## Feature: Build author declares that a Java library depends on an external Java library
+
+For example:
+
+    apply plugin: 'java-components'
+
+    jvm {
+        libraries {
+            myLib {
+                dependencies {
+                    library "myorg:mylib:2.3"
+                }
+            }
+        }
+    }
+
+This makes the jar of `myorg:mylib:2.3` and its dependencies available at both compile time and runtime.
+
+### Open issues
+
+- Using `library "some:thing:1.2"` will conflict with a dependency `library "someLib"` on a library declared in the same project.
+Could potentially just assert that component names do not contain ':' (should do this anyway).
+
+## Feature: Build author declares that legacy Java project depends on a Java library produced by another project
+
+For example:
+
+    apply plugin: 'java'
+
+    dependencies {
+        compile project: 'other-project'
+    }
+
+When the project attribute refers to a project with a component plugin applied:
+
+- Select the target library from the libraries of the project. Assert that there is exactly one JVM library.
+- At compile time, include the library's jar binary only.
+- At runtime time, include the library's jar binary and runtime dependencies.
+
+### Open issues
+
+- Allow `library` attribute?
+
+## Feature: Build user views the dependencies for the Java libraries of a project
+
+The dependency reports show the dependencies of the Java libraries of a project:
+
+- `dependencies` task
+- `dependencyInsight` task
+- HTML report
+
+## Feature: Build author declares that a native component depends on a native library
+
+Add the ability to declare dependencies directly on a native component, using a similar DSL as for Java libraries:
+
+    apply plugin: 'cpp'
+
+    libraries {
+        myLib {
+            dependencies {
+                project 'other-project'
+                library 'my-prebuilt'
+                library 'local-lib' linkage 'api'
+            }
+        }
+    }
+
+Also reuse the dependency DSL at the source set level:
+
+    apply plugin: 'cpp'
+
+    libraries {
+        myLib
+    }
+
+    sources {
+        myLib {
+            java {
+                dependencies {
+                    project 'other-project'
+                    library 'my-lib' linkage 'api'
+                }
+            }
+        }
+    }
+
+## Feature: Build author declares that the API of a Java library requires some Java library
+
+For example:
+
+    apply plugin: 'new-java'
+
+    libraries {
+        myLib {
+            dependencies {
+                api {
+                    project 'other-project' library 'other-lib'
+                }
+            }
+        }
+    }
+
+This makes the API of the library 'other-lib' available at compile time, and the runtime artifacts and dependencies of 'other-lib' available at
+runtime.
+
+It also exposes the API of the library 'other-lib' as part of the API for 'myLib', so that it is visible at compile time for any other component that
+depends on 'myLib'.
+
+The default API of a Java library is its Jar file and no dependencies.
+
+### Open issues
+
+- Add this to native libraries
+
+## Feature: Build author declares that a Java library requires some Java library at runtime
+
+For example:
+
+    apply plugin: 'new-java'
+
+    libraries {
+        myLib {
+            dependencies {
+                runtime {
+                    project 'other-project' library 'other-lib'
+                }
+            }
+        }
+    }
+
+### Open issues
+
+- Add this to native libraries
+
+## Feature: Build author declares the target JVM for a Java library
+
+For example:
+
+    apply plugin: 'new-java'
+
+    platforms {
+        // Java versions are visible here
+    }
+
+    libraries {
+        myLib {
+            buildFor platforms.java7
+        }
+    }
+
+This declares that the bytecode for the binary should be generated for Java 7, and should be compiled against the Java 7 API.
+Assume that the source also uses Java 7 language features.
+
+When a library `a` depends on another library `b`, assert that the target JVM for `b` is compatible with the target JVM for `a` - that is
+JVM for `a` is same or newer thatn the JVM for `b`.
+
+The target JVM for a legacy Java library is the lowest of `sourceCompatibility` and `targetCompatibility`.
+
+### Open issues
+
+- Need to discover or configure the JDK installations.
+
+## Feature: Build author declares a custom target platform for a Java library
+
+For example:
+
+    apply plugin: 'new-java'
+
+    platforms {
+        myContainer {
+            runsOn platforms.java6
+            provides {
+                library 'myorg:mylib:1.2'
+            }
+        }
+    }
+
+    libraries {
+        myLib {
+            buildFor platforms.myContainer
+        }
+    }
+
+This defines a custom container that requires Java 6 or later, and states that the library should be built for that container.
+
+This includes the API of 'myorg:mylib:1.2' at compile time, but not at runtime. The bytecode for the library is compiled for java 6.
+
+When a library `a` depends on another library `b`, assert that both libraries run on the same platform, or that `b` targets a JVM compatible with
+the JVM for the platform of `a`.
+
+### Open issues
+
+- Rework the platform DSL for native component to work the same way.
+- Retrofit into legacy java and web plugins.
+
+## Feature: Build author declares dependencies for a Java source set
+
+For example:
+
+    apply plugin: 'new-java'
+
+    libraries {
+        myLib {
+            source {
+                java {
+                    runsOn platforms.java7
+                    dependencies {
+                        project 'some-project'
+                        library 'myorg:mylib:1.2'
+                        runtime {
+                            ...
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+Will have to move source sets live with the library domain object.
+
+### Open issues
+
+- Fail or skip if target platform is not applicable for the the component's platform?
+
+## Feature: Build author declares dependencies for custom library
+
+Change the sample plugin so that it allows Java and custom libraries to be used as dependencies:
+
+    apply plugin: 'my-sample'
+
+    libraries {
+        myCustomLib {
+            dependencies {
+                project 'other-project'
+                customUsage {
+                    project 'other-project' library 'some-lib'
+                }
+            }
+        }
+    }
+
+Allow a plugin to resolve the dependencies for a custom library, via some API. Target library must produce exactly
+one binary of the target type.
+
+Move the hard-coded Java library model out of the dependency management engine and have the jvm plugins define the
+Java library type.
+
+Resolve dependencies with inline notation:
+
+    def compileClasspath = dependencies.newDependencySet()
+                .withType(JvmLibrary.class)
+                .withUsage(Usage.COMPILE)
+                .forDependencies("org.group:module:1.0", ...) // Any dependency notation, or dependency instances
+                .create()
+
+    compileTask.classPath = compileClasspath.files
+    assert compileClasspath.files == compileClasspath.artifactResolutionResult.files
+
+Resolve dependencies based on a configuration:
+
+    def testRuntimeUsage = dependencies.newDependencySet()
+                .withType(JvmLibrary.class)
+                .withUsage(Usage.RUNTIME)
+                .forDependencies(configurations.test.incoming.dependencies)
+                .create()
+    copy {
+        from testRuntimeUsage.artifactResolutionResult.artifactFiles
+        into "libs"
+    }
+
+    testRuntimeUsage.resolutionResult.allDependencies { dep ->
+        println dep.requested
+    }
+
+Resolve dependencies not added a configuration:
+
+    dependencies {
+        def lib1 = create("org.group:mylib:1.+") {
+            transitive false
+        }
+        def projectDep = project(":foo")
+    }
+    def deps = dependencies.newDependencySet()
+                .withType(JvmLibrary)
+                .withUsage(Usage.RUNTIME)
+                .forDependencies(lib1, projectDep)
+                .create()
+    deps.files.each {
+        println it
+    }
+
+### Open issues
+
+- Component type declares usages.
+- Binary declares artifacts and dependencies for a given usage.
+
+## Feature: Build user views the dependencies for the custom libraries of a project
+
+Change the `dependencies`, `dependencyInsight` and HTML dependencies report so that it can report
+on the dependencies of a custom component, plus whatever binaries the component happens to produce.
+
+## Feature: Build author declares target platform for custom library
+
+Change the sample plugin to allow a target JVM based platform to be declared:
+
+    apply plugin: 'my-sample'
+
+    platforms {
+        // Several target platforms are visible here
+    }
+
+    libraries {
+        myCustomLib {
+            minSdk 12 // implies: buildFor platforms.mySdk12
+        }
+    }
+
+## Feature: Java library produces multiple variants
+
+For example:
+
+    apply plugin: 'new-java'
+
+    libraries {
+        myLib {
+            buildFor platforms.java6, platforms.java8
+        }
+    }
+
+Builds a binary for Java 6 and Java 8.
+
+Dependency resolution selects the best binary from each dependency for the target platform.
+
+## Feature: Dependency resolution for native components
+
+## Feature: Build user views the dependencies for the native components of a project
+
+# Open issues and Later work
+
+- Should use rules mechanism.
+- Expose the source and javadoc artifacts for local binaries.
+- Reuse the local component and binary meta-data for publication.
+    - Version the meta-data schemas.
+    - Source and javadoc artifacts.
+- Legacy war and ear plugins define binaries.
+- Java component plugins support variants.
+- Gradle runtime defines Gradle plugin as a type of jvm component, and Gradle as a container that runs-on the JVM.
+- Deprecate and remove support for resolution via configurations.
+- Add a report that shows the details for the components and binaries produced by a project.
diff --git a/design-docs/dependency-management.md b/design-docs/dependency-management.md
index 917f4e2d1029..36c017db04ac 100644
--- a/design-docs/dependency-management.md
+++ b/design-docs/dependency-management.md
@@ -47,49 +47,80 @@ A component instance with an associated (group, module, version) identifier.
 
 See also the completed stories in [dependency-management.md](done/dependency-management.md).
 
-## Story: Dependency reports indicate the source of a component
+## Story: IDE plugins use dependency resolution result to determine IDE class paths
 
-The dependency reporting will change to give some indication of the source of the component:
+This story changes the `idea` and `eclipse` plugins to use the resolution result to determine the IDE project classpath.
 
-For an external component instance, this will be unchanged:
+- Change `IdeDependenciesExtractor` and `JavadocAndSourcesDownloader` to use the resolution result to determine the project and
+  external dependencies.
 
-    +- group:name:1.2
-    +- group:other:1.3 -> group:other:1.3.1
+## Story: Allow the source and Javadoc artifacts for an external Java library to be queried (✓)
 
-For a local component that is not a module version, this will look something like:
+This story introduces an API which allows the source and Javadoc artifacts for a Java library to be queried
+
+- Should be possible to query the artifacts as a single batch, so that, for example, we will be able to resolve and download artifacts
+  in parallel.
+- The API should expose download failures.
+- A component may have zero or more source artifacts associated with it.
+- A component may have zero or more Javadoc artifacts associated with it.
+- Should introduce the concept of a Java library to the result.
+- Should have something in common with the story to expose component artifacts, above.
+- Initial implementation should use the Maven style convention to currently used by the IDE plugins. The a later story will improve this for Ivy repositories.
 
-    +- project :some:path
-    +- project :some:path -> group:other:1.2
+### Test cases
 
-For a local component that is a module version, this will look something like
+- Query the source artifacts only
+- Query the Javadoc artifacts only
+- Query which artifacts could not be resolved or downloaded.
+- Caching is applied as appropriate.
 
-    +- project :some:path (group:name:1.2)
-    +- project :some:path (group:name:1.2) -> group:other:1.2
+## Story: IDE plugins use new artifact resolution API to download sources and javadoc (✓)
 
-1. Change the `RenderableDependency` hierarchy to use the component id and module version id, if not null.
-2. Update the the dependency report tests as appropriate.
+This story changes the `idea` and `eclipse` plugins to use the resolution result to determine the IDE classpath artifacts.
 
-The HTML dependency report should change in a similar way.
+- Change `IdeDependenciesExtractor` and `JavadocAndSourcesDownloader` to use the resolution result to determine the source and Javadoc artifacts.
+- Should ignore project components.
 
-### Test coverage
+## Story: Dependency resolution uses conventional schemes to locate source and Javadoc artifacts for Ivy modules (✓)
 
-- Update the existing test coverage for the new display values.
-- Ensure there is coverage for the dependency report and the dependency HTML report where
-    - There are a mix of external and project dependencies in the graph
-- Ensure there is coverage for the dependency insight report where:
-    - There are a mix of external and project dependencies in the graph
-    - There are a mix of external and project dependencies in the graph and the `--dependency` option is used.
+This story improves the convention used to locate the source and Javadocs to cover some common Ivy conventions.
 
-## Story: IDE plugins use dependency resolution result to determine IDE class paths
+### User visible changes
 
-This story changes the `idea` and `eclipse` plugins to use the resolution result to determine the IDE project classpath.
+Source artifacts contained in a 'sources' configuration in ivy.xml will be now be automatically downloaded and linked into an IDE project. Similar for javadoc artifacts in a 'javadoc' configuration.
 
-- Change `IdeDependenciesExtractor` and `JavadocAndSourcesDownloader` to use the resolution result to determine the project and
-  external dependencies.
+### Implementation
+
+* Make it possible to use ResolveIvyFactory to create a DependencyToModuleVersionResolver without a configuration: use a default ResolutionStrategy and supplied name.
+* Create a `DependencyMetaData` for each supplied `ModuleComponentIdentifier`, and use this to obtain the ModuleVersionMetaData for the component.
+    * Fail for any other types of `ComponentIdentifier`
+* Add a new method: `ArtifactResolver.resolve(ModuleVersionMetaData, Class<? extends JvmLibraryArtifact>, BuildableMultipleArtifactResolveResult)`
+    * Note that this is a transitional API: long term the second parameter may be generalised in some way
+    * `BuildableMultipleArtifactResolveResult` allows the collection of multiple downloaded artifacts of the type, or multiple failures, or a combination.
+* Add a method to `ModuleVersionRepository` that provides the `ModuleVersionArtifactMetaData` for candidate artifacts
+  given a particular ModuleVersionMetaData + JvmLibraryArtifact class.
+    * This method should not require remote access to the repository.
+    * For `MavenResolver` and `IvyDependencyResolverAdapter`, this would return artifacts defined with the appropriate classifiers.
+    * For `IvyResolver`, this would inspect the `ModuleVersionMetaData` to determine the candidate artifacts.
+    * This method should be used to implement the new `resolve` method on `UserResolverChain.ModuleVersionRepositoryArtifactResolverAdapter`.
+
+### Test cases
+
+* Where ivy.xml contains a 'sources' and/or 'javadoc' configuration:
+    * Defined artifacts are included in generated IDE files
+    * Defined artifacts are available via Artifact Query API
+    * Detect and report on artifacts that are defined in ivy configuration but not found
+    * Detect and report error for artifacts that are defined in ivy configuration where download fails
+* Use ivy scheme to retrieve source/javadoc artifacts from a local ivy repository
+* Resolve source/javadoc artifacts by maven conventions where no ivy convention can be used:
+    * Flatdir repository
+    * No ivy.xml file for module
+    * Ivy module with no source/javadoc configurations defined in metadata
+* Maven conventions are not used if ivy file declares empty sources and javadoc configuration
 
 ## Story: Dependency resolution result exposes a consumer that is not a module version
 
-This story exposes different kinds of consumers for a dependency graph.
+This story exposes different kinds of consumers for a dependency graph. The consumer is represented as the root of the dependency resolution result.
 
 - Result `root.id` should return a `ProjectComponentIdentifier` when a project configuration is resolved.
 - Result `root.id` should return an opaque `ComponentIdentifier` implementation when any other kind of configuration is resolved.
@@ -122,179 +153,195 @@ This story exposes different kinds of consumers for a dependency graph.
 - Rename `ResolvedComponentResult.getId()` to something that is more explicit about the lack of guarantees. Maybe `getLocalId()` or ...
 - Extract a `ModuleComponentMetadataDetails` out of `ComponentMetadataDetails` and use `ComponentIdentifier` instead of `ModuleVersionIdentifier` as id.
 
-## Story: Allow the artifacts for a component instance to be queried
+## Story: Query the artifacts for all components defined by a configuration
 
 Currently, there is no way to determine which artifacts in a resolution result are associated with a given component. The artifacts are currently exposed
-as `ResolvedArtifact` instances. These artifacts have a module version identifier associated with them, which is used to match against the component's
-module version identifier. This only work when the component has a module version associated with it, which is not always the case.
+as `ResolvedArtifact` instances, which reference a module version identifier but not a component identifier. As such, there is no way
+to match a `ResolvedArtifact` to a component that is not uniquely identified by a module version.
 
-TBD: provide some API to query the artifacts associated for a given component instance in a resolution result.
+This story makes it possible to obtain an `ArtifactResolutionResult` directly from a `Configuration`, providing the same set of
+artifacts as returned by `Configuration.getResolvedArtifacts()`. In doing so, the artifacts for a configuration are provided per component.
 
-- It should be possible to query only the graph and not the artifacts. This should not download any artifacts.
-- It should be possible to query the artifacts as a single batch, so that, for example, we will be able to resolve and download artifacts
-      in parallel.
-- The API should expose download failures.
-- A component may have zero or more artifacts associated with it.
+This story also adds convenience mechanisms for obtaining all artifacts for an `ArtifactResolutionResult`, in addition to the existing
+way to get artifacts per component and query for artifact download failures.
 
-### Test cases
+### User visible changes
 
-- Can query the artifacts of an external component.
-- Can query the artifacts of a project component.
-- Can query those artifacts that could not be resolved or downloaded.
-- Caching is applied as appropriate.
+Download all artifact files for a configuration, failing if the graph could not be resolved:
 
-## Story: IDE plugins use the resolution result to determine library artifacts
+    copy {
+        from configurations.compile.incoming.artifactResolutionResult.artifactFiles
+        into "libs"
+    }
 
-This story changes the `idea` and `eclipse` plugins to use the resolution result to determine the IDE classpath artifacts.
+Report on failed artifact downloads for a configuration:
 
-- Change `IdeDependenciesExtractor` and `JavadocAndSourcesDownloader` to use the resolution result to determine the project and
-  external artifacts.
+    configurations.compile.incoming.artifactResolutionResult.artifacts.each { ArtifactResult artifact ->
+        if (artifact instanceof UnresolvedArtifactResult) {
+            println "Failed to download artifact ${artifact.id} for component ${artifact.id.componentIdentifier}: ${artifact.failure.message}"
+        }
+    }
 
-## Story: Dependency resolution resolves all artifacts as a batch
+### Implementation
 
-Change dependency resolution implementation to resolve all artifacts as a single batch, when any artifact is requested.
+- Add `ResolverResults.getArtifactQueryResult()`: the result should be constructed by combining the existing `ResolverResults` and `ResolvedConfiguration`.
+    - Provides the same set of artifacts as `ResolvedConfiguration.getResolvedArtifacts()`
+    - If resolution of the dependency graph fails, then `ResolverResults.getArtifactResolutionResult()` should throw a descriptive exception
+    - If artifacts for a component cannot be determined or downloaded, then the `ArtifactResolutionResult` should encapsulate those failures.
+- Add `Configuration.incoming.getArtifactResolutionResult()` produces an `ArtifactResolutionResult` for the configuration.
+    - This result should contain the same set of artifacts currently returned by `ResolvedConfiguration.getResolvedArtifacts()`
+- Move `ComponentArtifactIdentifier` onto the public API, and return that from new method `ArtifactResult.getId()`
+- Add `ResolvedComponentArtifactsResult.getArtifacts()` that returns the set of all `ArtifactResult` instances for a component.
+- Add convenience methods to `ArtifactResolutionResult`:
+    - `getArtifacts()` returns the set of all `ArtifactResult` instances for all resolved components, failing if the result contains any
+      `UnresolvedComponentResult` instances.
+    - `getFiles()` returns a `FileCollection` containing all files associated with `ArtifactResult` instances for all resolved components,
+      throwing an exception on access for any `UnresolvedArtifactResult`
 
-- Use progress logging to report on the batch resolution progress.
+### Test cases
 
-## Story: Profile report displays artifact resolution time
+- Refactor existing test cases to verify:
+    - Can query artifacts for configuration consisting of project and external components
+    - Can query artifacts for configuration with classifier set on dependency
+    - Can query artifacts for configuration with artifact defined on dependency
+    - Can query artifacts for configuration with dependency on a configuration other than default
+- Caching of artifacts resolved from configuration
+- Reports failure to resolve dependency graph
+- Reports failures for all artifacts that could not be resolved or downloaded.
+- Reports composite failure on attempt to get all artifacts where multiple artifacts could not be downloaded
+- Use `Configuration.incoming.artifactResolutionResult` after first using `Configuration.incoming.resolutionResult`: artifact result is not regenerated
 
-TBD
+### Open issues
 
-## Story: Allow the source and Javadoc artifacts for an external Java library to be queried
+- Replacement for `ResolvedArtifact.name`, `ResolvedArtifact.extension` etc
+- Need a way to query Artifact model without downloading artifact files
 
-This story introduces an API which allows the source and Javadoc artifacts for a Java library to be queried
+## Story: Access the ivy and maven metadata artifacts via the Artifact Query API
 
-- Should be possible to query the artifacts as a single batch, so that, for example, we will be able to resolve and download artifacts
-  in parallel.
-- The API should expose download failures.
-- A component may have zero or more source artifacts associated with it.
-- A component may have zero or more Javadoc artifacts associated with it.
-- Should introduce the concept of a Java library to the result.
-- Should have something in common with the story to expose component artifacts, above.
-- Initial implementation should use the Maven style convention to currently used by the IDE plugins. The a later story will improve this for Ivy repositories.
+### User visible changes
 
-### Test cases
+Access the ivy.xml files for a ivy components with the specified id:
 
-- Query the source artifacts only
-- Query the Javadoc artifacts only
-- Query which artifacts could not be resolved or downloaded.
-- Caching is applied as appropriate.
+    def result = dependencies.createArtifactResolutionQuery()
+        .forComponents(ivyModuleComponentId1, ivyModuleComponentId2)
+        .withArtifacts(IvyModule, IvyDescriptorArtifact)
+        .execute()
 
-### API design proposals
-
-#### Resolve and iterate over all jvm libraries, without resolving artifacts
-
-Not supported because this API is all about resolving artifacts.
-
-#### Resolve jvm libraries together with their main and source artifacts, iterate over artifacts
-
-```
-def componentIds = ... // ComponentIdentifier's whose artifacts are to be resolved. Can be obtained from `configuration.incoming` API.
-def result = dependencies.createArtifactResolutionQuery()
-  .forComponents(componentIds)
-  .forArtifacts(JvmLibrary, JvmLibraryMainArtifact, JvmLibrarySourceArtifact)
-  .execute()
-for (jvmLibrary in result.getComponents(JvmLibrary)) { // separate type for each type of component
-  for (artifact in jvmLibrary.artifacts) { // separate type for each type of artifact
-    println artifact.id
-    println artifact.file
-  }
-}
-```
-
-#### Resolve jvm libraries together with their main and source artifacts, inspect component resolution failures
-
-```
-def componentIds = ... // ComponentIdentifier's whose artifacts are to be resolved. Can be obtained from `configuration.incoming` API.
-def result = dependencies.createArtifactResolutionQuery()
-  .forComponents(componentIds)
-  .forArtifacts(JvmLibrary) // shorthand for resolving all of the component's artifacts
-  .execute()
-for (component in result.unresolvedComponents) { // same representation for all components
-    println component.id
-    println component.failure
-  }
-}
-```
+    Set<File> ivyFiles = result.artifactFiles()
 
-### Open issues
+Get the pom files for all maven modules in a configuration:
 
-* API for artifact download failures
-* How to implement API for artifact download failures (`LenientConfiguration` only exposes module resolution failures)
-* How to determine what the main artifacts of a `JvmLibrary` component are (or more specifically, how to deal with Maven artifacts with classifiers;
-  the current API just provides the component ID). Resolving main artifacts isn't required for this story, but is related.
+    def artifactResult = dependencies.createArtifactResolutionQuery()
+        .forComponents(configurations.compile)
+        .withArtifacts(MavenModule, MavenPomArtifact)
+        .execute()
+    Set<File> pomFiles = artifactResult.getArtifactFiles()
 
-## Story: IDE plugins use the resolution result to determine library source and Javadoc artifacts
+### Test cases
 
-This story changes the `idea` and `eclipse` plugins to use the resolution result to determine the IDE classpath artifacts.
+- Invalid component type and artifact type
+    - Cannot call `withArtifacts` multiple times for query
+    - Cannot mix `JvmLibrary` with metadata artifact types
+    - Cannot mix `IvyModule` and `MavenModule` component types with jvm library artifact types
+- Unsupported artifact types:
+    - When requesting `IvyModule` artifacts, the result for a maven component is `UnresolvedComponentResult` with a useful failure.
+    - When requesting `MavenModule` artifacts, the result for an ivy component is `UnresolvedComponentResult` with a useful failure.
+    - When requesting `IvyModule` or `MavenModule` artifacts, the result for a project component is `UnresolvedComponentResult` with a useful failure.
+- Optional artifacts:
+    - Request an ivy descriptor for an ivy module with no descriptor, and get empty set of artifacts.
+    - Request a pom for a maven module with no pom, and get empty set of artifacts.
+- Metadata artifacts are cached
+    - Updates `IvyDescriptorArtifact` for changing module
+    - Updates `MavenPomArtifact` for maven snapshot
+    - Updates both with `--refresh-dependencies`
 
-- Change `IdeDependenciesExtractor` and `JavadocAndSourcesDownloader` to use the resolution result to determine the source and Javadoc artifacts.
-- Should ignore project components.
+### Open issues
 
-## Story: Dependency resolution uses conventional schemes to locate source and Javadoc artifacts for Ivy modules
+- Typed domain model for IvyModule and MavenModule
 
-This story improves the convention used to locate the source and Javadocs to cover some common Ivy conventions.
+## Story: Reliable mechanism for checking for success with new resolution result APIs
+
+- Add `rethrowFailure()` to `ArtifactResolutionResult` and `ResolutionResult`
+- Update JvmLibraryArtifactResolveTestFixture to rethrow failures and verify the exception messages and causes directly in the tests
+
+## Story: Directly access the source and javadoc artifacts for a configuration using the Artifact Query API
 
 ### User visible changes
 
-Certain source/javadoc artifacts that were not automatically linked into an IDE project will now be successfully downloaded and linked:
+Get JvmLibrary components with source and javadoc artifacts for a configuration:
 
-* Artifacts contained in a 'sources' configuration in ivy.xml (or 'javadocs')
-* Artifacts with a 'source' type in ivy.xml (or 'javadoc')
-* ??? Other conventions ???
+    def artifactResult = dependencies.createArtifactResolutionQuery()
+        .forComponents(configurations.compile)
+        .withArtifacts(JvmLibrary, JvmLibrarySourcesArtifact, JvmLibraryJavadocArtifact)
+        .execute()
+    def libraries = artifactResult.getComponents(JvmLibrary)
 
-### Implementation
+## Story: IDE plugins use the resolution result to determine library artifacts
 
-* Make it possible to use ResolveIvyFactory to create a DependencyToModuleVersionResolver without a configuration: use a default ResolutionStrategy and supplied name.
-* Create a `DependencyMetaData` for each supplied `ModuleComponentIdentifier`, and use this to obtain the ModuleVersionMetaData for the component.
-    * Fail for any other types of `ComponentIdentifier`
-* Add a new method: `ArtifactResolver.resolve(ModuleVersionMetaData, Class<? extends JvmLibraryArtifact>, BuildableMultipleArtifactResolveResult)`
-    * Note that this is a transitional API: long term the second parameter may be generalised in some way
-    * `BuildableMultipleArtifactResolveResult` allows the collection of multiple downloaded artifacts of the type, or multiple failures, or a combination.
-* Add a method to `ModuleVersionRepository` that provides the `ModuleVersionArtifactMetaData` for candidate artifacts
-  given a particular ModuleVersionMetaData + JvmLibraryArtifact class.
-    * This method should not require remote access to the repository.
-    * For `MavenResolver` and `IvyDependencyResolverAdapter`, this would return artifacts defined with the appropriate classifiers.
-    * For `IvyResolver`, this would inspect the `ModuleVersionMetaData` to determine the candidate artifacts.
-    * This method should be used to implement the new `resolve` method on `UserResolverChain.ModuleVersionRepositoryArtifactResolverAdapter`.
+This story changes the `idea` and `eclipse` plugins to use the resolution result to determine the IDE classpath artifacts.
 
-### Test cases
+- Change `IdeDependenciesExtractor` and `JavadocAndSourcesDownloader` to use the resolution result to determine the project and
+  external artifacts.
 
-* For each defined ivy convention:
-    * Resolve source/javadoc artifacts from Ivy repository
-    * Report on artifacts that are defined in ivy metadata but not found
-    * Report on artifacts that are defined in ivy metadata where download fails
-* Fall back to maven convention if no artifacts defined in custom ivy convention
-* Resolve source/javadoc artifacts by maven conventions where no ivy convention can be used:
-    * Flatdir repository
-    * Ivy repository with no metadata: jar-only
-    * Ivy module with no source/javadoc artifacts defined in metadata
+## Story: Dependency resolution resolves all artifacts as a batch
 
-### Open issues
+Change dependency resolution implementation to resolve all artifacts as a single batch, when any artifact is requested.
 
-* If the files defined by a ivy-specific scheme are not available, should we then use the maven convention to look for artifacts?
-  Or, for backward-compatibility should we first use the maven scheme, trying the ivy-specific scheme if not found?
+- Use progress logging to report on the batch resolution progress.
+
+## Story: Profile report displays artifact resolution time
+
+TBD
 
-## Story: Source and javadoc artifacts are updated for maven snapshot based on configured cache expiry
+## Story: Source and javadoc artifacts are updated when Maven snapshot changes
 
-Currently the Artifact Query API relies on `detachedConfiguration`, which uses an unconfigurable ResolutionStrategy. This means that
-the source and javadoc for a changing module may not be updated when the corresponding artifact is updated.
+- Use the timestamp as part of the component identifier for unique Maven snapshots.
+- A unique snapshot is no longer considered a changing module.
 
 ### Test cases
 
-Some test cases that are not directly related, but require this feature to be implemented:
+* New artifacts are used when snapshot has expired:
+    * Resolve the source and javadoc artifacts for a Maven snapshot.
+    * Publish a new snapshot with changed artifacts.
+    * With `cacheChangingModules` set to 0, verify that the new source and javadoc artifacts are used.
+
+* Old artifacts are used when snapshot has not expired:
+    * Resolve a Maven snapshot, but not the source and javadoc artifacts.
+    * Publish a new snapshot with changed artifacts
+    * With `cacheChangingModules` set to default, verify that the old source and javadoc artifacts are used.
 
-* Source and javadoc for Maven SNAPSHOT modules are updated when cacheChangingModulesFor 0, 'seconds' is applied to configuration containing module.
-* No requests for source and javadoc are made with build is executed with `--offline`, even when cache has expired
+* No requests for Maven snapshot source and javadoc are made with build is executed with `--offline`, even when cache has expired.
 * Can recover from a broken HTTP request by switching to use `--offline`.
 
-## Story: Source and Javadoc artifacts are exposed for a local Java component
+## Story: Source and javadoc artifacts are updated for changing module based on configured cache expiry
 
-TBD
+Currently it is not possible to configure how often the Artifact Query API should check for changes to artifacts.
+This means that the source and javadoc for a changing module may not be updated when the corresponding artifact is updated.
 
-## Story: Source and Javadoc artifacts are published for a Java component
+This story introduces a new cache control DSL that can apply to both dependency graph and artifact resolution:
 
-This story changes the `ivy-publish` and `maven-publish` plugins to publish the source and Javadocs for a Java component.
+- Introduce a 'check for changes' cache control DSL, as a replacement for `ResolutionStrategy`.
+- Cache control DSL allows a frequency at which changing things should be checked.
+    - Should be possible to declare 'never', 'always' and some duration.
+- Cache control DSL allows a rule to be declared that specifies the frequency at which changing things from a given module should be checked.
+- DSL should be reusable in some form for plugin resolution and external build script caching (but not wired up to these things yet).
+- The existing DSL on `ResolutionStrategy` should win over the new cache control DSL.
+- User guide explains how to use the cache control DSL, and DSL is documented in the DSL guide.
+
+### Test cases
+
+* New DSL can be used to control caching for all types of cached dependency resolution state:
+    - version list
+    - module version meta-data
+    - downloaded artifacts
+    - resolved artifact meta-data
+    - Maven snapshot timestamp
+
+Some test cases that are not directly related, but require this feature to be implemented:
+
+* Source and javadoc for a non-unique Maven snapshot is updated when check-for-changes is 'always'.
+* No requests for source and javadoc are made with build is executed with `--offline`, even when cache has expired.
+* Can recover from a broken HTTP request by switching to use `--offline`.
 
 ## Story: Dependency resolution result exposes local component instances that are not module versions
 
@@ -382,39 +429,6 @@ meet the requirements.
     - A registry of requirement -> buildable file collection converters.
 - Add some way to query the resolved include roots, link files and runtime files for a native binary.
 
-## Story: Implement native binary dependency resolution using self resolving dependencies
-
-This story starts to push the resolution mechanism introduced in the above story down into the dependency management engine. For this story,
-native binary dependencies will be converted to self-resolving dependencies which are then fed into the dependency management engine.
-
-This story is simply a refactoring. No new user-visible behaviour will be added.
-
-## Story: Native component dependencies are visible in the dependency reports
-
-### Open issues
-
-- Dependencies need to shown per-variant.
-
-## Story: Plugin contributes a component type implementation
-
-Allow a plugin to contribute a component type implementation, which is responsible for defining some component type. For this story, the definition is
-responsible for extracting the component meta-data from some local component instance. Later stories will generalise this to make the definition
-reusable for other purposes, such as publishing.
-
-- Use this in the native binary plugins to convert native library and binary instances to meta-data.
-
-### Open issues
-
-- Add some way to influence the target of a project dependency
-- Generalise so that the meta-data model can be reused for publishing and resolving external components
-    - Version the model
-- Detangle the usage context from the dependency implementation and pass through to the resolvers
-    - Needs to be considered when caching stuff
-- Add some sugar to infer the meta-data model from some static types
-- Expose the component instance graph from the new requirements API
-- Remove `NativeDependencySet` and `LibraryResolver` interfaces
-- Replace the existing headers and files configurations
-
 ## Story: Conflict resolution prefers local components over other components
 
 When two components have conflicting external identifiers, select a local component.
@@ -477,6 +491,11 @@ Allow some substitutions to be expressed declaratively, rather than imperatively
 - Get meta-data of a component
 - Get certain artifacts of a component. Includes meta-data artifacts
 
+## Story: Resolution result exposes excluded dependencies
+
+TBD
+
 # Open issues
 
 - When resolving a pre-built component, fail if the specified file does not exist/has not been built (if buildable).
+- In-memory caching for the list of artifacts for a component
diff --git a/design-docs/ci-improvements.md b/design-docs/dev-infrastructure.md
similarity index 71%
rename from design-docs/ci-improvements.md
rename to design-docs/dev-infrastructure.md
index af498293fa42..0d8d514de7bd 100644
--- a/design-docs/ci-improvements.md
+++ b/design-docs/dev-infrastructure.md
@@ -1,4 +1,3 @@
-
 Some ideas to improve feedback from the CI pipeline:
 
 # Background
@@ -17,15 +16,14 @@ Here is a rough overview of the current structure of the CI pipeline
 
 This pipeline is replicated for the release and master branches.
 
-# Reduce memory consumption of the full tooling API test suite
-
-Currently, the full cross version integration test suite for the tooling API starts daemons for every Gradle version, and starts
-multiple daemons for each version.
+# Reduce memory consumption of daemon processes started by test suite
 
-- Verify that many daemon processes are running while the test suite is executing.
 - Verify that daemon processes are started with relatively small heap and permgen limits, rather than the defaults for the daemon, and fix if not.
-- Change test execution for the tooling API test suite so that the tests for a single Gradle version (or small set of versions) are completed before starting
-  tests on another Gradle version. One potential implementation is to introduce a test task per Gradle version.
+- Kill daemons at the end of the build.
+
+# Compile source against baseline Java version early in the pipeline
+
+To fail early when later Java APIs are used.
 
 # Automate installation of TeamCity agents on Windows build VM
 
@@ -92,22 +90,22 @@ Also remove the fast feedback agent pool
 
 # Leverage parallel execution
 
-# Proactively clean disks to avoid accumulation
+# Install BarKeep code review tool
+
+Set up [BarKeep](http://getbarkeep.org/) on `dev1` as an alternative to Crucible.
 
-- To avoid accumulation of cruft (e.g. old wrappers, old dependencies), we should periodically recreate the build VMs.
+# Build machines provisioning
 
-# Run all Windows builds with virtual agents
+## Add monitoring to all build machines
 
-At the moment running multiple Windows builds with virtual agents in parallel may cause memory issues. As a result the build fails. One of the observed error message
-we see is the following:
+- add New Relic monitoring to Linux machines without Salt
+- add Nex Relic monitoring to Windows machines
 
-    Error occurred during initialization of VM
-    Could not reserve enough space for object heap
+## Extend Salt to not yet managed machines
 
-This error mainly occurs if one of the builds spawns new Gradle processses. To mitigate this situation the following builds are configured to only use the physical
-Windows machine `winagent perf1`:
+Start with user management and installation of packages.
+This applies to unmanaged machines running Linux and one Windows box.
 
-- Windows - Java 1.5 - Daemon integration tests
-- Windows - Java 1.6 - Cross-version tests
+## Use the same Linux distribution on all machines
 
-All other builds are still using the virtual agents. After identifying and fixing the root cause for the error, we should change back the configuration.
+Upgrade existing Saucy machines and probably also Precise.
\ No newline at end of file
diff --git a/design-docs/done/dependency-management-bug-fixes.md b/design-docs/done/dependency-management-bug-fixes.md
index c5d6cb2ad18f..97463678a5c3 100644
--- a/design-docs/done/dependency-management-bug-fixes.md
+++ b/design-docs/done/dependency-management-bug-fixes.md
@@ -338,3 +338,148 @@ for now we'll need an implementation backed by ExternalResourceRepository#list (
 
 Later we may add a ModuleVersionLister backed by an Artifactory REST listing, our own file format, etc... The idea would be that these ModuleVersionLister
 implementations will be pluggable in the future, so you could combine maven-metadata.xml with ivy.xml in a single repository, for example.
+
+# GRADLE-2861 Handle parent pom with unknown placeholders (DONE)
+
+See [GRADLE-2861](http://issues.gradle.org/browse/GRADLE-2861)
+
+Currently, the POM parser (inherited from Ivy) attaches special extra attributes to the `ModuleDescriptor` for a POM. These are later used by the POM parser
+when it parses a child POM. Sometimes these attributes cause badly formed XML to be generated, hence the failure listed in the jira issue.
+
+The solution is to have the parser request the parent POM artifact directly, rather than indirectly via the module meta-data:
+
+1. Add a `LocallyAvailableExternalResource getArtifact(Artifact)` method to `DescriptorParseContext`.
+    - Implementation can reuse the `ModuleVersionResolveResult` from the existing `getModuleDescriptor()` method. This result includes an `ArtifactResolver` which
+      can be used to resolve an `Artifact` to a `File`. There's an example of how to adapt a `File` to a `LocallyAvailableExternalResource` instance in
+      `AbstractModuleDescriptorParser.parseMetaData()`.
+2. Change the `GradlePomModuleDescriptorParser.parseOtherPom()` to use this new method to fetch and parse the parent POM artifact, rather than using the parsed
+   `ModuleDescriptor` for the parent. For this step, can continue to represent the parent pom using a `ModuleDescriptor` inside the parser.
+3. Change `GradlePomModuleDescriptorParser` to represent the parent POM using a `PomReader` rather than a `ModuleDescriptor`.
+4. Clean out `GradlePomModuleDescriptorBuilder` so that it no longer defines any extra properties on the parsed `ModuleDescriptor`.
+5. Change `IvyXmlModuleDescriptorParser.parseOtherIvyFile()` to use the new method to fetch and parse the Ivy descriptor artifact.
+6. Remove `DescriptorParseContext.getModuleDescriptor()`. It should no longer be required.
+
+## Test coverage
+
+* Unignore the existing test case in `BadPomFileResolveIntegrationTest`.
+* Add a test case to `MavenParentPomResolveIntegrationTest` to cover two Maven modules that share a common parent.
+* Add a test case to `MavenParentPomResolveIntegrationTest` to cover a Maven module that has a parent and grandparent module.
+
+# Latest status dynamic versions work across multiple repositories (DONE)
+
+See [GRADLE-2502](http://issues.gradle.org/browse/GRADLE-2502)
+
+### Test coverage
+
+1. Using `latest.integration`
+    1. Empty repository fails with not found.
+    2. Publish `1.0` and `1.1` with status `integration`. Resolves to `1.1`.
+    3. Publish `1.2` with status `release`. Resolves to `1.2`
+    4. Publish `1.3` with no ivy.xml. Resolves to `1.3`.
+2. Using `latest.milestone`
+    1. Empty repository fails with not found.
+    2. Publish `2.0` with no ivy.xml. Fails with not found.
+    3. Publish `1.3` with status `integration`. Fails with not found.
+    4. Publish `1.0` and `1.1` with ivy.xml and status `milestone`. Resolves to `1.1`.
+    5. Publish `1.2` with status `release`. Resolves to `1.2`
+3. Using `latest.release`
+    1. Empty repository fails with not found.
+    2. Publish `2.0` with no ivy.xml. Fails with not found.
+    3. Publish `1.3` with status `milestone`. Fails with not found.
+    4. Publish `1.0` and `1.1` with ivy.xml and status `release`. Resolves to `1.1`.
+4. Multiple repositories.
+5. Checking for changes. Using `latest.release`
+    1. Publish `1.0` with status `release` and `2.0` with status `milestone`.
+    2. Resolve and assert directory listing and `1.0` artifacts downloaded.
+    3. Resolve and assert directory listing downloaded.
+    4. Publish `1.1` with status `release`.
+    5. Resolve and assert directory listing and `1.1` artifacts downloaded.
+6. Maven integration
+    1. Publish `1.0`. Check `latest.integration` resolves to `1.0` and `latest.release` fails with not found.
+    2. Publish `1.1-SNAPSHOT`. Check `latest.integration` resolves to `1.1-SNAPSHOT` and `latest.release` fails with not found.
+7. Version ranges
+8. Repository with multiple patterns.
+9. Repository with `[type]` in pattern before `[revision]`.
+10. Multiple dynamic versions match the same remote revision.
+
+### Implementation strategy
+
+Change ExternalResourceResolver.getDependency() to use the following algorithm:
+1. Calculate an ordered list of candidate versions.
+    1. For a static version selector the list contains a single candidate.
+    2. For a dynamic version selector the list is the full set of versions for the module.
+        * For a Maven repository, this is determined using `maven-metadata.xml` if available, falling back to a directory listing.
+        * For an Ivy repository, this is determined using a directory listing.
+        * Fail if directory listing is not available.
+2. For each candidate version:
+    1. If the version matcher does not accept the module version, continue.
+    2. Fetch the module version meta-data, as described below. If not found, continue.
+    3. If the version matcher requires the module meta-data and it does not accept the meta-data, continue.
+    4. Use the module version.
+3. Return not found.
+
+To fetch the meta-data for a module version:
+1. Download the meta data descriptor resource, via the resource cache. If found, parse.
+    1. Validate module version in meta-data == the expected module version.
+2. Check for a jar artifact, via the resource cache. If found, use default meta-data. The meta-data must have `default` set to `true` and `status` set to `integration`.
+3. Return not found.
+
+# Correct handling of packaging and dependency type declared in poms (DONE)
+
+* GRADLE-2188: Artifact not found resolving dependencies with packaging/type "orbit"
+
+### Description
+
+Our engine for parsing Maven pom files is borrowed from ivy, and assumes the 'packaging' element equals the artifact type, with a few exceptions (ejb, bundle, eclipse-plugin, maven-plugin).
+This is different from the way Maven does the calculation, which is:
+
+* Type defaults to 'jar' but can be explicitly declared.
+* Maven maps the type to an [extension, classifier] combination using some hardcoded rules. Unknown types are mapped to [type, ""].
+* To resolve the artefact, maven looks for an artefact with the given artifactId, version, classifier and extension.
+
+### Strategic solution
+
+At present, our model of an Artifact is heavily based on ivy; for this fix we can introduce the concept of mapping between our internal model and a repository-centric
+artifact model. This will be a small step toward an independent Gradle model of artifacts, which then maps to repository specific things link extension, classifier, etc.
+
+### User visible changes
+
+* When the dependency declaration has no 'type' specified, or a 'type' that maps to the extension 'jar'
+    * Resolution of a POM module with packaging in ['', 'pom', 'jar', 'ejb', 'bundle', 'maven-plugin', 'eclipse-plugin'] will not change
+    * Resolution of a POM with packaging 'foo' that maps to 'module.foo', a deprecation warning will be emitted and the artifact 'module.foo' will be used
+    * Resolution of a POM with packaging 'foo' that maps to 'module.jar', the artifact 'module.jar' will be successfully found. (ie 'orbit'). An extra HTTP
+      request will be required to first look for 'module.foo'.
+* When the dependency declaration has a 'type' specified that maps to an extension 'ext' (other than 'jar')
+    * Resolution of a POM module with packaging in ['pom', 'jar', 'ejb', 'bundle', 'maven-plugin', 'eclipse-plugin'] will emit a deprecation warning before using 'module.jar' if it exists
+    * Resolution of a POM with packaging 'foo' and actual artifact 'module.foo', a deprecation warning will be emitted and the artifact 'module.foo' will be used
+    * Resolution of a POM with packaging 'foo' and actual artifact 'module.ext', the artifact 'module.ext' will be successfully found. An extra HTTP
+      request will be required to first look for 'module.foo'.
+
+### Integration test coverage
+
+* Coverage for resolving pom dependencies referenced in various ways:
+    * Need modules published in maven repositories with packaging = ['', 'pom', 'jar', 'war', 'eclipse-plugin', 'custom']
+    * Test resolution of artifacts in these modules via
+        1. Direct dependency in a Gradle project
+        2. Transitive dependency in a maven module (pom) which is itself a dependency of a Gradle project
+        3. Transitive dependency in an ivy module (ivy.xml) which is itself a dependency of a Gradle project
+    * For 1. and 2., need dependency declaration with and without type attribute specified
+    * Must verify that deprecation warning is logged appropriately
+* Sad-day coverage for the case where neither packaging nor type can successfully locate the maven artifact. Error message should report 'type'-based location.
+
+### Implementation approach
+
+* Determine 2 locations for the primary artifact:
+    * The 'packaging' location: apply the current logic to determine location from module packaging attribute
+        * Retain current packaging->extension mapping for specific packaging types
+    * The 'type' location: Use maven3 rules to map type->extension+classifier, and construct a location
+* If both locations are the same, use the artifact at that location.
+* If not, look for the artifact in the packaging location
+    * If found, emit a deprecation warning and use that location
+    * If not found, use the artifact from the type location
+* In 2.0, we will remove the packaging->extension mapping and the deprecation warning
+
+# Handle pom-only modules in mavenLocal (DONE)
+
+* GRADLE-2034: Existence of pom file requires that declared artifacts can be found in the same repository
+* GRADLE-2369: Dependency resolution fails for mavenLocal(), mavenCentral() if artifact partially in mavenLocal()
diff --git a/design-docs/done/dependency-management.md b/design-docs/done/dependency-management.md
index 60a4d0120f4b..c90912b79988 100644
--- a/design-docs/done/dependency-management.md
+++ b/design-docs/done/dependency-management.md
@@ -102,3 +102,36 @@ This will allow a consumer to extract the external and project components as fol
     - for an external module component:
         - `id` is a `ModuleComponentIdentifier` with correct `group`, `module`, `version` values.
         - `moduleVersion` has the same attributes as `id`.
+
+## Story: Dependency reports indicate the source of a component (DONE)
+
+The dependency reporting will change to give some indication of the source of the component:
+
+For an external component instance, this will be unchanged:
+
+    +- group:name:1.2
+    +- group:other:1.3 -> group:other:1.3.1
+
+For a local component that is not a module version, this will look something like:
+
+    +- project :some:path
+    +- project :some:path -> group:other:1.2
+
+For a local component that is a module version, this will look something like
+
+    +- project :some:path (group:name:1.2)
+    +- project :some:path (group:name:1.2) -> group:other:1.2
+
+1. Change the `RenderableDependency` hierarchy to use the component id and module version id, if not null.
+2. Update the the dependency report tests as appropriate.
+
+The HTML dependency report should change in a similar way.
+
+### Test coverage
+
+- Update the existing test coverage for the new display values.
+- Ensure there is coverage for the dependency report and the dependency HTML report where
+    - There are a mix of external and project dependencies in the graph
+- Ensure there is coverage for the dependency insight report where:
+    - There are a mix of external and project dependencies in the graph
+    - There are a mix of external and project dependencies in the graph and the `--dependency` option is used.
diff --git a/design-docs/done/gradle-2.0.md b/design-docs/done/gradle-2.0.md
new file mode 100644
index 000000000000..c088ab2eaf6d
--- /dev/null
+++ b/design-docs/done/gradle-2.0.md
@@ -0,0 +1,29 @@
+## Remove support for the Gradle Open API implementation (DONE)
+
+Now that we have reasonable tooling support via the tooling API, remove the Open API.
+
+* Implement a stub to fail with a reasonable error message when attempting to use Gradle from the Open API.
+* Add integration test coverage that using the Open API fails with a reasonable error message.
+
+Note that the `openAPI` project must still remain, so that the stubs fail in the appropriate way when used by Open API clients.
+This will be removed in Gradle 3.0.
+
+## Remove the `GradleLauncher` API (DONE)
+
+The public API for launching Gradle is now the tooling API. The `GradleBuild` task can also be used.
+
+* Replace internal usages of the static `GradleLauncher` methods.
+* Move the `GradleLauncher` type from the public API to an internal package.
+
+## Remove usages of JNA and JNA-Posix (DONE)
+
+Replace all usages of JNA and JNA-Posix with native-platform. Currently, this means that console support and
+UNIX file permissions with JVMs earlier than Java 7 will not be supported on the following platforms:
+
+* Linux-ia64
+* Solaris-x86, -amd64, -sparc, -sparcv9
+
+## Misc API tidy-ups (DONE)
+
+* Remove unused `IllegalOperationAtExecutionTimeException`.
+* Remove unused `AntJavadoc`.
diff --git a/design-docs/done/task-configuration-from-command-line.md b/design-docs/done/task-configuration-from-command-line.md
index 868a6ed0a801..63318ef11364 100644
--- a/design-docs/done/task-configuration-from-command-line.md
+++ b/design-docs/done/task-configuration-from-command-line.md
@@ -44,3 +44,90 @@ TBD
 ### Implementation approach
 
 TBD
+
+## Help task shows basic details about a task (DONE)
+
+Add some command line interface for discovering details about a task (name, type, path, description)
+
+### User visible changes
+
+Running `gradle help --task test` shows a usage message for the `test` task.
+
+If multiple tasks match, details of the matching tasks are shown
+
+* all matched tasks have the same type
+    * print one report of the task type and include all matching paths in the report
+
+* matched tasks have different types
+    * print one detail output for each different task type including all available paths
+
+### Test coverage
+
+* integration tests
+    * `gradle help --task` on simple task
+    * `gradle help --task` on task referenced by full path  (e.g. `:someProj:dependencies`)
+    * `gradle help --task` on implicit task (e.g. `tasks`)
+    * `gradle help --task` on task defined via placeholder
+    * `gradle help --task` on non existing task displays reasonable error message, including candidate matches
+    * `gradle help --task` on multiple matching tasks
+    * `gradle help --task` using camel-case matching to select task
+
+### Implementation approach
+
+- Change the `help` task:
+    - add `--task` commandline property
+    - change displayHelp implementation to print task details when `--task` is set
+    - lookup project tasks and implicit tasks using the task selector
+    - throw decent error message when requested task cannot be found
+    - task details (task name, task type, path)
+    - the default message informs the user about using `gradle help --task n`
+
+- Update the 'using Gradle from the command-line' user guide chapter to mention the help task.
+
+## Help task shows command-line options for a task (DONE)
+
+Commandline options of the task passed to help are listed including a description. The legal values for each property are not shown - this
+is added in a later story.
+
+### User visible changes
+
+The usage message of running `gradle help --task <task>` lists commandline options of the selected tasks.
+
+### Test coverage
+
+* integration tests
+    * `gradle help` on task with no commandline properties
+    * `gradle help` on task with commandline properties
+    * `gradle help` on implicit task no commandline properties
+    * `gradle help` on implicit task with no commandline properties
+    * `gradle help --tassk help` (should print hint to `gradle help --task help`)
+
+### Implementation approach
+
+- Change configuration error message in `CommandLineTaskConfigurer` to suggest that the user run `gradle help --task <broken-task>`.
+- Update the 'using Gradle from the command-line' user guide chapter.
+
+## Help task shows legal values for each command-line option
+
+### User visible changes
+
+The usage message of running `gradle help --task init` includes the available values for the task command line options (e.g --type)
+
+### Test coverage
+
+* integration tests
+    * `gradle help` on task with enum property type mapped to commandline option
+    * `gradle help` on task with boolean property type mapped to commandline option
+    * `gradle help` on task with String property mapped to commandline option
+    * `gradle help --task init` shows all available init types
+
+### Implementation approach
+
+- Introduce marker annotation `Option("optionName")` to mark a task property mapped to a commandline option.
+- `@Option` with not provided "optionName" is mapped to option with same name as the annotated field
+- `@Option("optionName")` annotated on Enums includes enum values as possible option values
+- `@Option("optionName")` annotated on boolean includes true/false as possible option values
+- `@Option("optionName")` annotated on a setter method evaluates the available options from the parameter type)
+- Introduce marker annotation `OptionValues("optionName")` to to allow a dynamic value lookup in the task implementation itself.
+- Adapt InitBuild task to use `@OptionValues` to map values for the `--type` command line option.
+- Update the 'using Gradle from the command-line' user guide chapter.
diff --git a/design-docs/done/tooling-api-improvements.md b/design-docs/done/tooling-api-improvements.md
new file mode 100644
index 000000000000..08e27acf653e
--- /dev/null
+++ b/design-docs/done/tooling-api-improvements.md
@@ -0,0 +1,164 @@
+## Story: Tooling API client requests build model for old Gradle version (DONE)
+
+This story adds support for the `GradleBuild` model for older target Gradle versions.
+
+### Implementation
+
+Change the implementations of `ConsumerConnection.run(type, parameters)` so that when asked for a `GradleBuild` model, they instead
+request the `GradleProject` model and then convert it to a `DefaultGradleBuild` instance. See `ConnectionVersion4BackedConsumerConnection.doGetModel()`
+for an example of this kind of thing.
+
+For the `ModelBuilderBackedConsumerConnection` implementation, if the provider Gradle version supports the `GradleBuild` model (is >= 1.8-rc-1) then
+forward to the provider, as it does now.
+
+To implement this cleanly, one option might be to introduce some chain of model producers into the `ConsumerConnection` subclasses, so that each producer is
+asked in turn whether it can produce the requested model. The last producer can delegate to the provider connection. Stop at the first producer that can
+produce the model.
+
+### Test cases
+
+- For all Gradle versions, can request the `GradleBuild` model via `ProjectConnection`. This basically means removing the `@TargetGradleVersion` from
+  the test case in `GradleBuildModelCrossVersionSpec`.
+
+## Story: Deprecate support for Tooling API clients earlier than Gradle 1.2 (DONE)
+
+When any of the following methods are called on the provider connection treat the client version as deprecated:
+
+- `ConnectionVersion4.getModel()` and `executeBuild()`.
+- `InternalConnection.getTheModel()`.
+- `configureLogging(boolean)`.
+
+Whenever an operation is invoked on the provider connection by a deprecated client version, the connection implementation should report to
+the user that the client version is deprecated and support for it will be removed in Gradle 2.0.
+The logging output should be received through the stream attached to `LongRunningOperation.setStandardOutput()`.
+
+### Test cases
+
+- Running a build generates a warning when using a client < 1.2, and does not generate a warning when using a client >= 1.2.
+- Fetching a model generates a warning when using a client < 1.2, and does not generate a warning when using a client >= 1.2.
+
+## Story: Deprecate support for Gradle versions earlier than Gradle 1.0-milestone-8 (DONE)
+
+When the provider connection does not implement `InternalConnection` then treat the provider version as deprecated.
+
+Whenever an operation is invoked on a deprecated provider version, the client implementation should report to the user that the provider
+version is deprecated and support for it will be removed in Gradle 2.0.
+The logging output should be received through the stream attached to `LongRunningOperation.setStandardOutput()`.
+
+### Test cases
+
+- Running a build generates a warning when using a provider version < 1.0-milestone-8, and does not generate a warning when using a provider version >= 1.0-milestone-8.
+- Fetching a model generates a warning when using a provider version < 1.0-milestone-8, and does not generate a warning when using a provider version >= 1.0-milestone-8.
+
+## Story: Expose the publications of a project (DONE)
+
+This story allows an IDE to map dependencies between different Gradle builds and and between Gradle and non-Gradle builds.
+For incoming dependencies, the Gradle coordinates of a given library are already exposed through `ExternalDependency`. This
+story exposes the outgoing publications of a Gradle project.
+
+1. Add a `GradlePublication` type with the following properties:
+    1. An `id` property with type `GradleModuleVersion`.
+2. Add a `publications` property to `GradleProject` with type `DomainObjectSet<GradlePublication>`.
+3. Include an `@since` javadoc tag and an `@Incubating` annotation on the new types and methods.
+4. Introduce a project-scoped internal service which provides some detail about the publications of a project.
+   This service will also be used during dependency resolution. See [dependency-management.md](dependency-management.md#story-dependency-resolution-result-exposes-local-component-instances-that-are-not-module-versions)
+    1. The `publishing` plugin registers each publication defined in the `publishing.publications` container.
+       For an instance of type `IvyPublicationInternal`, use the publication's `identity` property to determine the publication identifier to use.
+       For an instance of type `MavenPublicationInternal`, use the publication's `mavenProjectIdentity` property.
+    2. For each `MavenResolver` defined for the `uploadArchives` task, register a publication. Use the resolver's `pom` property to determine the
+       publication identifier to use. Will need to deal with duplicate values.
+    3. When the `uploadArchives` task has any other type of repository defined, then register a publication that uses the `uploadArchives.configuration.module`
+       property to determine the publication identifier to use.
+5. Change `GradleProjectBuilder` to use this service to populate the tooling model.
+
+An example usage:
+
+    GradleProject project = connection.getModel(GradleProject.class);
+    for (GradlePublication publication: project.getPublications()) {
+        System.out.println("project " + project.getPath() + " produces " + publication.getId());
+    }
+
+### Test coverage
+
+- Add a new `ToolingApiSpecification` integration test class that covers:
+    - For a project that does not configure `uploadArchives` or use the publishing plugins, verify that the tooling model does not include any publications.
+    - A project that uses the `ivy-publish` plugin and defines a single Ivy publication.
+    - A project that uses the `maven-publish` plugin and defines a single Maven publication.
+    - A project that uses the `maven` plugin and defines a single remote `mavenDeployer` repository on the `uploadArchives` task.
+    - A project that defines a single Ivy repository on the `uploadArchives` task.
+- Verify that a decent error message is received when using a Gradle version that does not expose the publications.
+
+## Story: Expose the build script of a project (DONE)
+
+This story exposes via the tooling API some basic information about the build script of a project.
+
+1. Add a `GradleScript` type with the following properties:
+    1. A `file` property with type `File`.
+2. Add a `buildScript` property to `GradleProject` with type `GradleScript`.
+3. Include an `@since` javadoc tag and an `@Incubating` annotation on the new types and methods.
+4. Change `GradleProjectBuilder` to populate the model.
+
+An example usage:
+
+    GradleProject project = connection.getModel(GradleProject.class);
+    System.out.println("project " + project.getPath() + " uses script " + project.getBuildScript().getFile());
+
+### Test coverage
+
+- Add a new `ToolingApiSpecification` integration test class that covers:
+    - A project with standard build script location
+    - A project with customized build script location
+- Verify that a decent error message is received when using a Gradle version that does not expose the build scripts.
+    - Request `GradleProject` directly.
+    - Using `GradleProject` via an `EclipseProject` or `IdeaModule`.
+
+## Story: GRADLE-2434 - Expose the aggregate tasks for a project (DONE)
+
+This story allows an IDE to implement a way to select the tasks to execute based on their name, similar to the Gradle command-line.
+
+1. Add an `EntryPoint` model interface, which represents some arbitrary entry point to the build.
+2. Add a `TaskSelector` model interface, which represents an entry point that uses a task name to select the tasks to execute.
+3. Change `GradleTask` to extend `EntryPoint`, so that each task can be used as an entry point.
+4. Add a method to `GradleProject` to expose the task selectors for the project.
+    - For new target Gradle versions, delegate to the provider.
+    - For older target Gradle versions, use a client-side mix-in that assembles the task selectors using the information available in `GradleProject`.
+5. Add methods to `BuildLauncher` to allow a sequence of entry points to be used to specify what the build should execute.
+6. Add `@since` and `@Incubating` to the new types and methods.
+
+Here are the above types:
+
+    interface EntryPoint {
+    }
+
+    interface TaskSelector extends EntryPoint {
+        String getName(); // A display name
+    }
+
+    interface GradleTask extends EntryPoint {
+        ...
+    }
+
+    interface GradleProject {
+        DomainObjectSet<? extends TaskSelector> getTaskSelectors();
+        ...
+    }
+
+    interface BuildLauncher {
+        BuildLauncher forTasks(Iterable<? extends EntryPoint> tasks);
+        BuildLauncher forTasks(EntryPoint... tasks);
+        ...
+    }
+
+TBD - maybe don't change `forTasks()` but instead add an `execute(Iterable<? extends EntryPoint> tasks)` method.
+
+### Test cases
+
+- Can request the entry points for a given project hierarchy
+    - Task is present in some subprojects but not the target project
+    - Task is present in target project but no subprojects
+    - Task is present in target project and some subprojects
+- Executing a task selector when task is also present in subprojects runs all the matching tasks, for the above cases.
+- Can execute a task selector from a child project. Verify the tasks from the child project are executed.
+- Executing a task (as an `EntryPoint`) when task is also present in subprojects run the specified task only and nothing from subprojects.
+- Can request the entry points for all target Gradle versions.
+
diff --git a/design-docs/gradle-2.0.md b/design-docs/gradle-2.0.md
index d150a2e211e6..3563493fdfb0 100644
--- a/design-docs/gradle-2.0.md
+++ b/design-docs/gradle-2.0.md
@@ -6,18 +6,26 @@ list of ideas to consider before shipping Gradle 2.0.
 Note: for the change listed below, the old behaviour or feature to be removed should be deprecated in a Gradle 1.x release, probably no later than Gradle 1.9. Similarly
 for changes to behaviour.
 
-# Planned
+# Planned for 2.0
 
 The following stories are to be included in Gradle 2.0.
 
-## Remove all features deprecated as at Gradle 1.9
+## Un-deprecate using the packaging declared in a Maven POM to probe for the module artifacts
 
-In the Gradle 2.0-rc-1 release, remove all features that are deprecated as at Gradle 1.9 or earlier:
+Leave this behaviour in until the mechanisms to better infer the artifacts for a module have been implemented.
+
+## Remove all features deprecated as at Gradle 1.12
+
+In the Gradle 2.0-rc-1 release, remove all features that are deprecated as at Gradle 1.12 or earlier:
 
 * Search for usages of `DeprecationLogger`, `@Deprecated`, `@deprecated` and remove the associated feature.
 * Review usages of `DeprecationLogger.whileDisabled()`.
 * Remove `JavaPluginGoodBehaviourTest#changing debug flag does not produce deprecation warning`
 
+## Replace deprecation warnings with errors
+
+* Convert deprecated behaviours with errors.
+
 ## Remove Ivy types from the Gradle repository API
 
 These types expose the implementation details of dependency management and force a certain implementation on Gradle. Removing these types from the API
@@ -26,24 +34,11 @@ allows us to implement new features and remove some internal complexity.
 * Remove methods from `ArtifactRepositoryContainer` and `RepositoryHandler` that accept an Ivy `DependencyResolver` as parameter.
 * Remove methods from `ArtifactRepositoryContainer` that return `DependencyResolver`.
 * Remove `RepositoryHandler.mavenRepo()`.
-* Change the `MavenResolver` implementation so that it no longer extends `DependencyResolver`.
+* Change the `AbstractMavenResolver` so that it no longer extends `DependencyResolver`.
 * Change the `FlatDirRepository` implementation so that it no longer uses a `DependencyResolver` implementation.
+* Remove Ivy packages from the Gradle API filter.
 * Remove Ivy version from the output of `gradle -v`.
-
-## Remove the Gradle Open API
-
-Now that we have reasonable tooling support via the tooling API, remove the Open API.
-
-* Implement a stub to fail with a reasonable error message when attempting to use Gradle from the Open API.
-* Remove the remaining Open API classes and project.
-* Add integration test coverage.
-
-## Remove the `GradleLauncher` API
-
-The public API for launching Gradle is now the tooling API. The `GradleBuild` task can also be used.
-
-* Replace internal usages of the static `GradleLauncher` methods.
-* Move the `GradleLauncher` type from the public API to an internal package.
+* Remove loopback resolver, ModuleVersionRepository -> Ivy adapter.
 
 ## Remove tooling API support for Gradle 1.1 clients and earlier
 
@@ -51,8 +46,9 @@ Gradle 1.2 was released on 12th sept 2012. This change means that tooling more t
 will not be able to invoke Gradle 2.0 or later.
 
 * Change the implementation of methods on `ConnectionVersion4` and `InternalConnection` to fail with a decent error message.
-* The model implementations no longer need to implement `ProjectVersion3` or the protocol interfaces.
-* Add integration test coverage.
+* The model implementations no longer need to implement `ProjectVersion3` of the protocol interfaces.
+* Change test suite to default to tooling API versions >= 1.2.
+* Add integration test coverage that tooling API versions <1.2 fail with a reasonable error message, when running build or fetching model.
 
 ## Remove tooling API support for Gradle providers 1.0-milestone-7 and earlier
 
@@ -60,13 +56,10 @@ Gradle 1.0-milestone-8 was release on 14th feb 2012. This change means that tool
 approximately 2 years old as of the Gradle 2.0 release.
 
 * Consumer fails with a decent error message instead of falling back to the methods on `ConnectionVersion4`.
-* Remove the appropriate ConsumerConnection implementations.
-* Add integration test coverage.
-
-## Misc API tidy-ups
-
-* Remove unused `IllegalOperationAtExecutionTimeException`.
-* Remove unused `AntJavadoc`.
+* Add support for fetching partial `BuildEnvironment` model for unsupported versions.
+* Change the test suite to default to target Gradle version >= 1.0-milestone-8
+* Add integration test coverage that running build with Gradle version < 1.0-milestone-8 fails with a reasonable error message, when running build or fetching model.
+* Add integration test coverage that can fetch a partial `BuildEnvironment` model for Gradle version < 1.0-milestone-8.
 
 ## Reset deprecation warnings
 
@@ -75,10 +68,37 @@ approximately 2 years old as of the Gradle 2.0 release.
 ## All Gradle scripts use UTF-8 encoding
 
 * Change Gradle script parsing to assume UTF-8 encoding.
+* Prefer character encoding specified by the server, if any.
+* Update user guide to mention this.
+
+## Upgrade to most recent Groovy 2.2.x
 
-## Upgrade to most recent Groovy 2.x
+* Change the version of Groovy exposed via the Gradle API to most recent Groovy 2.2.x version.
+* Change to use `groovy` instead of `groovy-all`.
+    * Change Groovy runtime detector to deal with this change.
+* Add int test coverage for building and groovydoc for permutations of Groovy versions and (`groovy` or `groovy-all`)
+
+## Remove support for running Gradle on Java 5
 
-* Change the version of Groovy exposed via the Gradle API to most recent Groovy 2.x.
+In order to add support for Java 8, we will need to upgrade to Groovy 2.3, which does not support Java 5.
+Would still be able to build for Java 5.
+
+* Add cross-compilation int tests for Java 5 - 8.
+* Document how to build for Java 5.
+* Compile wrapper, launcher and tooling API connection entry points separately for Java 5.
+* Update CI builds to use newer Java versions.
+* Entry points complain when executed using Java 5.
+* Drop support for running with Java 5.
+
+## Add support for Java 8
+
+* Change the version of Groovy exposed via the Gradle API to most recent Groovy 2.3.x version.
+* Remove source exclusions for jdk6.
+* Change `InetAddressFactory` so that it no longer uses reflection to inspect `NetworkInterface`.
+* Remove the special case logging from `LogbackLoggingConfigurer`.
+* Replace usages of `guava-jdk5`.
+* Clean up usages of `TestPrecondition.JDK5` and related preconditions.
+* Add warning when using Java version > 8 to inform the user that the Java version may not be supported.
 
 ## Archive tasks + base plugin
 
@@ -92,176 +112,3 @@ The current defaults for the outputs of tasks of type `Test` conflict with each
 * Change the default result and report directory for the `Test` type to include the task's name, so that the default
   does not conflict with the default for any other `Test` task.
 * Change the default TestNG output directory.
-
-## Rename this spec
-
-# Candidates
-
-The following stories are candidates to be included in a major release of Gradle. Currently, they are *not* scheduled to be included in Gradle 2.0.
-
-## Remove `group` and `status` from project
-
-Alternatively, default the group to `null` and status to `integration`.
-
-## Remove the Ant-task based Scala compiler
-
-* Change the default for `useAnt` to `false` and deprecate the `useAnt` property.
-
-## Don't inject tools.jar into the system ClassLoader
-
-Currently required for in-process Ant-based compilation on Java 5. Dropping support for one of (in-process, ant-based, java 5) would allow us to remove this.
-
-## Decouple publishing DSL from Maven Ant tasks
-
-* Change the old publishing DSL to use the Maven 3 classes instead of Maven 2 classes. This affects:
-    * `MavenResolver.settings`
-    * `MavenDeployer.repository` and `snapshotRepository`.
-    * `MavenPom.dependencies`.
-* Remove `MavenDeployer.addProtocolProviderJars()`.
-* Change `PublishFilter` so that it accepts a `PublishArtifact` instead of an `Artifact`.
-
-## Copy tasks
-
-There are several inconsistencies and confusing behaviours in the copy tasks and copy spec:
-
-* Change copy tasks so that they no longer implement `CopySpec`. Instead, they should have a `content` property which is a `CopySpec` that contains the main content.
-  Leave behind some methods which operate on the file tree as a whole, eg `eachFile()`, `duplicatesStrategy`, `matching()`.
-* Change the copy tasks so that `into` always refers to the root of the destination file tree, and that `destinationDir` (possibly with a better name) is instead used
-  to specify the root of the destination file tree, for those tasks that produce a file tree on the file system.
-* Change the `Jar` type so that there is a single `metaInf` copy spec which is a child of the main content, rather than creating a new copy spec each time `metainf`
-  is referenced. Do the same for `War.webInf`.
-* The `CopySpec.with()` method currently assumes that a root copy spec is supplied with all values specified, and no values are inherted by the attached copy spec.
-  Instead, change `CopySpec.with()` so that values are inherited from the copy spec.
-* Change the default duplicatesStrategy to `fail` or perhaps `warn`.
-* Change the `Ear` type so that the generated descriptor takes precedence over a descriptor in the main content, similar to the manifest for `Jar` and the
-  web XML for `War`.
-
-## Remove old dependency result graph
-
-The old dependency result graph is expensive in terms of heap usage. We should remove it.
-
-* Promote new dependency result graph to un-incubate it.
-* Remove methods that use `ResolvedDependency` and `UnresolvedDependency`.
-* Keep `ResolvedArtifact` and replace it later, as it is not terribly expensive to keep.
-
-## Remove API methods that are added by the DSL decoration
-
-Some model types hand-code the DSL conventions in their API. We should remove these and let the DSL decoration take care of this, to simplify these
-types and to offer a more consistent DSL.
-
-* Remove all methods that accept a `Closure` when an `Action` overload is available. Add missing overloads where appropriate.
-* Remove all methods that accept a `String` or `Object` when a enum overload is available. Add missing overloads where appropriate.
-* Remove CharSequence -> Enum conversion code in `DefaultTaskLogging`.
-* Remove all set methods that contain no custom logic.
-
-## Tooling API clean ups
-
-* Move `UnsupportedBuildArgumentException` and `UnsupportedOperationConfigurationException` up to `org.gradle.tooling`, to remove
-  package cycle from the API.
-
-## Clean up `DefaultTask` hierarchy
-
-* Inline `ConventionTask` and `AbstractTask` into `DefaultTask`.
-* Remove `Task.dependsOnTaskDidWork()`.
-* Mix `TaskInternal` in during decoration and remove references to internal types.
-
-## Remove references to internal classes from API
-
-* Remove `Configurable` from public API types.
-* Remove `PomFilterContainer.getActivePomFilters()`.
-* Change `StartParameter` so that it no longer extends `LoggingConfiguration`.
-* Move `ConflictResolution` from public API (it's only used internally).
-* Move `Module` from public API (it's only used internally).
-* Move `Logging.ANT_IVY_2_SLF4J_LEVEL_MAPPER` from public API.
-* Move `AntGroovydoc` and `AntScalaDoc` from public API.
-* Move `BuildExceptionReporter`, `BuildResultLogger`, `TaskExecutionLogger` and `BuildLogger` from public API.
-
-## Remove support for convention objects
-
-Extension objects have been available for over 2 years and are now an established pattern.
-
-* Migrate core plugins to use extensions.
-* Remove `Convention` type.
-
-## Container API tidy-ups
-
-* Remove the specialised subclasses of `UnknownDomainObjectException` and the overridden methods that exist simply to declare this from `PluginContainer`, `ArtifactRepositoryContainer`,
-  `ConfigurationContainer`, `TaskCollection`.
-* Remove the specialised methods such as `whenTaskAdded()` from `PluginCollection`, `TaskCollection`
-* Remove the `extends T` upper bound on the type variable of `DomainObjectCollection.withType()`.
-* Remove the type varable from `ReportContainer`
-* Remove unused constants from `ArtifactRepositoryContainer`
-* Move `ReportContainer.ImmutableViolationException` to make top level.
-
-## Dependency API tidy-ups
-
-* Remove `equals()` implementations from `Dependency` subclasses.
-* Remove `ExternalDependency.force`. Use resolution strategy instead.
-* Remove `SelfResolvingDependency.resolve()` methods. These should be internal and invoked only as part of resolution.
-* Remove `ClientModule` and replace with consumer-side component meta-data rules.
-* Remove `ExternalModuleDependency.changing`. Use component meta-data rules instead.
-
-## Invocation API tidy-ups
-
-* Remove the public `StartParameter` constructor.
-* Change `StartParameter` into an interface.
-
-## Misc API tidy-ups
-
-* Rename `IllegalDependencyNotation` to add `Exception` to the end of its name.
-* Remove `ConventionProperty`, replace it with documentation.
-* Remove `Settings.startParameter`. Can use `gradle.startParameter` instead.
-* Remove `org.gradle.util` from default imports.
-* Remove `AbstractOptions`.
-
-## Remove `sonar` plugin
-
-Promote the `sonar-runner` plugin and remove the `sonar` plugin.
-
-## Remove support for running Gradle on Java 5
-
-Would still be able to compile for Java 5. Would need to improve cross-compilation support.
-
-## Remove usages of JNA and JNA-Posix
-
-Replace all usages of JNA and JNA-Posix with native-platform. Currently, this means that console support and
-UNIX file permissions with JVMs earlier than Java 7 will not be supported on the following platforms:
-
-* Linux-ia64
-* Solaris-x86, -amd64, -sparc, -sparcv9
-* FreeBSD-i386, -amd64
-
-## Decorate classes at load time instead of subclassing
-
-Decorating classes at load time is generally a more reliable approach and offers a few new interesting use cases we can support. For example, by decorating classes
-at load time we can support expressions such as `new MyDslType()`, rather than requiring that Gradle control the instantiation of decorated objects.
-
-Switching to decoration at load time should generally be transparent to most things, except for clients of `ProjectBuilder` that refer to types
-which are not loaded by Gradle, such as the classes under test.
-
-## Restructure plugin package hierarchy
-
-## buildNeeded and buildDependents
-
-* Rename buildDependents to buildDownstream
-* Rename buildNeeded to buildUpstream
-* Add a new task buildStream which is equivalent to buildDownstream buildUpstream
-
-## build.gradle in a multiproject build
-
-* A Gradle best pattern is to name the gradle file to be the same name as the subproject. 
-* In Gradle 2.0, let's support this out of the box, possibly as a preference to `build.gradle`, and maybe drop support for `build.gradle` in subprojects.
-
-## Why remind people about Maven?
-
-Change from:
-
-    repositories {
-        mavenCentral()
-    }
-
-to:
-
-    repositories {
-        central()
-    }
diff --git a/design-docs/gradle-3.0.md b/design-docs/gradle-3.0.md
new file mode 100644
index 000000000000..c5d997846596
--- /dev/null
+++ b/design-docs/gradle-3.0.md
@@ -0,0 +1,162 @@
+# Gradle 3.0
+
+Gradle 3.0 is the next major Gradle release that offers the opportunity to make breaking changes to the public interface of Gradle. This document captures a laundry
+list of ideas to consider before shipping Gradle 3.0.
+
+Note: for the change listed below, the old behaviour or feature to be removed should be deprecated in a Gradle 2.x release. Similarly for changes to behaviour.
+
+# Candidates for Gradle 3.0
+
+The following stories are candidates to be included in a major release of Gradle. Currently, they are *not* scheduled to be included in Gradle 3.0.
+
+## Remove the Gradle Open API stubs
+
+* Remove the remaining Open API interfaces and stubs.
+* Remove the `openApi` project.
+
+## Remove `group` and `status` from project
+
+Alternatively, default the group to `null` and status to `integration`.
+
+## Remove the Ant-task based Scala compiler
+
+* Change the default for `useAnt` to `false` and deprecate the `useAnt` property.
+
+## Don't inject tools.jar into the system ClassLoader
+
+Currently required for in-process Ant-based compilation on Java 5. Dropping support for one of (in-process, ant-based, java 5) would allow us to remove this.
+
+## Decouple publishing DSL from Maven Ant tasks
+
+* Change the old publishing DSL to use the Maven 3 classes instead of Maven 2 classes. This affects:
+    * `MavenResolver.settings`
+    * `MavenDeployer.repository` and `snapshotRepository`.
+    * `MavenPom.dependencies`.
+* Remove `MavenDeployer.addProtocolProviderJars()`.
+* Change `PublishFilter` so that it accepts a `PublishArtifact` instead of an `Artifact`.
+
+## Copy tasks
+
+There are several inconsistencies and confusing behaviours in the copy tasks and copy spec:
+
+* Change copy tasks so that they no longer implement `CopySpec`. Instead, they should have a `content` property which is a `CopySpec` that contains the main content.
+  Leave behind some methods which operate on the file tree as a whole, eg `eachFile()`, `duplicatesStrategy`, `matching()`.
+* Change the copy tasks so that `into` always refers to the root of the destination file tree, and that `destinationDir` (possibly with a better name) is instead used
+  to specify the root of the destination file tree, for those tasks that produce a file tree on the file system.
+* Change the `Jar` type so that there is a single `metaInf` copy spec which is a child of the main content, rather than creating a new copy spec each time `metainf`
+  is referenced. Do the same for `War.webInf`.
+* The `CopySpec.with()` method currently assumes that a root copy spec is supplied with all values specified, and no values are inherted by the attached copy spec.
+  Instead, change `CopySpec.with()` so that values are inherited from the copy spec.
+* Change the default duplicatesStrategy to `fail` or perhaps `warn`.
+* Change the `Ear` type so that the generated descriptor takes precedence over a descriptor in the main content, similar to the manifest for `Jar` and the
+  web XML for `War`.
+
+## Remove old dependency result graph
+
+The old dependency result graph is expensive in terms of heap usage. We should remove it.
+
+* Promote new dependency result graph to un-incubate it.
+* Remove methods that use `ResolvedDependency` and `UnresolvedDependency`.
+* Keep `ResolvedArtifact` and replace it later, as it is not terribly expensive to keep.
+
+## Remove API methods that are added by the DSL decoration
+
+Some model types hand-code the DSL conventions in their API. We should remove these and let the DSL decoration take care of this, to simplify these
+types and to offer a more consistent DSL.
+
+* Remove all methods that accept a `Closure` when an `Action` overload is available. Add missing overloads where appropriate.
+* Remove all methods that accept a `String` or `Object` when a enum overload is available. Add missing overloads where appropriate.
+* Remove CharSequence -> Enum conversion code in `DefaultTaskLogging`.
+* Remove all set methods that contain no custom logic.
+
+## Tooling API clean ups
+
+* Move `UnsupportedBuildArgumentException` and `UnsupportedOperationConfigurationException` up to `org.gradle.tooling`, to remove
+  package cycle from the API.
+
+## Clean up `DefaultTask` hierarchy
+
+* Inline `ConventionTask` and `AbstractTask` into `DefaultTask`.
+* Remove `Task.dependsOnTaskDidWork()`.
+* Mix `TaskInternal` in during decoration and remove references to internal types.
+
+## Remove references to internal classes from API
+
+* Remove `Configurable` from public API types.
+* Remove `PomFilterContainer.getActivePomFilters()`.
+* Change `StartParameter` so that it no longer extends `LoggingConfiguration`.
+* Move `ConflictResolution` from public API (it's only used internally).
+* Move `Module` from public API (it's only used internally).
+* Move `Logging.ANT_IVY_2_SLF4J_LEVEL_MAPPER` from public API.
+* Move `AntGroovydoc` and `AntScalaDoc` from public API.
+* Move `BuildExceptionReporter`, `BuildResultLogger`, `TaskExecutionLogger` and `BuildLogger` out of the public API.
+
+## Remove support for convention objects
+
+Extension objects have been available for over 2 years and are now an established pattern.
+
+* Migrate core plugins to use extensions.
+* Remove `Convention` type.
+
+## Project no longer inherits from its parent project
+
+* Project should not delegate to its build script for missing properties or methods.
+* Project should not delegate to its parent for missing properties or methods.
+* Project build script classpath should not inherit anything from parent project.
+
+## Container API tidy-ups
+
+* Remove the specialised subclasses of `UnknownDomainObjectException` and the overridden methods that exist simply to declare this from `PluginContainer`, `ArtifactRepositoryContainer`,
+  `ConfigurationContainer`, `TaskCollection`.
+* Remove the specialised methods such as `whenTaskAdded()` from `PluginCollection`, `TaskCollection`
+* Remove the `extends T` upper bound on the type variable of `DomainObjectCollection.withType()`.
+* Remove the type variable from `ReportContainer`
+* Remove unused constants from `ArtifactRepositoryContainer`
+* Move `ReportContainer.ImmutableViolationException` to make top level.
+
+## Dependency API tidy-ups
+
+* Remove `equals()` implementations from `Dependency` subclasses.
+* Remove `ExternalDependency.force`. Use resolution strategy instead.
+* Remove `SelfResolvingDependency.resolve()` methods. These should be internal and invoked only as part of resolution.
+* Remove `ClientModule` and replace with consumer-side component meta-data rules.
+* Remove `ExternalModuleDependency.changing`. Use component meta-data rules instead.
+
+## Invocation API tidy-ups
+
+* Remove the public `StartParameter` constructor.
+* Remove the public `StartParameter` constants, `GRADLE_USER_HOME_PROPERTY_KEY` and `GRADLE_USER_HOME_PROPERTY_KEY`.
+* Change `StartParameter` into an interface.
+
+## Misc API tidy-ups
+
+* Rename `IllegalDependencyNotation` to add `Exception` to the end of its name.
+* Remove `ConventionProperty`, replace it with documentation.
+* Remove `Settings.startParameter`. Can use `gradle.startParameter` instead.
+* Remove `org.gradle.util` from default imports.
+* Remove `AbstractOptions`.
+
+## Remove `sonar` plugin
+
+Promote the `sonar-runner` plugin and remove the `sonar` plugin.
+
+## Decorate classes at load time instead of subclassing
+
+Decorating classes at load time is generally a more reliable approach and offers a few new interesting use cases we can support. For example, by decorating classes
+at load time we can support expressions such as `new MyDslType()`, rather than requiring that Gradle control the instantiation of decorated objects.
+
+Switching to decoration at load time should generally be transparent to most things, except for clients of `ProjectBuilder` that refer to types
+which are not loaded by Gradle, such as the classes under test.
+
+## Restructure plugin package hierarchy
+
+## buildNeeded and buildDependents
+
+* Rename buildDependents to buildDownstream
+* Rename buildNeeded to buildUpstream
+* Add a new task buildStream which is equivalent to buildDownstream buildUpstream
+
+## build.gradle in a multiproject build
+
+* A Gradle best pattern is to name the gradle file to be the same name as the subproject.
+* Let's support this out of the box, possibly as a preference to `build.gradle`, and maybe drop support for `build.gradle` in subprojects.
diff --git a/design-docs/ide-integration.md b/design-docs/ide-integration.md
index 1842d7f3dfd0..af90aef3bd3e 100644
--- a/design-docs/ide-integration.md
+++ b/design-docs/ide-integration.md
@@ -82,34 +82,80 @@ Change the task visibility logic so that the lifecycle task of all `BuildableMod
 A new model will be available for defining IDEA scopes: these scopes will formed by combining and excluding Gradle configurations and other scopes.
 The model can statically restrict the available scopes to 'compile', 'runtime', 'provided' and 'test'.
 
-- scope `provided` should default to empty, or `configurations.providedCompile` when the war plugin is applied.
-- scope `compile` should default to `configurations.compile` minus scope `provided`.
-- scope `runtime` should default to `configurations.runtime` minus scope `compile`.
-- scope `test` should default to (`configurations.testCompile` minus scope `compile`) union (`configurations.testRuntime` minus scope `runtime`).
+#### Model
 
-#### User visible changes
+Introduce a model for binaries that run on the JVM and that are built locally:
 
-TODO: Example DSL
+    interface Classpath { // This type already exists
+        ...
+        libs(Object) // Adds libraries to this classpath
+    }
 
-The new DSL (and model defaults) will be used to configure an IDEA module when the current `scopes` map has not been altered by the user.
-Once the new DSL is stabilised we will deprecate and remove the `scopes` map.
+    interface JvmPlatform {
+        Classpath compile
+        Classpath runtime
+    }
+
+    interface JvmBinary {
+        JvmPlatform platform
+        Classpath compile
+        Classpath runtime
+    }
 
-Initial proposal for the new DSL is to support complete scope definition ...
+    interface MainJvmBinary extends JvmBinary {
+        JvmBinary tests
+    }
+
+The Java base plugin registers an implementation of `MainJvmBinary`, and the Java and WAR plugins fill it in so that:
+
+- `configurations.compile` is added to `jvmBinary.compile`
+- `configurations.runtime` is added to `jvmBinary.runtime`
+- `configurations.testCompile` is added to `jvmBinary.test.compile`
+- `configurations.testRuntime` is added to `jvmBinary.test.runtime`
+- `configurations.providedCompile` is added to `jvmBinary.platform.compile`
+- `configurations.providedRuntime` is added to `jvmBinary.platform.runtime`
+
+Introduce IDEA scope model:
+
+    interface IdeaScope {
+        String name
+        List<Dependency> libraries // read-only, calculated on demand
+    }
+
+    interface IdeaScopes {
+        IdeaScope provided
+        IdeaScope compile
+        IdeaScope runtime
+        IdeaScope test
+    }
 
-```
-    ideaScope.TEST.build {
-      filtered(base: configurations.testCompile, excluded: configurations.compile)
-      filtered(base: configurations.testRuntime, excluded: configurations.runtime)
+    class IdeaModule { // this type already exists
+        ...
+        IdeaScopes ideaScopes
     }
-```
 
-... or to append to previously defined set of items for this scope like ...
+The IDEA plugin calculates the contents of the scopes based on the `JvmBinary` model defined above:
 
-```
-    ideaScope.TEST.append {
-      configurations.integTestCompile
+- scope `provided` should contain `jvmBinary.platform.compile`
+- scope `compile` should contain `jvmBinary.compile` minus scope `provided`.
+- scope `runtime` should contain (`jvmBinary.runtime` union `jvmBinary.platform.runtime`) minus scope `compile`.
+- scope `test` should contain (`jvmBinary.test.compile` minus scope `compile`) union (`jvmBinary.test.runtime` minus scope `runtime`).
+
+An example customisation:
+
+    binaries {
+        jvm {
+            test.compile configurations.integTestCompile
+            test.runtime configurations.integTestRuntime
+
+            platform.compile configurations.myCustomProvided
+        }
     }
-```
+
+TODO: Example DSL
+
+The new DSL (and model defaults) will be used to configure an IDEA module when the current `scopes` map has not been altered by the user.
+Once the new DSL is stabilised we will deprecate and remove the `scopes` map.
 
 #### Implementation
 
@@ -129,7 +175,7 @@ Initial proposal for the new DSL is to support complete scope definition ...
     - When a java project has a dependency declared for `testRuntime` and `runtime`, the dependency appears with `runtime` scope only.
     - When a java project has a dependency declared for `compile` and `testCompile`, the dependency appears with `compile` scope only.
     - When a war project has a dependency declared for `providedCompile` and `compile`, the dependency appears with `provided` scope only.
-- Current defaults are used when the `scopes` maps is configured by user
+- Current defaults are used when the `scopes` maps is configured by user.
 - User is informed of failure when both `scopes` map and new DSL are configured.
 
 #### Open issues
@@ -148,6 +194,20 @@ Later stories incrementally add more graceful cancellation handling.
 
 See [tooling-api-improvements.md](tooling-api-improvements.md#story-tooling-api-client-cancels-a-long-running-operation)
 
+## Feature - Expose dependency resolution problems
+
+- For the following kinds of failures:
+    - Missing or broken module version
+    - Missing or broken jar
+    - Missing or broken source and javadoc artifact
+- Change the IDE plugins to warn for each such problem it ignores, and fail on all others.
+- Change the tooling model include the failure details for each such problem.
+
+### Test coverage
+
+- Change the existing IDE plugin int tests to verify the warning is produced in each of the above cases.
+- Add test coverage for the tooling API to cover the above cases.
+
 ## Feature - Expose build script compilation details
 
 See [tooling-api-improvements.md](tooling-api-improvements.md#story-expose-the-compile-details-of-a-build-script):
@@ -204,12 +264,6 @@ Expose Scala language level and other details about a Scala component.
 
 Expose the corresponding Eclipse and IDEA model.
 
-### Story - Expose the publications of a project
-
-See [tooling-api-improvements.md](tooling-api-improvements.md#story-expose-the-publications-of-a-project):
-
-Expose the publications of a project so that the IDE can wire together Gradle and Maven builds.
-
 ### Story - Expose Web components to the IDE
 
 Expose Web content, servlet API version, web.xml descriptor, runtime and container classpaths, and other details about a web application.
diff --git a/design-docs/incremental-java-compilation.md b/design-docs/incremental-java-compilation.md
index b44268b36ed1..6e32ed04ab0e 100644
--- a/design-docs/incremental-java-compilation.md
+++ b/design-docs/incremental-java-compilation.md
@@ -2,14 +2,14 @@
 
 Generally, we want the developer cycles to get faster, overall build performance better.
 
-- faster java compilation where little input source java classes have changed - the compiler is instructed to compile a fixed set of input classes instead of all.
+- faster java compilation where few input java source files have changed - the compiler is instructed to compile a fixed set of input source files instead of all.
 - faster multi-project build: upstream project contains changed java classes. Those classes are not used by downstream projects.
     Hence, some(all) downstream projects may completely skip compilation step (or at least, compile incrementally/selectively)
-- less output classes are changed. This way, tools like JRebel are faster as they listen to the changed output classes, the less classes changed, the faster JRebel reload is.
+- fewer output classes are changed. This way, tools like JRebel are faster as they listen to the changed output classes, the less classes changed, the faster JRebel reload is.
 
 # Story: basic incremental compilation within a single project
 
-Faster compilation when little input classes (leaf classes) changed. The selection of classes for compilation needs to be reliable.
+Faster compilation when few input source files have changed. The selection of classes for compilation needs to be reliable.
 Only relevant output classes are changed, remaining output classes are untouched.
 
 ## Implementation notes for the initial story
@@ -30,16 +30,62 @@ Only relevant output classes are changed, remaining output classes are untouched
 - serialize to disk after compile task run, deserialize before compilation
 - use simplest possible serialization mechanism
 
-### Coverage
-
-- detects deletion of class
-- detects adding of a new class
-- detects change in a class
+## Test Coverage
+
+- detects deletion of a source file
+    - class that is not used by any other class, the output class file is removed. No other output files are changed.
+    - class is used by another class, compilation fails.
+    - removes output files for inner and anonymous classes.
+- detects adding of a new source file
+    - output files are added. No other output files are changed.
+- detects change in a source file
+    - class that is not used by any other class, output class file has changed. No other output files are changed.
+    - removes output files for inner and anonymous classes that no longer exist.
+    - class that is used by another class, the output class files of both are changed. No other output files are changed.
 - understands class dependencies, require dependents to be rebuild
-- anything on the classpath that is not originating from the java source will require full rebuild upon change.
-    Most importantly, any jar dependency changes, directories on classpath that are from source, assume full rebuild.
+    - transitive dependencies.
+    - cycles in class dependencies.
+    - class that is a source-only annotation is changed, all source files are recompiled.
+    - class that contains a constant is changed, all source files are recompiled.
+- anything on the compile classpath that does not originate from the java source will require full rebuild upon change.
+    - classpath jar or directory added.
+    - classpath jar or directory removed.
+    - classpath jar or directory changed.
+- two compile tasks share the same source files but different classpath
+
+# Story: Handle transitive source dependencies
+
+## Test coverage
+
+- given `class C extends B { }; class B extends A { }; class A` then when the source file for `A` is changed, the source files for `B` and `C` should be recompiled
+
+# Story: Handle duplicate source files
+
+- when two source files that define the same class are present in the source files, then only changes to the first source file should be considered. Changes to the
+second source file should be ignored
+- possibly warn when duplicate source files are present in the inputs.
+
+## Test coverage
+
+TBD
+
+# Story: Incremental compilation ignores resources in compilation classpath
+
+Ignore changes to resource (eg a manifest or some other non-class file) in the compilation classpath.
 
-# Story: basic incremental compilation across multi-project build
+# Story: Incremental compilation in the presence of joint compilation
+
+Need to consider the classes implicitly available in the output directory, which are also included on the compile classpath.
+
+# Story: Incremental compilation in the presence of compile failures
+
+Don't switch to full compilation when previous execution failed due to compilation failures.
+
+# Story: Performance tests for incremental compilation
+
+Need to measure the performance of incremental vs full compilation
+
+# Story: Basic incremental compilation across tasks
 
 ### Coverage
 
@@ -57,9 +103,16 @@ Seems simpler and might be good enough as a starter.
 This way, the incremental compilation knows what classes have changed in given project dependency.
 This approach should be reliable but it may be slower. We need to unzip the jar and hash the contents.
 
-# Other stories / ideas
+### Open issues
 
-## Don't compile a source file when the API of its compile dependencies has not changed
+- handle duplicate classes in compilation classpath
+
+# Story: Improve performance for cached incremental compilation state
+
+- share cached state between tasks
+- cache state in-memory for daemon
+
+# Story: Don't compile a source file when the API of its compile dependencies has not changed
 
 Currently, changing the body of a method invalidates all class files that have been compiled against the method's class. Instead, only the method's class should be recompiled.
 Similarly, changing a resource file invalidates all class files that included that resource file in the compile classpath. Instead, resource files should be ignored
@@ -67,4 +120,8 @@ when compiling.
 
 We don't necessarily need a full incremental Java compilation to improve this. For example, the Java compilation task may consider the API of the compile classpath - if it has
 changed, then compile all source files, and if it has not, skip the task (assuming everything else is up to date). This means that a change to a method body does not propagate
-through the dependency graph.
\ No newline at end of file
+through the dependency graph.
+
+# Story: Deprecate and remove Ant based dependency analysis
+
+- need to promote `options.incremental` flag.
diff --git a/design-docs/publishing-and-sharing-plugins.md b/design-docs/publishing-and-sharing-plugins.md
index 52b4f09a2e79..38a4c2991545 100644
--- a/design-docs/publishing-and-sharing-plugins.md
+++ b/design-docs/publishing-and-sharing-plugins.md
@@ -49,361 +49,583 @@ community plugins and the dependencies of whatever I need to build.
 Similarly, the installation image of Android Studio needs to bundle the Gradle runtime, some core plugins, the Android plugin and some
 dependencies.
 
-# Implementation plan
+# Goals / Rationale
+
+## Spec to implementation mapping
+
+Resolving plugins is more complicated than resolving Maven or Ivy dependencies (as currently implemented/practiced).
+Conceptually, an extra layer is necessary to resolve a “plugin spec” (i.e. id/version) into a description of how to use it (i.e. the software and metadata needed to 'instantiate' it).
+Potentially, then the implementation of the components then need to be resolved.
+Decoupling the requirement (i.e. plugin X) from how to provide it (i.e. this jar in that repository) enables many benefits.
+
+## Forward declaration
+
+Additionally, the fact that a build uses a given plugin will be “hoisted” up.
+At the moment, we can't reliably identify what plugins are used by a build until we configure the whole build.
+This prevents us from using that information in helpful ways.
+For example, tooling could determine which plugins are in use without having to run full configuration and could provide better authoring assistance.
+It also allows more optimised classloading structures to be formed.
+
+Another important implication here is that it opens the door to better tooling support.
+Knowing which plugins are in use can potentially provide a lot of information relevant to editors in order to provide assistance (e.g. autocomplete).
+By plugins being forward declared, we can know what plugins are in use without requiring the script to be well formed.
+
+## Isolation
+
+Plugins also need to be insulated from each other.
+Currently plugin implementations are pushed into a common classloader in many circumstances.
+This causes class versioning problems, and all of the other problems associated with loading arbitrary code into an unpartitioned class space.
+Plugins under the new mechanism will be subject to isolation from each other, and collaboration made more formal.
+
+Plugins forward declare their dependencies on other JVM libraries and separately on other Gradle plugins.
+Plugins also declare which classes from their implementation and dependencies are exported (i.e. visible to consumers of the plugin).
+
+_The exact mechanism and semantics of this sharing are TBD._
+
+## Plugin dependencies
+
+Plugin dependencies of plugins are now forward declared, which is available as part of the plugin metadata.
+When a user declares a dependency on a plugin, Gradle manages transitive resolution of all plugin dependencies and guarantees that all plugin dependencies have been _applied_ before the plugin is applied.
+
+Therefore, ideally, plugins will no longer use project.apply() to apply plugins but will rely on Gradle applying the plugin because the dependency was declared.
+Because use of plugins, and the dependencies of those plugins, is forward declared we can understand which plugins are used by a build without executing any “configuration” code.
+
+This means that plugin application is never conditional.
+More fine grained mechanisms will be available to plugin implementations for implementing conditional logic (i.e. model configuration rules).
+
+## Plugin ids
+
+Plugin ids will now be namespaced.
+This avoids collision by partitioning the namespace.
+Importantly, it also allows us (Gradle core team) to provide an “official” implementation of a previously available plugin by creating our own version, or taking ownership of the existing, and releasing under our namespace.
 
-There are several main parts to the solution:
+Plugin ids…
 
-A [public repository](https://bintray.com/gradle/gradle-plugins) hosted at [bintray](http://bintray.com) will be created to make plugins
-available to the community. The bintray UI provides plugin authors with a simple way publish and share their plugin with the community.
-It also allows build authors with a simple way to discover plugins.
+1. may contain any alpha numeric ascii character, '.', '_' and -
+1. must contain at least one '.' character, that separates the namespace from the name
+1. consist of a namespace (everything before the last '.') and a name (everything after the last '.')
+1. conventionally use a lowercase reverse domain name convention for the namespace component
+1. conventionally use only lowercase characters for the name component
+1. 'org.gradle' and 'com.gradleware' namespaces are reserved (users are actively prevented from using these namespaces)
+1. Cannot start or end with '.'
+1. Cannot contain '..'
 
-The second part of the solution will be to improve the plugin resolution mechanism in Gradle to resolve plugins from
-this repository in some convenient way.
+Plugin specs can be made of qualified («namespace.name») or unqualified («name») plugin ids.
 
-Implementation-wise, we plan to change the mechanism for resolving a plugin declaration to a plugin implementation class
-to add an extension point. This will allow any particular strategy to be implemented, and strategies to be combined.
+Qualified: `org.gradle.java`
+Unqualified: `java`
 
-Built on top of this extension point will be a resolver implementation that uses the package meta-data from the bintray
-repository to resolve a plugin reference to a bintray package, and then to an implementation class.
+Individual plugin resolvers are at liberty to implicitly qualify unqualified ids.
+For example, the `plugins.gradle.org` based plugin resolver implicitly qualifies all unqualified ids to the `'org.gradle'` namespace.
 
-A "plugin development" plugin will be added to help plugin authors to build, test and publish their plugin to a repository,
-with additional integration with bintray to add the appropriate meta-data.
+### Open Questions
 
-Some additional reporting will also be added to help build authors understand the plugins that are used in their build and
-to discover new versions of the plugins that they are using.
+- Should we support all unicode alphanums? (it seems there is less agreement about what this set is)
+- When there is more than one implicit namespace, collisions can change over time as new plugins get added to the earlier resolved namespaces
 
-## Declaring and applying plugins
+## plugins.gradle.org
 
-A new DSL block will be introduced to apply plugins from a Gradle script. The plugins declared in this block will be made
-available to the script's compile classpath:
+Gradle will ask questions of this service via a JSON-over-HTTP API that is tailored for Gradle.
+Initially the focus of the service will be to power plugin _use_; over time it will expand to include browsing/searching and publishing.
+The `plugins.gradle.org` service will use a [Gradle plugin specific bintray repository](https://bintray.com/gradle/gradle-plugins) (implicitly) as the source of data.
+Bintray provides hosting, browsing, searching, publishing etc.
+
+# Implementation plan
+
+## Declaring plugins
+
+A new DSL block will be introduced to apply plugins from a Gradle script. 
 
     plugins {
-        // Apply the given plugin to the target of the script
-        apply plugin: 'some-plugin'
+        // Declare that 
+        id "some-plugin"
+        id("some-plugin")
+        
         // Apply the given version of the plugin to the target of the script
-        apply plugin: 'some-plugin', version: '1.2+'
-        // Apply the given script to the target of this script
-        apply from: 'some-script.gradle'
+        id 'some-plugin' version '1.2+'
+        id('some-plugin').version('1.2+')
     }
 
 The block will be supported in build, settings and init scripts.
 
-Using a separate DSL block means that:
-
-- The block can be executed before the rest of the script is compiled. This way, the public API of each plugin can be made available to the script.
-- The block can be executed early in the build, to allow configuration-time dependencies on other projects to be declared.
-- The plugin DSL can be evolved without affecting the current DSL.
-
-The `plugins {} ` block is executed after the `buildscript {}` blocks, and must appear after it in the script.
 Script execution becomes:
 
-1. Parse the script to extract the `buildscript {}` and `plugins {}` blocks.
-2. Compile the blocks, using the Gradle API as compile classpath. This means that the classpath declared in the `buildscript {}` block
-   will not be available to the `plugins {}` block.
-2. Execute the blocks in the order they appear in the script.
-3. Resolve the script compile classpath. This means resolving the `classpath` declared in the `buildscript {}` block, plus the public API
-   declared for each plugin, and detecting and resolving conflicts.
-4. Compile the script.
-5. Execute the script.
-
-The `plugins {}` block does not delegate to the script's target object. Instead, each script has its own plugin handler. This handler represents
-a context for resolving plugin declarations. The plugin handler is responsible for taking a plugin declaration, resolving it, and then
-applying the resulting plugin implementation to the script's target object.
+1. Parse the script to extract the `buildscript {}` and `plugins {}` blocks
+1. Compile the blocks, using only the Gradle API as compile classpath 
+1. Execute the blocks in the order they appear in the script
+1. Resolve the script compile classpath according to `buildscript {}`
+1. Resolve the plugins according to `plugins {}` (details in subsequent section)
+1. Merge the script compile classpath contributions from `plugins {}` with `buildscript {}`
+1. Compile the “rest” of the script
+1. Apply the plugins defined by `plugins {}` to the target (details in subsequent section)
+1. Execute the "rest" of the script as per normal
 
 Note that plugins that are declared in the `plugins {}` block are not visible in any classpath outside the declaring script. This contrasts to the
 classpath declared in a build script `buildscript {}` block, which is visible to the build scripts of child projects.
 
+The `plugins {}` block is a _heavily_ restricted DSL. 
+The only allowed constructs are:
+
+1. Calls to the `id(String)` method with a `String` literal object, and potentially a call to the `version(String)` with a string literal method of this methods return.
+
+Attempts to do _anything_ else will result in a _compile_ error.
+This guarantees that we can execute the `plugins {}` block at any time to understand what plugins are going to be used.
+
+The order of plugin declarations is insignificant.
+The natural ordering of plugin application is alphabetical based on plugin _name_ (not id), respecting plugin dependencies (i.e. depended on plugins are guaranteed to be applied before application).
+
+**Note:** `allprojects {}` and friends are not compatible with this new DSL.
+Targets cannot impose plugins on other targets.
+A separate mechanism will be available to perform this kind of generalised configuration in a more managed way (discussed later).
+
+**Note:** Eventually, the `plugin {}` mechanism as described will also support script plugins.
+Script plugins will be mapped to ids/versions elsewhere in the build, allowing them to be consumed via the same mechanism (discussed later).
+
+**Note:** Plugins applied through the new mechanism _cannot_ apply plugins using `project.apply()`.
+However, for backwards compatibility, they can apply plugins that have already been applied for backwards compatibility reasons (discussed later).
+
 ### Open issues
 
-- Select the target to apply the plugin to, eg `allprojects { ... }`.
-- Allow scripts to be applied from this block, and make them visible to the script classpath.
-- What happens when the API is used to apply a plugin?
-- A hierarchy of plugin containers:
-    - Build-level plugin resolver (mutable)
-        - One for each init script
-        - One for each settings script
-        - One for each build script
-- How to make a plugin implementation visible to all scripts?
-- How to declare plugin repositories?
-- How to make classes visible without applying the plugin?
-- How apply a plugin that is built in the same project?
+- How practical is it to lock down the `plugins {}` DSL so tightly 
 
-## Declaring plugin repositories
+## Plugin spec to implementation mappings
 
-The `plugins {}` block will allow plugin repositories to be declared.
+Plugin clients declare plugin dependencies in terms of specification.
+The settings.gradle file, and init scripts provide the mappings from plugin specs to implementations.
 
-    plugins {
+    pluginMappings {
         repositories {
-            // uses the public bintray repo for plugin meta-data and modules, and jcenter for additional modules
-            gradlePlugins()
-            // uses the given bintray repo for plugin meta-data and modules
-            bintray {
-                url '...'
-            }
-            // uses the given repo for modules
-            maven {
-                url '...'
-            }
+            // DSL for declaring external sources of information about plugins
         }
     }
 
-If no repositories are declared, this will default to `gradlePlugins()`. Some mechanism (TBD) will be available to configure this default in some way.
+The default list of repositories will be:
+
+    repositories {
+        defaultScriptDir() // script plugins in `$rootDir/gradle/plugins`
+        gradlePlugins() // plugins.gradle.org
+    }
+
+The 'core plugin repository' is always implicitly the first repository and cannot be disabled.
+If any plugin repositories are declared, the `defaultScriptDir()` and `gradlePlugins()` defaults are removed.
+Some mechanism (TBD) will be available to configure the defaults (i.e. repositories used when none specified) in some way.
+
+### Potential repository types
+
+- Directory containing script plugins (other than the default convention)
+- HTTP “directory” containing script plugins
+- Remote directory available over SFTP
+- Other instance of plugin portal
 
 ### Open issues
 
-- This means that a given plugin implementation can end up with different implementation classpaths in different scripts. Allow this? Fail?
-- Separate plugin meta-data and module repository declarations?
-- Give a name to the protocol used to resolve from bintray and use this name for bintray and artifactory repositories.
-- An init script should be able to define how to resolve plugins for all settings and build scripts and for API usage. Possibly for buildSrc as well.
-- An settings script should be able to define how to resolve plugins for all build scripts, and for API usage.
-- A root build script should be able to define how to resolve plugins for all build scripts (including self) and for API usage.
+- What does the repositories DSL look like?
+- Does the `pluginMappings` block apply to the settings/init plugins? If not, how does one specify the mappings there?
+- Does the `pluginMappings` block get extracted and executed in isolation like the `plugins` block? With similar strictness?
+- Can plugins contribute to the `pluginMappings` block in some way?
+- How do buildSrc plugins work with mapping?
+- How do `pluginMappings` blocks in multiple init scripts and then the settings script compose?
+- Should an individual build script have its own mapping overrides?
+- Could an `inline {}` DSL be used here to give the location of arbitrary detached Gradle plugin projects that need to be built? (i.e. buildSrc replacement)
+
+## Script plugins
+
+Script plugins and binary plugins will be unified from a consumption perspective.
+A script plugin is simply another way to implement a plugin.
+
+A convention will be established that maps plugin id to script implementation.
+
+`id("foo")` = `$rootDir/gradle/plugins/foo.gradle`
+`id("foo.bar")` = `$rootDir/gradle/plugins/foo.bar.gradle`
+`id("foo").version("1.0")` = `$rootDir/gradle/plugins/foo_1.0.gradle`
+`id("foo.bar").version("1.0")` = `$rootDir/gradle/plugins/foo.bar_1.0.gradle`
 
-## Examples
+Explicit mappings will also be possible via the `pluginMappings {}` DSL (details TBD).
+
+This requires that script plugins can express all things that binary plugins can in terms of usage requirements:
+
+1. Dependencies on other plugins - specified by the plugin script's `plugins {}` block
+1. Dependencies on JVM libraries - specified by the plugin script's `buildscript {}` block
+1. Entry point/implementation - script body
+1. Exported classes - the public classed declared in the script
+
+As new capabilities are added to plugins (particularly WRT new configuration model), consideration should be given to how script plugins express the same thing.
+
+### Open questions
+
+- How are unqualified ids of plugin dependencies to be interpreted? (i.e. script plugins can be used across builds, with potentially different qualifying rules)
+- Do these 'new' script plugins need to declare that they are compatible with the new mechanism? Are there any differences WRT their implementation?
 
 ## Plugin resolution
 
-The general problem is, given a plugin declaration
+Each plugin spec is independently resolvable to an implementation.
+
+### Specs
 
-    apply plugin: 'some-plugin'
+A spec consists of a:
 
-we need to resolve the plugin name `some-plugin` to an implementation class.
+* plugin id (qualified or unqualified)
+* compatibility constraints
 
-The current mechanism searches the classpath declared by the script associated with the target object for a
-plugin with that name. So, in the case of a `Project` object, the classpath declared in the build script is searched.
-The setting script classpath is used in the case of a `Settings` object, and the init script classpath in the case of a `Gradle` object.
+Compatibility constraints consist of:
 
-Plugin declarations will be generalised to become a kind of dependency declaration, so that:
+* version constraints (may be empty)
+* target Gradle runtime
 
-    apply <some-criteria>
+#### Open questions
 
-means: 'apply a plugin implementation that meets the given criteria'. Initially, the criteria will be limited to plugin name and
-version.
+- Should the other plugins in play be considered part of the spec? (i.e. find the “best” version that works with everything else that is in play)
 
-As for other kinds of dependency resolution in Gradle, there will be a number of resolvers that Gradle will use to
-search for plugin implementations. A resolver may search some repository or other location for a plugin. There will be several such resolvers baked
-into Gradle, but it will be possible to add custom implementations:
+### Resolver types
 
-1. A Gradle core plugin resolver. This will use a hard-coded set of mappings from plugin name to implementation module. It may use the
-   implementation module included the distribution, if present, or may resolve the implementation module from the public bintray repository.
-   This resolver allows the core Gradle plugins to be moved out of the Gradle distribution archives,
-   changing Gradle into a logical distribution of a small runtime and a collection of plugins that can be downloaded separately as
-   required, similar to, say, a Linux distribution. It further allows some plugins to be moved out of the distribution entirely,
-   via deprecation of a particular mapping.
-1. The classpath resolver. This will use the appropriate search classpath to locate a plugin implementation.
-1. The public bintray repository. This will resolve plugin implementations using meta-data and files from the pubic bintray repository.
-1. Possibly also a resolver that uses mappings rules provided by the build. This would allow, for example, for a build to say things like:
-   map plugin name 'x' to this Gradle script, or this implementation module, or this implementation `Class` instance.
+A spec is resolved into an implementation by iterating through the following resolvers, stopping at the first match.
+Each resolver must respect `--offline`, in that if it needs to reach out over the network to perform the resolution and `--offline` has been specified then the resolution will fail.
+This doesn't apply to loading implementations (e.g. local scripts) from disk.
 
-Given a plugin declaration `apply plugin: $name`, search for an implementation in the following locations, stopping when a match is found:
+#### Core plugin resolver
 
-1. Search the Gradle runtime's (hard-coded) set of core plugins.
-1. Search for a plugin with the given name in the search classpath.
-1. If not found, fail. Possibly search bintray for candidate versions to include in the error message.
+The core plugin resolver is responsible for resolving plugins that are considered to be core to Gradle and are versioned with Gradle.
 
-Given a plugin declaration `apply plugin: $name, version: $version`
+The list (and metadata) of core plugins is hardcoded within a Gradle release.
+Core plugins are NOT necessarily distributed with the release.
+The implementation components may be obtainable from jcenter, allowing the distribution to be thinned with components obtained on demand.
 
-If `$version` is a static version selector, then search for a candidate implementation in the following locations, stopping when a match is found.
-If `$version` is a dynamic version selector, then search for candidate implementation in all of the following locations, selecting the highest version found:
+Core plugins are always in the `org.gradle` namespace.
 
-1. Search for plugin with the given name in the Gradle runtime's mappings. If found, verify that the implementation meets the version criteria.
-1. Search for plugin with the given name in the search classpath. If found, verify that the implementation meets the version criteria.
-1. Attempt to resolve the plugin name using bintray, as described below.
-1. If not found, fail. Possibly search bintray for candidate versions to include in the error message.
+*Note:* If a Gradle release includes a new plugin in the core namespace, this needs to be advertised.
+Technically, it's a breaking change.
+If the to-be-upgraded build was using an unqualified id to depend on a plugin where there is now a core plugin with the same unqualified id, the build will fail because core plugin dependencies cannot contain version numbers.
+The resolution is to fully qualify the plugin id.
 
-### Examples
+#### Script plugin resolver
 
-Apply the core `java` plugin, the implementation is either bundled in the distribution or fetched from a repository:
+Resolver for conventional script plugin locations (see above).
 
-    apply plugin: `java`
+#### plugins.gradle.org resolver
 
-Apply version >= 0.5 and < 0.6 of the `android` plugin fetched from the Gradle plugins bintray repository:
+This resolver will ask the `plugins.gradle.org` web service to resolve plugin specs into implementation metadata, that Gradle can then use to obtain the implementation.
 
-    apply plugin: `android`, version: `0.5.+`
+Plugin specs will be serialized into `plugins.gradle.org` URLs.
+Requests to such URLs yield JSON documents that act as the plugin metadata, and provide information on how to obtain the implementation of the plugin.
+Or, they may yield JSON documents that indicate the known versions of the requested plugin that meet the specification.
 
-### Resolution of a plugin declaration using a plugin repository
+#### User mapping resolver
 
-Resolution of a plugin declaration using a plugin repository is made up of two steps: First, the plugin declaration is resolved to a plugin implementation component.
-Second, the plugin component and its dependencies are resolved to a classpath and the plugin implementation class is loaded from this classpath.
+This resolver uses the explicit rules defined by the build environment (i.e. init scripts, settings scripts) to map the spec to an implementation.
 
-The provided repository may be used to perform one or both resolution steps. For example, the Gradle core plugin resolver does not use the repository to determine the
-implementation component, but may use the repository resolve the component to a classpath.
+### Dynamic versions
 
-Step 1: Given a plugin name and version, use repository to resolve to a plugin component:
+Version constraints may be dynamic.
+In this case, each plugin resolver is asked for all of the versions of the plugin that it knows about that are otherwise compatible.
+The best version available, considering all resolvers, will be used.
 
-1. If the given name and version have already been resolved to a plugin component in this build, reuse the mapping.
-1. If the given name and version to component mapping is present in the persistent cache and has not expired, reuse the mapping.
-1. If running `--offline`, fail.
-1. Fetch from the repository the list of packages that have the plugin name associated with the package. Select the highest version that
-   meets the version criteria and which is compatible with the current Gradle version. Fail if there are no such packages.
-1. Cache the result.
+Resolvers are responsible for providing the potential versions.
+Selecting the actual version to use based on the version constraint is performed by Gradle.
 
-Step 2: Given a plugin name and plugin component:
+Dynamic versions are specified using the same syntax that is currently used…
 
-1. If the component has been resolved in this build, reuse the mapping.
-1. Resolve the component and its runtime dependencies from the repository to produce a runtime classpath
-1. Load the runtime classpath into a `ClassLoader` whose parent is the Gradle API `ClassLoader` (see [ClassLoader graph](https://docs.google.com/drawings/d/1-hEaN0HDSbyw_QSuK8rUOqELohbufyl7osAQvCd7COk/edit?usp=sharing)).
-1. Load the plugin implementation class from this `ClassLoader`.
-1. Cache the result.
+    id("foo").version("0.5.+")
 
-Note that no core plugins will be visible to the plugin implementation by default. These will be declared as explicit dependencies of the plugin (TBD).
+## Plugin implementation backwards compatibility
 
-# Stories
+TBD.
 
-## Story: Spike plugin resolution from bintray
+# Milestone 1 - “usable”
 
-Add some basic DSL and resolver infrastructure to demonstrate plugin resolution from the public plugin repository.
+## Story: Introduce plugins DSL block
 
-## Story: Introduce plugins DSL block (✓)
+Adds the `plugins {}` DSL to build scripts (settings, init or arbitrary script not supported at this point). Plugin specs can be specified in the DSL, but they don't do anything yet.
 
-Adds the initial DSL support and APIs. At this stage, can only be used to apply core plugins to the script's target object. Later stories make this more useful.
+### Implementation
+
+1. Add a `PluginSpecDsl` service to all script service registries (i.e. “delegate” of `plugins {}`)
+1. Add a compile transform that rewrites `plugins {}` to be `ConfigureUtil.configure(services.get(PluginSpecDsl), {})` or similar - we don't want to add a `plugins {}` method to any API
+    - This should probably be added to the existing transform that extracts `buildscript {}`
+1. Add an `id(String)` method to `PluginSpecDsl` that returns `PluginSpec`, that has a `version(String)` method that returns `PluginSpecDsl` (self)
+1. Update the `plugin {}` transform to disallow everything except calling `id(String)` and optionally `version(String)` on the result
+1. Update the transform to error if encountering any statement other than a `buildscript {}` statement before a `plugins {}` statement
+1. Update the transform to error if encountering a `plugins {}` top level statement in a script plugin
+1. `PluginSpecDsl` should validate plugin ids (see format specification above)
 
 ### Test cases
 
-- Script can use a `plugins { ... }` block to apply a core plugin. (✓)
-- Can use both `buildscript { ... }` and `plugins { ... }` blocks in a script to apply plugins. (✓)
-- Build author receives a nice error message when:
-    - A statement other than `buildscript { ... }` precedes the `plugins { ... }` statement. (✓)
-    - A `buildscript { ... }` statement follows any `plugins { ... }` statements. (✓)
-    - Attempting to apply an unknown plugin in a `plugins { ... }` block.
-        - Should provide information on how to find which plugins are available. (✓)
-    - Attempting to apply a core plugin with a version selector in a `plugins { ... }` block. (✓)
-    - Attempting to apply a plugin declared in the script's `buildscript { ... }` from the `plugins { ... }` block. (✓)
-    - Attempting to apply a plugin declared a parent project's build script `buildscript { ... }` from the `plugins { ... }` block. (✓)
-- The script's delegate object is not visible to the `plugins { ... }` block. (✓)
-
-## Story: Resolve hard-coded set of plugins from public bintray repository
-
-Adds a basic mechanism to load plugins from a repository. Adds a plugin resolver that uses a hard-coded mapping from plugin name + version to implementation component,
-then resolves the implementation from the public repository and `jcenter`. At this stage, the repository is used to resolve the plugin implementation, but the
-plugin meta-data is not used.
-
-Cache the implementation ClassLoader within a single build invocation, so that if multiple scripts apply the same plugin, then the same implementation Class is used
-in each location. The implementation ClassLoader should be wrapped in a filtering ClassLoader so that the plugin id resources `/META-INF/gradle-plugins/**` are not
-visible.
-
-Change the construction of the script ClassLoaders so that:
-
-- Each script has a 'parent scope' ClassLoader.
-    - For the build script of a non-root project, this is the 'public scope' of the parent project's build script (for backwards compatibility).
-    - For all other scripts, this is the root ClassLoader, which exposes the Gradle API and core plugins.
-- Each script has a 'public scope' ClassLoader:
-    - When the `buildscript { ... }` block does not declare any classpath, this is the same as the 'parent scope' ClassLoader.
-    - When the `buildscript { ... }` block declares a classpath, these classes are loaded a ClassLoader whose parent is the 'parent scope' ClassLoader.
-      This is 'public scope' ClassLoader for the script.
-- The script classes are loaded in a ClassLoader whose parents are the 'public scope' ClassLoader plus and implementation ClassLoaders for any plugins declared
-  in the `plugins { ... }` block.
-- The 'public scope' of a project's build script is used to find plugins by `Project.apply()`
-
-The Gradleware developers will select a small set of plugins to include in this hard-coded mapping. The mapping should ideally include the Android plugins.
-
-At this stage, dependencies on other plugins are not supported. Dependencies on other components are supported.
+- ~~`plugins {}` block is available to build scripts~~
+- ~~`plugins {}` block in init, settings and arbitrary scripts yields suitable 'not supported' method~~
+- ~~Statement other than `buildscript {}` before `plugins {}` statement causes compile error, with correct line number of offending statement~~
+- ~~`buildscript {}` is allowed before `plugins {}` statement~~
+- ~~multiple `plugins {}` blocks in a single script causes compile error, with correct line number of first offending plugin statement~~
+- ~~`buildscript {}` after `plugins {}` statement causes compile error, with correct line number of offending buildscript statement~~
+- ~~Disallowed syntax/constructs cause compile errors, with correct line number of offending statement and suitable explanation of what is allowed (following list is not exhaustive)~~
+  - ~~Cannot access `Script` api~~
+  - ~~Cannot access script target API (e.g. `Gradle` for init scripts, `Settings` for settings script, `Project` for build)~~
+  - ~~Cannot use if statement~~
+  - ~~Cannot define local variable~~
+  - ~~Cannot use GString values as string arguments to `id()` or `version()`~~
+- ~~Plugin ids contain only valid characters~~
+- ~~Plugin id cannot begin or end with '.'~~
+- ~~Plugin id cannot be empty string~~
+- ~~Plugin version cannot be empty string~~
+  
+## Story: Can use plugins {} in build script to use core plugin
+
+This story makes it possible for the user to use the new application mechanism to apply core plugins.
+At this point, there's no real advantage to the user or us in this, other than fleshing out the mechanics
+
+1. Add an internal service that advertises the core plugins of Gradle runtime (at this stage, all plugins shipped with the distribution)
+1. Change the implementation/use of `PluginSpecDsl` to make the specified plugins available
+1. After the execution of the plugins {} block, but before the “body” of the script, iterate through the specified plugins
+1. For each plugin specified, resolve the specification against the plugin resolvers - only the core plugin resolver at this stage
+1. If the plugin spec can't be satisfied (i.e. has a version constraint, or is not the _name_ of a core plugin), the build should fail indicating that the plugin spec could not be satisfied by the available resolvers (future stories will address providing more information to users, e.g. a list of available core plugins)
+
+At this stage, applying a core plugin with this mechanism effectively has the same semantics as having `apply plugin: "«name»"` as the first line of the build script.
+
+Note: plugins from buildSrc are not core plugins.
 
 ### Test cases
 
-- The classes from plugins declared in a script's `plugins { ... }` block are visible:
-    - when compiling the script. (✓)
-- The classes from plugins declared in a script's `plugins { ... }` block are NOT visible:
-    - from classes declared in a script's `buildscript { ... }` block. (✓)
-- When a parent project's build script uses a `plugins { ... }` block to apply non-core plugins:
-    - The classes from plugins are not visible when compiling a child project's build script. (✓)
-    - The plugins are not visible via a child project's `Project.apply()` method. (✓)
-- Verify that a plugin applied using `plugins { ... }` block is not visible via the project's `Project.apply()` method. (✓)
-- When multiple scripts apply the same plugin to different targets, the plugin implementation is downloaded from remote repository once only and cached. (✓)
-- When multiple scripts apply the same plugin to different targets, the plugin classes are the same. (✓)
+- ~~`plugins { id "java" }` applies the java plugin to the project when used in a _build_ script (equally for any core plugin)~~
+- ~~`plugins { id "java" version "«anything»" }` produces error stating that core plugins cannot have version constraints~~
+- ~~`plugins { id "java"; id "java" }` produces error stating that the same plugin was specified twice~~
+- ~~`plugins { id "org.gradle.java" }` is equivalent to `plugins { id "java" }`~~
+- ~~plugins already on the classpath (buildscript, buildSrc) are not considered core, and cannot be applied using `plugins {}`~~
+- `plugins { id "«non core plugin»" }` produces suitable 'not found' type error message
+- ~~Using project.apply() to apply a plugin that was already applied using the plugins {} mechanism works (i.e. has no effect)~~
+- Plugins are applied alphabetically based on name
 
-### Open issues
+### Open questions 
 
-- Which classes to make visible from a given plugin?
-- Should possibly allow `buildscript { }` classes to see `plugins { }` classes, so that a custom plugin can extend a public plugin.
+- Should a qualified plugin id of a namespace other than 'org.gradle', with no version constraint, yield a special error message? i.e. only 'org.gradle' plugins can omit version
 
-## Story: Resolve plugins from public plugin repository
+## Story: User uses plugin “from” `plugins.gradle.org` of static version, with no plugin dependencies, with no exported classes 
 
-Extend the above mechanism to use plugin meta-data from the public plugin repository to map a plugin name + version to implementation component.
+This story covers adding a plugin “resolver” that uses the plugins.gradle.org service to resolve a plugin spec into an implementation.
 
-Uses meta-data manually attached to each package in the repository. Again, the Gradleware developers will select a small set of plugins to include in the repository.
+Dynamic versions are not supported.
+Plugins obtained via this method must have no dependencies on any other plugin, including core plugins, and do not make any of their implementation classes available to the client project/scripts (i.e. no classes from the plugin can be used outside the plugin implementation).
+No resolution caching is performed; if multiple projects attempt to use the same plugin it will be resolved each time and a separate classloader built from the implementation (address in later stories).
 
-Implementation should use `http://plugins.gradle.org` as the entry point to the public plugin repository.
+A new plugin resolver will be implemented that queries the plugin portal, talking JSON over HTTP.
+See the plugin portal spec for details of the protocol.
+This resolver will be appended to the list of resolvers used (i.e. currently only containing the core plugin resolver).
 
-### Test cases
+Plugin specs can be translated into metadata documents using urls such as: `plugins.gradle.org/api/gradle/«gradle version»/plugin/use/«plugin id»/«version»`.
 
-- When multiple scripts apply the same plugin to different targets, the plugin resolution is done against the remote repository once only and cached.
-- Build author receives a nice error message when using the `plugins { ... }` block to:
-    - Attempt to apply a plugin from a remote repository without declaring a version selector. (✓)
-    - Attempt to apply an unknown plugin.
-        - Should list some candidates that are available, including those in the remote repositories.
-    - Attempting to apply an unknown version of a plugin.
-        - Should list some candidate versions that are available.
-    - Plugins with -SNAPSHOT versions are requested (Bintray does not allow snapshot versions)
-- Plugins can be resolved with status version numbers (e.g. latest.release)
-- Plugins can be resolved with version ranges (e.g. 2.+, ]1.0,2.0])
+There are 4 kinds of responses that need to be considered for this story:
 
-## Story: External plugins are usable when offline
+1. 3xx redirect
+1. 200 response with expected JSON payload (see plugin portal spec)
+1. 404 response with JSON payload indicating no plugin for that id/version found (see plugin portal spec)
+1. Anything else
 
-Cache the plugin mapping. Periodically check for new versions when a dynamic version selector is used. Reuse cached mapping when `--offline`.
+Subsequent stories refine the error handling. This story encompasses the bare minimum.
 
-## Story: Plugins included in Gradle public repository are smoke tested
+The “plugin found” JSON response contains two vital datum, among other data.
 
-For plugins to be listed in the public repository, there must be some external (i.e. not performed by plugin author) verification that the plugin is not completely broken.
-That is, the plugin should be:
+1. A “«group»:«artifact»:«version»” dependency notation string
+1. A URL to an m2 repo that is accessible without authentication
 
-1. Able to be applied via the new plugin mechanism
-2. Not produce errors after simply applying
+The m2 repository is known to contain the dependency denoted in the dependency notation string.
+The runtime usage resolution (i.e. module artifact + dependencies) of the dependency from the given repository is expected to form a classpath that contains a plugin implementation mapped to the qualified id (i.e. a `/META-INF/gradle-plugins/«qualified id».properties` file with `implementation-class` property).
 
-This will (at least) need to be able to be performed _before_ the plugin is included in the public repository. 
+The dependencies of the plugin implementation must also be available from the specified maven repository.
+That is, this is the only repository available for the resolve.
 
-### Open issues
+The plugin resolver will resolve the maven module as per typical Gradle maven dependency resolution.
+No configuration (e.g. username/password, exclude rules) of the resolve is possible.
+Anything other than successful resolution of the implementation module is fatal to the plugin resolution.
 
-1. Are existing plugins periodically tested? Or only upon submission (for each new version)?
-1. What action is taken if a plugin used to work but no longer does?
+The successfully resolved module forms an implementation classpath.
+A new classloader is created from this classpath, with the gradle api classloader (_not_ the plugin classloader) as its parent.
+The `Plugin` implementation mapped to the plugin id from this classpath is applied to the project.
+No classes from the plugin implementation classpath are made available to scripts, other plugins etc. 
+
+As much of the HTTP infrastructure used in dependency resolution as possible should be used in communicating with the plugin portal.
+
+### Test Coverage
+
+- 404 responses that indicate that the plugin or plugin version do not exist are not fatal - try next resolver
+- generic 404 responses are considered fatal
+- If plugin portal response indicates that the plugin is known, but not by that version (also a 404), failure message to user should include this information (later stories might include information about what versions are known about)
+- Attempt to use -SNAPSHOT or a dynamic version selector produces helpful 'not supported' error message
+    - As there is only the core resolver and the portal resolver at this point, this logic could be hardcoded at the start of the resolver list potentially
+- Success response document of incompatible schema produces error
+- Success response document of compatible schema, but with extra data elements, is ok
+- Failed resolution of module implementation from specified repository fails, with error message indicating why resolve was happening
+- Successful resolution of module implementation, but no plugin with id found in resultant classpath, yields useful error message
+- Successful resolution of module implementation, but unexpected error encountered when loading `Plugin` implementation class, yields useful error message
+- Successful resolution of module implementation, but exception encountered when _applying_ plugin, yields useful error message
+- Plugin is available in build script via `PluginContainer` - incl. `withType()` and `withId()` methods (note: plugin class is not visible to build script, but could be obtained reflectively)
+- Plugin implementation classes are not visible to build script (or to anything else)
+- Plugin cannot access classes from core Gradle plugins
+- Plugin can access classes from Gradle API
+- Plugin cannot access Gradle internal implementation classes
+- Plugin resolution fails when --offline is specified
+- Client follows redirect from server
+- Unicode characters in the response are interpreted correctly and don't cause strange behaviour
+- Plugin id and version numbers can contain URL meta chars and unicode chars (regardless of valid plugin ids not being allowed to contain non ascii alphanum or -) - request URLs should be well formed
+- Reasonable error message on network failure talking to plugin portal or repository containing plugin implementation
+
+### Open questions
+
+- Is it worth validating the id/version returned by the service against what we asked for?
 
-## Story: Make plugin DSL public
+## Story: Structured error response from plugin portal (when resolving plugin spec) is “forwarded to user”
+
+The plugin portal has a standardised JSON payload for errors.
+This story adds understanding of this to Gradle's interactions with the portal, by way of extracting the error information and presenting it to the user instead of a generic failure message.
+
+Any request to the plugin portal may return a “structured error response”.
+In some cases this may be part of the standard protocol for that endpoint.
+For example, a request for plugin metadata that targets the plugin metadata endpoint but resolves to a non existent plugin will yield a structured error response.
+The detail of the error response differentiates the response from a generic 404.
+
+### Test coverage
+
+- 4xx..500 response that isn't a structured error response (e.g. HTML) is handled
+- Response advertised as structured error response is of incompatible schema
+- Response advertised as structured error response is malformed JSON
+- Response advertised as structured error response is of compatible schema, but has extra unexpected elements
+
+### Open questions
+
+- What to use to unmarshall JSON responses? Jackson? Should the API couple to a marshaller at this level?
+
+## Story: Gradle is routinely tested against real plugins.gradle.org codebase
+
+This story covers setting up continuous testing of Gradle against the real plugin portal code, but not the real instance.
+
+This provides some verification that the test double that is used in the Gradle build to simulate the plugin portal is representative, and that the inverse (i.e. plugin portal's assumptions about Gradle behaviour) holds.
+
+This does not replace the double based tests in the Gradle codebase.
+
+## Story: Plugin author uses plugin development plugin to build a plugin
+
+This story adds a plugin development plugin to help plugin authors build a plugin. Later stories will add the ability to test and publish the plugin.
+
+## Story: Plugin author uses plugin development plugin to publish a plugin
+
+This story extends the plugin development plugin to generate the meta-data and publish a plugin.
+
+## Story: Plugins are able to declare exported classes
+
+This is the first story where we require changes to how plugins are published and/or implemented (i.e. exported class information is needed). 
+
+The plugin development plugin should provide some mechanism to declare the exported classes of a plugin (possibly a DSL, possibly annotations in code, or something else).
+This should end up in the generated meta-data.
+
+Plugin authors should be able to write their plugin in such a way that it works with the new mechanism and the old project.apply() mechanism (as long as it has no dependency on any other, even core, plugin).
+
+## Story: Plugins are able to declare dependency on core plugin
+
+The plugin development plugin should provide some mechanism to declare a dependency on a core plugin (possibly a DSL, possibly annotations in code, or something else).
+This should end up in the generated meta-data.
+
+Plugin authors should be able to write their plugin in such a way that it works with the new mechanism and the old project.apply() mechanism (as long as it has no dependency a non core plugin).
+
+# Milestone 2 - “announceable”
+
+## Story: User is notified that Gradle version is no longer supported by plugin portal
+
+## Story: User is notified of use of 'deprecated' plugin
+
+## Story: Plugin resolution is cached across the entire build
+
+Don't make the same request to plugins.gradle.org in a single build, reuse implementation classloaders.
+
+## Story: Plugin resolution is cached between builds
+
+i.e. responses from plugins.gradle.org are cached to disk (`--offline` support)
+
+## Story: Build author searches for plugins using central Web UI
+
+## Story: New plugin mechanism can be used in external scripts to apply plugins to `Project`
+
+## Story: Plugins are able to depend on other non core plugins
+
+Plugin dependencies can not be dynamic.
+Plugin dependencies can not be cyclic.
+
+## Story: Make new plugin resolution mechanism public
+
+Story is predicated on plugins.gradle.org providing a searchable interface for plugins.
 
 - Include new DSL in DSL reference.
+- Add link to further documentation in relevant error message (at least the compile time validation of plugin {} syntax)
 - Include types in the public API.
+- Add links to user guide to `org.gradle.plugin.use` types Javadoc
 - Add some material to the user guide discussion about using plugins.
 - Update website to replace references to the 'plugins' wiki page to instead reference `http://plugins.gradle.org`
 - Update the 'plugins' wiki page to direct build authors and plugin authors to `http://plugins.gradle.org` instead.
 - Announce in the release notes.
 
-## Story: Plugin author requests that plugin version be included in the Gradle plugins repository
+Note: Plugin authors cannot really contribution to plugins.gradle.org at this point. The content will be “hand curated”.
 
-For now, the set of plugins available via the public plugin repository will be curated by Gradleware, such that some manual action is required to add
-a new plugin (version) to the public repository.
+## Story: Plugin author submits plugin for inclusion in plugins.gradle.org
 
-TBD - perhaps implement this using the bintray 'contact' UI plus some kind of reference from the Gradle website.
+Includes:
 
-Retire the 'plugins' wiki page some point after this.
+- Includes generating all necessary metadata (e.g. exported classes, plugin dependencies)
+- Tooling support for publishing in manner suitable for inclusion in plugins.gradle.org
+- Admin processes for including plugin, including acceptance policies etc.
+- Prevention of use of 'org.gradle' and 'com.gradleware' namespaces
+
+# Milestone 3 - “parkable”
+
+## Story: Plugin author reasonably tests realistic use of plugin with dependencies
+
+Plugin authors need to be able to verify that their plugin works with the classloader structure it would have in a real build
 
 ## Story: Build author searches for plugins using Gradle command-line
 
 Introduce a plugin and implicit task that allows a build author to search for plugins from the central plugin repository, using the Gradle command-line.
 
-## Story: Plugins declare dependencies on other plugins
+## Story: User specifies centrally that a plugin should be applied to multiple projects
 
-Should include dependencies on core plugins.
+## Story: New plugin mechanism can be used to apply `Gradle` plugin
 
-When two plugins declare a dependency on some other plugin, the same plugin implementation ClassLoader should be used in both cases. Similarly, when
-a build script and a plugin declare a dependency on the same plugin, the same implementation ClassLoader should be used in both cases.
+## Story: New plugin mechanism can be used to apply `Settings` plugin
 
-## Story: Plugin author publishes plugin to bintray
+## Story: All plugins are resolved before any plugin is applied to a target
 
-Add a basic plugin authoring plugin, that adds support for publishing to bintray with the appropriate meta-data.
+Before actually applying plugins (potentially expensive), all required plugins should be resolved in the spirit of fail fast.
 
-## Story: Plugin author can test use of plugin
+## Story: Plugin declares minimum Gradle version requirement
 
-Authors should be able to test that their plugins are compatible with the new mechanism.
+## Story: User specifies non static plugin version constraint (i.e. dynamic plugin dependencies)
 
-- Provide mechanism to simulate plugin application at unit test level (new mechanism has functional differences at application time)
-- Provide mechanism to functionally test new plugin metadata (i.e. correctly declared dependencies on other plugins)
+## Story: Local script is used to provide implementation of plugin
 
-(note: overlap with [design-docs/testing-user-build-logic.md](https://github.com/gradle/gradle/blob/master/design-docs/testing-user-build-logic.md))
+### Open questions
 
-## Story: Build author searches for plugins using central Web UI
+- Is it worth considering a testing mechanism for script plugins at this point?
 
-Introduce a Web UI that allows a build author to search for and view basic details about available Gradle plugins. Backed by the meta-data hosted in the
-public Bintray repository.
+# Future work
 
-TBD - where hosted, how implemented, tested and deployed
+## Story: Pathological comms errors while resolving plugins produce reasonable error messages
+
+1. Non responsive server (accepts request but never responds)
+1. Server responds extremely slowly (data is transferred frequently enough to avoid idle/response timeout, but is really too slow to let continue)
+1. Server responds with inaccurate content length (lots of HTTP clients get badly confused by this)
+1. Server responds with extremely large document (protect against blowing out memory trying to read the response)
+
+--- 
+
+Stories below are still to be realigned after recent direction changes. There is some duplication with what is above, that needs to be folded in. In progress.
+
+## Story: Plugins included in Gradle public repository are smoke tested
+
+For plugins to be listed in the public repository, there must be some external (i.e. not performed by plugin author) verification that the plugin is not completely broken.
+That is, the plugin should be:
+
+1. Able to be applied via the new plugin mechanism
+2. Not produce errors after simply applying
+
+This will (at least) need to be able to be performed _before_ the plugin is included in the public repository. 
+
+### Open issues
+
+1. Are existing plugins periodically tested? Or only upon submission (for each new version)?
+1. What action is taken if a plugin used to work but no longer does?
 
 ## Story: Resolve plugins relative to Gradle distribution
 
@@ -422,15 +644,6 @@ Allow the plugin repositories to use to be declared.
 
 Multiple plugin and module repositories can be declared.
 
-## Story: Resolve local script plugins
-
-Add a resolver that uses some convention to map plugin id to a build script.
-
-    plugins {
-        // Looks for a script in $rootDir/gradle/plugins/groovy-project.gradle
-        apply plugin: 'groovy-project'
-    }
-
 ## Story: Daemon reuses plugin implementation across builds
 
 Cache the implementation ClassLoader across builds. More details in the [performance spec](performance.md).
@@ -449,6 +662,7 @@ Deprecate the bin Gradle distribution some time after this.
 
 These are yet to be mixed into the above plan:
 
+- Credentials and caching for script plugin repositories.
 - Build-init plugin custom build types by resolving build type name to plugin implementation using plugin repository
 - Resolve tooling model to provider plugin implementation using plugin repository
 - Plugin (script) declares public API
diff --git a/design-docs/repository-extensibility.md b/design-docs/repository-extensibility.md
new file mode 100644
index 000000000000..14f96e8e8d44
--- /dev/null
+++ b/design-docs/repository-extensibility.md
@@ -0,0 +1,63 @@
+Our current repository implementations are not particularly extensible, composable, or pluggable. In some cases users must resort
+to using a custom Ivy DependencyResolver in order to handle a specific repository. This spec attempts to address these shortcomings.
+
+# Use cases
+
+- Enable caching for a file repository
+- Resolve files from a googlecode project
+- Resolve files from a Nuget repository
+- Resolve files from a GitHub repository
+- Resolve files from a SourceForge project
+- Use a custom module version listing protocol, such as the Artifactory API
+
+# Stories
+
+## Allow caching for a slow file-backed repository (GRADLE-1964)
+
+Currently, the only way to enable caching for file-backed repository (eg when backed by a slow NFS share) is to set local attribute to false for a FileSystemResolver.
+We need a way to prevent very slow resolution in these cases:
+
+* Add caching for file-backed repositories. Once per build, check for updates to a given resource and copy into cache. Should use the same
+up-to-date mechanism used for incremental build.
+* Detect remote file systems and don't check for updates for these file systems when running with `--offline`.
+    * Use `native-platform` to detect remote file systems and cache these automatically.
+
+See [GRADLE-1964](http://issues.gradle.org/browse/GRADLE-1964)
+
+## Detect servers that do not correctly handle HTTP HEAD requests
+
+Provide an automatic workaround for https://code.google.com/p/support/issues/detail?id=660.
+
+- Hopefully this could detect bad servers due something unique in the HTTP HEAD response.
+- Or we could maintain a list of servers that we know are badly behaved
+- Or we could probe by sending both GET and HEAD requests periodically
+
+One issue with probing is that this behaviour is non-deterministic. If the file has been recently retrieved, then HEAD will not return 404.
+
+## Resolve artifact files from a GoogleCode repository
+
+In this story, we add the ability to resolve files from a Google Code repository:
+
+* 'googlecode' repository type
+* version listing via googlecode api
+* no meta-data handling (file-only repository)
+
+See: https://github.com/Ullink/gradle-repositories-plugin/blob/master/src/main/groovy/com/ullink/RepositoriesPlugin.groovy#L122
+
+## Resolve artifact files from a Nuget repository
+
+In this story, we simply add the ability to resolve files in a Nuget repository:
+
+* 'nuget' repository type
+* version listing via Nuget api
+* No meta-data handling (file-only repository)
+
+See: https://github.com/Ullink/gradle-repositories-plugin/blob/master/src/main/groovy/com/ullink/RepositoriesPlugin.groovy#L150
+
+## Resolve artifact files from a GitHub repository
+
+## Allow meta-data file format to be specified for repositories
+
+This story would permit the metadata file format (ivy/pom/etc) to be specified for a googlecode, nuget or other repository.
+
+
diff --git a/design-docs/repository-transports.md b/design-docs/repository-transports.md
index 1aa792df93c7..38018ef819a3 100644
--- a/design-docs/repository-transports.md
+++ b/design-docs/repository-transports.md
@@ -89,9 +89,9 @@ The plan will be to include this coverage for HTTP transport in a later story.
 
 ### Open issues
 
-- Add an `AbstractMultiTestRunner` implementation to permit a test to be run with different repository tranports.
+- Add an `AbstractMultiTestRunner` implementation to permit a test to be run with different repository transports.
 
-## Support a maven repository declared with 'sftp' as the URL scheme, using password credentials
+## Support resolving from a maven repository declared with 'sftp' as the URL scheme, using password credentials
 
 ### User visible changes
 
@@ -112,13 +112,25 @@ Configuring a repository for sftp transport:
 In many cases, this may be a matter of adapting existing test coverage to run against multiple transports.
 
 - Resolve via 'sftp' from maven repository.
-- Publish via 'sftp' to maven repository (with maven-publish)
 - Resolve dynamic version from maven repository with 'sftp'
 - Reasonable error message produced when:
     - attempt to resolve missing module with valid credentials
-    - publish or resolve with invalid credentials
-    - publish or resolve where cannot connect to server
-    - publish or resolve where server throws exception
+    - resolve with invalid credentials
+    - resolve where cannot connect to server
+    - resolve where server throws exception
+
+## Support publishing to a maven repository declared with 'sftp' as the URL scheme, using password credentials
+
+### Test cases
+
+In many cases, this may be a matter of adapting existing test coverage to run against multiple transports.
+
+- Un `@Ignore` `MavenPublishSftpIntegrationTest`.
+- Publish via 'sftp' to maven repository (old and new plugins)
+- Reasonable error message produced when:
+    - publish with invalid credentials
+    - publish where cannot connect to server
+    - publish where server throws exception
 
 ## Run more remote publish and resolve integration tests against an sftp repository
 
@@ -130,6 +142,10 @@ Adapt more existing test coverage to execute against an 'sftp' repository:
 - `org.gradle.api.publish.ivy.IvyPublishMultipleRepositoriesIntegTest`
 - `org.gradle.api.publish.maven.MavenPublishHttpIntegTest`
 
+## All repository transports support using `sha1` resources to avoid downloads
+
+Currently only the HTTP transports support using for a `.sha1` resource.
+
 ## Support 'scp' scheme for ivy and maven repository URL
 
 ## Use public key authentication when accessing sftp/scp/https repository
@@ -158,3 +174,4 @@ use a remote resource that requires authentication, and where no credentials hav
 ## Prompt IDE user for credentials when not provided
 
 Allow tooling API clients to provide a credentials provider. This will allow IDE integrations to prompt the user for and manage their credentials.
+
diff --git a/design-docs/task-configuration-from-command-line.md b/design-docs/task-configuration-from-command-line.md
index bb5eda6c6212..983a0427bf61 100644
--- a/design-docs/task-configuration-from-command-line.md
+++ b/design-docs/task-configuration-from-command-line.md
@@ -75,106 +75,22 @@ TBD
     * Annotation is missing 'options' value.
     * Annotation is missing 'description' value.
 
-## Help task shows basic details about a task
-
-Add some command line interface for discovering details about a task (name, type, path, description)
-
-### User visible changes
-
-Running `gradle help --task test` shows a usage message for the `test` task.
-
-If multiple tasks match, details of the matching tasks are shown
-
-* all matched tasks have the same type
-    * print one report of the task type and include all matching paths in the report
-
-* matched tasks have different types
-    * print one detail output for each different task type including all available paths
-
-### Test coverage
-
-* integration tests
-    * `gradle help --task` on simple task
-    * `gradle help --task` on task referenced by full path  (e.g. `:someProj:dependencies`)
-    * `gradle help --task` on implicit task task
-    * `gradle help --task` on task defined via placeholder
-    * `gradle help --task` on non existing task displays reasonable error message, including candidate matches
-    * `gradle help --task` on multiple matching tasks
-    * `gradle help --task` using camel-case matching to select task
-
-### Implementation approach
-
-- Change the `help` task:
-    - add `--task` commandline property
-    - change displayHelp implementation to print task details when `--task` is set
-    - lookup project tasks and implicit tasks using the task selector
-    - throw decent error message when requested task cannot be found
-    - task details (task name, task type, path)
-    - the default message informs the user about using `gradle help --task n`
-
-- Update the 'using Gradle from the command-line' user guide chapter to mention the help task.
-
-## Help task shows command-line options for a task
-
-Commandline options of the task passed to help are listed including a description. The legal values for each property are not shown - this
-is added in a later story.
+## Add task validator for task options
 
 ### User visible changes
 
-The usage message of running `gradle help --task <task>` lists commandline options of the selected tasks.
-
-### Test coverage
-
-* integration tests
-    * `gradle help` on task with no commandline properties
-    * `gradle help` on task with commandline properties
-    * `gradle help` on implicit task no commandline properties
-    * `gradle help` on implicit task with no commandline properties
-    * `gradle help --tassk help` (should print hint to `gradle help --task help`)
+When task options that have unsupported option values, will throw an Exception pointing to the wrong assigned option value and hints
+what values are supported.
 
 ### Implementation approach
 
-- Change configuration error message in `CommandLineTaskConfigurer` to suggest that the user run `gradle help --task <broken-task>`.
-- Update the 'using Gradle from the command-line' user guide chapter.
-
-## Help task shows legal values for each command-line option
-
-### User visible changes
-
-The usage message of running `gradle help --task init` includes the available values for the task command line options (e.g --type)
-
-### Test coverage
+- Add a task validator that validates a string property has a legal value at execution time.
 
-* integration tests
-    * `gradle help` on task with enum property type mapped to commandline option
-    * `gradle help` on task with boolean property type mapped to commandline option
-    * `gradle help` on task with String property mapped to commandline option
-    * `gradle help --task init` shows all available init types
+### Test cases
 
 - A reasonable error message is provided when user specified an illegal value for an enum property from the command-line.
 - A reasonable error message is provided when user specified an illegal value for an string property from the command-line.
 
-### Implementation approach
-
-- Introduce marker annotation `Option("optionName")` to mark a task property mapped to a commandline option.
-- `@Option` with not provided "optionName" is mapped to option with same name as the annotated field
-- `@Option("optionName")` annotated on Enums includes enum values as possible option values
-- `@Option("optionName")` annotated on boolean includes true/false as possible option values
-- `@Option("optionName")` annotated on a setter method evaluates the available options from the parameter type)
-- Introduce marker annotation `OptionValues("optionName")` to to allow a dynamic value lookup in the task implementation itself.
-- Adapt InitBuild task to use `@OptionValues` to map values for the `--type` command line option.
-- Update the 'using Gradle from the command-line' user guide chapter.
-
-## Add task validator for task options
-
-### User visible changes
-
-When task options that have unsupported option values, will throw an Exception pointing to the wrong assigned option value and hints
-what values are supported.
-
-### Implementation approach
-- Add a task validator that validates a string property has a legal value at execution time.
-
 ## Support camel-case matching for task commandline property values
 
 ### Test coverage
@@ -220,10 +136,12 @@ TBD
 
 # Open issues
 
-1. Figure out what to do if multiple tasks of different types are selected *and* there are clashing command line options.
+- Figure out what to do if multiple tasks of different types are selected *and* there are clashing command line options.
 For example, 'foo' option that requires a string value in one task type but is a boolean flag in some other task type.
 This is not a blocker because we have very little command line options, yet.
-1. Decide on precedence order if task is configured from the command line and in the build script. Add coverage, etc.
-1. If a method marked with `@Option` accepts varargs or a Collection type as parameter, allow the command-line option to be specified multiple
-   time on the command-line.
-1. Output of `gradle help --task x` provides link to task documentation.
+- Decide on precedence order if task is configured from the command line and in the build script. Add coverage, etc.
+- If a method marked with `@Option` accepts varargs or a Collection type as parameter, allow the command-line option to be specified multiple
+  time on the command-line.
+- Output of `gradle help --task x` provides link to task documentation.
+- Remove the 'chrome' from the output of `gradle help` and other command-line tasks.
+- Remove the `implicitTasks` container from Project.
diff --git a/design-docs/tooling-api-improvements.md b/design-docs/tooling-api-improvements.md
index ff4abc024b75..f7e4f79f0b99 100644
--- a/design-docs/tooling-api-improvements.md
+++ b/design-docs/tooling-api-improvements.md
@@ -42,30 +42,6 @@ to use this same mechanism is one step in this direction.
 
 # Implementation plan
 
-## Story: Expose the build script of a project
-
-This story exposes via the tooling API some basic information about the build script of a project.
-
-1. Add a `GradleScript` type with the following properties:
-    1. A `file` property with type `File`.
-2. Add a `buildScript` property to `GradleProject` with type `GradleScript`.
-3. Include an `@since` javadoc tag and an `@Incubating` annotation on the new types and methods.
-4. Change `GradleProjectBuilder` to populate the model.
-
-An example usage:
-
-    GradleProject project = connection.getModel(GradleProject.class);
-    System.out.println("project " + project.getPath() + " uses script " + project.getBuildScript().getFile());
-
-### Test coverage
-
-- Add a new `ToolingApiSpecification` integration test class that covers:
-    - A project with standard build script location
-    - A project with customized build script location
-- Verify that a decent error message is received when using a Gradle version that does not expose the build scripts.
-    - Request `GradleProject` directly.
-    - Using `GradleProject` via an `EclipseProject` or `IdeaModule`.
-
 ## Story: Expose the compile details of a build script
 
 This story exposes some information about how a build script will be compiled. This information can be used by an
@@ -74,9 +50,12 @@ IDE to provide some basic content assistance for a build script.
 1. Introduce a new hierarchy to represent a classpath element. Retrofit the IDEA and Eclipse models to use this.
     - Should expose a set of files, a set of source archives and a set of API docs.
 2. Add `compileClasspath` property to `GradleScript` to expose the build script classpath.
-3. Include the Gradle API and core plugins in the script classpath.
+3. Script classpath includes the Gradle API and core plugins
     - Should include the source and Javadoc
-4. Add a `groovyVersion` property to `GradleScript` to expose the Groovy version that is used.
+4. Script classpath includes the libraries declared in the `buildscript { }` block.
+5. Script classpath includes the plugins declared in the `plugins { }` block.
+6. Script classpath includes the libraries inherited from parent project.
+7. Add a `groovyVersion` property to `GradleScript` to expose the Groovy version that is used.
 
 ### Open issues
 
@@ -93,44 +72,6 @@ IDE to provide some basic content assistance for a build script.
     - Source and Javadoc artifacts for the above are included in the classpath.
 - Verify that a decent error message is received when using a Gradle version that does not expose the build script classpath.
 
-## Story: Expose the publications of a project
-
-This story allows an IDE to map dependencies between different Gradle builds and and between Gradle and non-Gradle builds.
-For incoming dependencies, the Gradle coordinates of a given library are already exposed through `ExternalDependency`. This
-story exposes the outgoing publications of a Gradle project.
-
-1. Add a `GradlePublication` type with the following properties:
-    1. An `id` property with type `GradleModuleVersion`.
-2. Add a `publications` property to `GradleProject` with type `DomainObjectSet<GradlePublication>`.
-3. Include an `@since` javadoc tag and an `@Incubating` annotation on the new types and methods.
-4. Introduce a project-scoped internal service which provides some detail about the publications of a project.
-   This service will also be used during dependency resolution. See [dependency-management.md](dependency-management.md#story-dependency-resolution-result-exposes-local-component-instances-that-are-not-module-versions)
-    1. The `publishing` plugin registers each publication defined in the `publishing.publications` container.
-       For an instance of type `IvyPublicationInternal`, use the publication's `identity` property to determine the publication identifier to use.
-       For an instance of type `MavenPublicationInternal`, use the publication's `mavenProjectIdentity` property.
-    2. For each `MavenResolver` defined for the `uploadArchives` task, register a publication. Use the resolver's `pom` property to determine the
-       publication identifier to use. Will need to deal with duplicate values.
-    3. When the `uploadArchives` task has any other type of repository defined, then register a publication that uses the `uploadArchives.configuration.module`
-       property to determine the publication identifier to use.
-5. Change `GradleProjectBuilder` to use this service to populate the tooling model.
-
-An example usage:
-
-    GradleProject project = connection.getModel(GradleProject.class);
-    for (GradlePublication publication: project.getPublications()) {
-        System.out.println("project " + project.getPath() + " produces " + publication.getId());
-    }
-
-### Test coverage
-
-- Add a new `ToolingApiSpecification` integration test class that covers:
-    - For a project that does not configure `uploadArchives` or use the publishing plugins, verify that the tooling model does not include any publications.
-    - A project that uses the `ivy-publish` plugin and defines a single Ivy publication.
-    - A project that uses the `maven-publish` plugin and defines a single Maven publication.
-    - A project that uses the `maven` plugin and defines a single remote `mavenDeployer` repository on the `uploadArchives` task.
-    - A project that defines a single Ivy repository on the `uploadArchives` task.
-- Verify that a decent error message is received when using a Gradle version that does not expose the publications.
-
 ## Story: Gradle plugin provides a custom tooling model to the tooling API client
 
 This story allows a custom plugin to expose a tooling model to any tooling API client that shares compatible model classes.
@@ -248,28 +189,6 @@ Note: there is a breaking change here.
     - Requests a model from an unknown project.
     - Requests an unknown model.
 
-## Story: Tooling API client requests build model for old Gradle version (DONE)
-
-This story adds support for the `GradleBuild` model for older target Gradle versions.
-
-### Implementation
-
-Change the implementations of `ConsumerConnection.run(type, parameters)` so that when asked for a `GradleBuild` model, they instead
-request the `GradleProject` model and then convert it to a `DefaultGradleBuild` instance. See `ConnectionVersion4BackedConsumerConnection.doGetModel()`
-for an example of this kind of thing.
-
-For the `ModelBuilderBackedConsumerConnection` implementation, if the provider Gradle version supports the `GradleBuild` model (is >= 1.8-rc-1) then
-forward to the provider, as it does now.
-
-To implement this cleanly, one option might be to introduce some chain of model producers into the `ConsumerConnection` subclasses, so that each producer is
-asked in turn whether it can produce the requested model. The last producer can delegate to the provider connection. Stop at the first producer that can
-produce the model.
-
-### Test cases
-
-- For all Gradle versions, can request the `GradleBuild` model via `ProjectConnection`. This basically means removing the `@TargetGradleVersion` from
-  the test case in `GradleBuildModelCrossVersionSpec`.
-
 ## Story: Gradle provider builds build model efficiently
 
 When the `GradleBuild` model is requested, execute only the settings script, and don't configure any of the projects.
@@ -292,88 +211,70 @@ This story adds support for conditionally requesting a model, if it is available
 
 Fix the `ClassLoader` caching in the tooling API so that it can deal with changing implementations.
 
-## Story: GRADLE-2434 - Expose the aggregate tasks for a project
+## Story: Tooling API client launches a build using task selectors from different projects
 
-This story allows an IDE to implement a way to select the tasks to execute based on their name, similar to the Gradle command-line.
-
-1. Add an `EntryPoint` model interface, which represents some arbitrary entry point to the build.
-2. Add a `TaskSelector` model interface, which represents an entry point that uses a task name to select the tasks to execute.
-3. Change `GradleTask` to extend `EntryPoint`, so that each task can be used as an entry point.
-4. Add a method to `GradleProject` to expose the task selectors for the project.
-    - For new target Gradle versions, delegate to the provider.
-    - For older target Gradle versions, use a client-side mix-in that assembles the task selectors using the information available in `GradleProject`.
-5. Add methods to `BuildLauncher` to allow a sequence of entry points to be used to specify what the build should execute.
-6. Add `@since` and `@Incubating` to the new types and methods.
-
-Here are the above types:
-
-    interface EntryPoint {
-    }
+TBD
 
-    interface TaskSelector extends EntryPoint {
-        String getName(); // A display name
-    }
+### Test cases
 
-    interface GradleTask extends EntryPoint {
-        ...
-    }
+- Can execute task selectors from multiple projects, for all target Gradle versions
+- Can execute overlapping task selectors.
 
-    interface GradleProject {
-        DomainObjectSet<? extends TaskSelector> getTaskSelectors();
-        ...
-    }
+## Story: Tooling API exposes project's implicit tasks as launchable
 
-    interface BuildLauncher {
-        BuildLauncher forTasks(Iterable<? extends EntryPoint> tasks);
-        BuildLauncher forTasks(EntryPoint... tasks);
-        ...
-    }
+Change the building of the `BuildInvocations` model so that:
 
-TBD - maybe don't change `forTasks()` but instead add an `execute(Iterable<? extends EntryPoint> tasks)` method.
+- `getTasks()` includes the implicit tasks of the project.
+- `getTaskSelectors()` includes the implicit tasks of the project and all its subprojects.
 
 ### Test cases
 
-- Can request the entry points for a given project hierarchy
-    - Task is present in some subprojects but not the target project
-    - Task is present in target project but no subprojects
-    - Task is present in target project and some subprojects
-- Executing a task selector when task is also present in subprojects runs all the matching tasks, for the above cases.
-- Executing a task (as an `EntryPoint`) when task is also present in subprojects run the specified task only and nothing from subprojects.
-- Can request the entry points for all target Gradle versions.
+- `BuildInvocations.getTasks()` includes `help` and other implicit tasks.
+    - Launching a build using one of these task instances runs the appropriate task.
+- `BuildInvocations.getTaskSelectors()` includes the `help` and other implicit tasks.
+    - Launching a build using the `dependencies` selector runs the task in the default project only (this is the behaviour on the command-line).
+- A project defines a task placeholder. This should be visible in the `BuildInvocations` model for the project and for the parent of the project.
+    - Launching a build using the selector runs the task.
 
 ## Story: Expose information about the visibility of a task
 
 This story allows the IDE to hide those tasks that are part of the implementation details of a build.
 
-## Story: Deprecate support for Tooling API clients earlier than Gradle 1.2 (DONE)
+- Add a `visibility` property to `Launchable`.
+- A task is considered `public` when it has a non-empty `group` property, otherwise it is considered `private`.
+- A task selector is considered `public` when any task it selects is `public`, otherwise it is considered `private`.
 
-When any of the following methods are called on the provider connection treat the client version as deprecated:
-
-- `ConnectionVersion4.getModel()` and `executeBuild()`.
-- `InternalConnection.getTheModel()`.
-- `configureLogging(boolean)`.
+### Test cases
 
-Whenever an operation is invoked on the provider connection by a deprecated client version, the connection implementation should report to
-the user that the client version is deprecated and support for it will be removed in Gradle 2.0.
-The logging output should be received through the stream attached to `LongRunningOperation.setStandardOutput()`.
+- A project defines a public and private task.
+    - The `BuildInvocations` model for the project includes task instances with the correct visibility.
+    - The `BuildInvocations` model for the project includes task selectors with the correct visibility.
+    - The `BuildInvocations` model for the parent project includes task selectors with the correct visibility.
 
-### Test cases
+## Story: Allow options to be specified for tasks
 
-- Running a build generates a warning when using a client < 1.2, and does not generate a warning when using a client >= 1.2.
-- Fetching a model generates a warning when using a client < 1.2, and does not generate a warning when using a client >= 1.2.
+For example, allow something similar to `gradle test --tests SomePattern`
 
-## Story: Deprecate support for Gradle versions earlier than Gradle 1.0-milestone-8 (DONE)
+## Story: Tooling API build action requests a tooling model for a Gradle build
 
-When the provider connection does not implement `InternalConnection` then treat the provider version as deprecated.
+This story adds support to build models that have a scope of a whole Gradle build (not just a project)
 
-Whenever an operation is invoked on a deprecated provider version, the client implementation should report to the user that the provider
-version is deprecated and support for it will be removed in Gradle 2.0.
-The logging output should be received through the stream attached to `LongRunningOperation.setStandardOutput()`.
+1. Add a new `GradleBuildToolingModelBuilder` similar to `ToolingModelBuilder`. Possibly an abstract class since this is an SPI.
+2. Extend `ToolingModelBuilderRegistry` to allow registration of such a builder.
+3. Change the way how models are queried from `ProjectConnection` to use this new builders (there is no project context passed).
+   The only special case is the EclipseModel, which is actually built from the default project instead of the root project, so we'd need a specific implementation for that.
+4. Extend `BuildController.getModel()` to support `GradleBuild` as model parameter or add `BuildController.getBuildModel(Class)`.
+   Those would be using gradle model builder rather than project model builders
 
 ### Test cases
 
-- Running a build generates a warning when using a provider version < 1.0-milestone-8, and does not generate a warning when using a provider version >= 1.0-milestone-8.
-- Fetching a model generates a warning when using a provider version < 1.0-milestone-8, and does not generate a warning when using a provider version >= 1.0-milestone-8.
+- Can register new model builder and
+  - query it from client via `ProjectConnection`.
+  - query it from client via build action.
+- Can request a model via build action:
+  - And get result from `GradleBuildToolingModelBuilder` for gradle build scope if passing `GradleBuild` as target.
+  - And get result from `ToolingModelBuilder` for project scope if passing one of parameters describing project.
+- Client receives decent feedback when requests an unknown model.
 
 ## Story: Tooling API client cancels a long running operation
 
@@ -386,20 +287,21 @@ Represent the execution of a long running operation using a `Future`. This `Futu
     }
 
     interface ModelBuilder<T> {
-        BuildInvocation<T> fetch(); // starts building the model, does not block
+        BuildFuture<T> fetch(); // starts building the model, does not block
         ...
     }
 
     interface BuildLauncher {
-        BuildInvocation<Void> start(); // starts running the build, does not block
+        BuildFuture<Void> start(); // starts running the build, does not block
         ...
     }
 
     interface BuildActionExecuter<T> {
-        BuildInvocation<T> start(); // starts running the build, does not block
+        BuildFuture<T> start(); // starts running the build, does not block
         ...
     }
 
+    // TBD - fetch() should be called start() as well?
     BuildFuture<GradleProject> model = connection.model(GradleProject.class).fetch();
     model.cancel(true);
 
@@ -416,7 +318,7 @@ to the build:
 
 Use futures to represent the existing asynchronous behaviour:
 
-1. Change internal class `BlockingResultHandler` to implement `BuildInvocation` and reuse this type to implement the futures.
+1. Change internal class `BlockingResultHandler` to implement `BuildFuture` and reuse this type to implement the futures.
 2. Implementation should discard handlers once they have been notified, so they can be garbage collected.
 
 Push asynchronous execution down to the provider:
@@ -444,10 +346,12 @@ For target versions that do not support cancellation, `Future.cancel()` always r
 - Client receives failure when using `get()` and operation fails
 - Client receives timeout exception when blocking with timeout
 - Client can cancel operation
-    - Stops the operation for all target versions that support cancellation
-    - Returns `false` for all older target versions
-- Client is notified when result is available
-- Client is notified when operation fails
+    - Stops the operation for all target versions that support cancellation. Does not block.
+    - Returns `false` for all older target versions.
+    - Client listener added to future is notified that operation failed due to cancellation.
+    - When a thread is blocked on `get()`, a call to `cancel()` will unblock the thread and the call to `get()` will fail with an exception.
+- Client listener added to future is notified when result is available.
+- Client listener added to future is notified when operation fails.
 
 ## Story: Expose the IDE output directories
 
@@ -492,24 +396,5 @@ Need to allow a debug port to be specified, as hard-coded port 5005 can conflict
 * Replace `LongRunningOperation.standardOutput` and `standardError` with overloads that take a `Writer`, and (later) deprecate the `OutputStream` variants.
 * Handle cancellation during the Gradle distribution download.
 * Daemon cleanly stops the build when cancellation is requested.
-
-## Story: Tooling API build action requests a tooling model for a Gradle build
-
-This story adds support to build models that have a scope of a whole Gradle build (not just a project)
-
-1. Add a new `GradleBuildToolingModelBuilder` similar to `ToolingModelBuilder`. Possibly an abstract class since this is an SPI.
-2. Extend `ToolingModelBuilderRegistry` to allow registration of such a builder.
-3. Change the way how models are queried from `ProjectConnection` to use this new builders (there is no project context passed).
-   The only special case is the EclipseModel, which is actually built from the default project instead of the root project, so we'd need a specific implementation for that.
-4. Extend `BuildController.getModel()` to support `GradleBuild` as model parameter or add `BuildController.getBuildModel(Class)`.
-   Those would be using gradle model builder rather than project model builders
-
-### Test cases
-
-- Can register new model builder and
-  - query it from client via `ProjectConnection`.
-  - query it from client via build action.
-- Can request a model via build action:
-  - And get result from `GradleBuildToolingModelBuilder` for gradle build scope if passing `GradleBuild` as target.
-  - And get result from `ToolingModelBuilder` for project scope if passing one of parameters describing project.
-- Client receives decent feedback when requests an unknown model.
+* Test fixtures should stop daemons at end of test when custom user home dir is used.
+* Introduce a `GradleExecutor` implementation backed by the tooling API.
diff --git a/design-docs/unified-configuration-and-task-model.md b/design-docs/unified-configuration-and-task-model.md
index 99dfdb102470..53c1fdabff1d 100644
--- a/design-docs/unified-configuration-and-task-model.md
+++ b/design-docs/unified-configuration-and-task-model.md
@@ -319,6 +319,7 @@ provided by the build logic, and are visible to build logic with uses the tasks.
 - Integration with old DSL.
 - Enforcement of model element lifecycle (eg detect attempts to mutate a model element that has been closed).
 - Configure model elements on demand.
+- Native plugins: allow configuration of a default toolchain, without replacing the default toolchains. e.g. tweak `clang` without discarding `gcc`.
 - Error handling and reporting.
 - IDE integration.
 - Flesh out the JVM language plugins.
@@ -459,6 +460,7 @@ Reuse the domain object lifecycle mechanism to warn when:
 # Open issues
 
 - Fire events before and after configuration of domain objects.
+- Allow task outputs to be used as inputs to rules. eg a `Report` produced by a task.
 
 # Spike
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/NonPluggableTargetPluginHandler.java b/gradle/analytics.gradle
similarity index 54%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/internal/NonPluggableTargetPluginHandler.java
rename to gradle/analytics.gradle
index 068023fdbb75..2b965182d416 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/NonPluggableTargetPluginHandler.java
+++ b/gradle/analytics.gradle
@@ -14,25 +14,21 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.internal;
-
-import org.gradle.plugin.PluginHandler;
-
-import java.util.Map;
-
-public class NonPluggableTargetPluginHandler implements PluginHandler {
-
-    private final Object target;
-
-    public NonPluggableTargetPluginHandler(Object target) {
-        this.target = target;
+buildscript {
+    repositories {
+        maven { url 'http://repo.gradle.org/gradle/libs' }
+        ivy { url 'http://repo.gradle.org/gradle/gradleware' }
     }
 
-    public void apply(Map<String, ?> attributes) {
-        throw fail();
+    dependencies {
+        classpath group: 'com.gradleware', name: 'analytics-plugin', version: '+'
     }
+}
 
-    private RuntimeException fail() {
-        return new UnsupportedOperationException("Script target " + target + " cannot have plugins applied to it");
-    }
+//apply plugin: 'gradleware-analytics'
+// apparently it is a known issue that you can't use the plugin id here
+apply plugin: com.gradleware.monitoring.plugin.AnalyticsPlugin
+analytics {
+    serverUrl = "http://discovery-prod.herokuapp.com"
+    key = "1234567890"
 }
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index e8ff4465702c..8000b35f8ae8 100755
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -25,13 +25,14 @@ libraries.ant = dependencies.module('org.apache.ant:ant:1.9.3') {
     dependency 'org.apache.ant:ant-launcher:1.9.3@jar'
 }
 
-libraries.asm =  'org.ow2.asm:asm-all:5.0_BETA@jar'
+libraries.asm =  'org.ow2.asm:asm-all:5.0.2'
 libraries.commons_cli = 'commons-cli:commons-cli:1.2@jar'
 libraries.commons_io = dependencies.module(versions.commons_io)
 libraries.commons_lang = 'commons-lang:commons-lang:2.6@jar'
 libraries.commons_collections = 'commons-collections:commons-collections:3.2.1@jar'
+libraries.jsch = "com.jcraft:jsch:0.1.51"
 libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
-    dependency "com.jcraft:jsch:0.1.51"
+    dependency libraries.jsch
 }
 libraries.jcip = "net.jcip:jcip-annotations:1.0@jar"
 libraries.inject = dependencies.module('javax.inject:javax.inject:1')
@@ -79,9 +80,9 @@ libraries += [
         ant_antlr: 'org.apache.ant:ant-antlr:1.9.3@jar',
         antlr: 'antlr:antlr:2.7.7@jar',
         dom4j: 'dom4j:dom4j:1.6.1@jar',
-        guava: 'com.google.guava:guava-jdk5:14.0.1@jar',
+        guava: 'com.google.guava:guava-jdk5:17.0@jar',
         jsr305: 'com.google.code.findbugs:jsr305:1.3.9@jar',
-        groovy: 'org.codehaus.groovy:groovy-all:1.8.6@jar',
+        groovy: 'org.codehaus.groovy:groovy-all:2.2.2',
         jaxen: 'jaxen:jaxen:1.1@jar',
         jcip: "net.jcip:jcip-annotations:1.0@jar",
         jna: 'net.java.dev.jna:jna:3.2.7@jar',
@@ -135,7 +136,7 @@ libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
 }
 
 libraries.spock = [
-    'org.spockframework:spock-core:0.7-groovy-1.8@jar',
+    'org.spockframework:spock-core:0.7-groovy-2.0@jar',
     libraries.groovy,
     libraries.objenesis,
     'cglib:cglib-nodep:2.2.2'
@@ -149,4 +150,17 @@ libraries.jmock = [
     libraries.objenesis,
     'cglib:cglib-nodep:2.2'
 ]
-libraries.gson = "com.google.code.gson:gson:2.2.4"
\ No newline at end of file
+libraries.gson = "com.google.code.gson:gson:2.2.4"
+libraries.sshd = "org.apache.sshd:sshd-core:0.10.0"
+
+allprojects {
+    configurations.all {
+        resolutionStrategy.eachDependency { details ->
+            if (details.requested.group == 'org.ow2.asm') {
+                details.useTarget(libraries.asm)
+            } else if (details.requested.group == 'org.codehaus.groovy') {
+                details.useTarget(libraries.groovy)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/gradle/idea.gradle b/gradle/idea.gradle
index dbfd2a6ce097..68e2833db491 100644
--- a/gradle/idea.gradle
+++ b/gradle/idea.gradle
@@ -81,15 +81,15 @@ idea {
                 copyrightManager.@default = "ASL2"
                 def aslCopyright = copyrightManager.copyright.find { it.option.find { it.@name == "myName" }?.@value == "ASL2" }
                 if (aslCopyright == null) {
-                  copyrightManager.append(new XmlParser().parseText('''
+                  copyrightManager.append(new XmlParser().parseText("""
                       <copyright>
-                          <option name="notice" value="Copyright 2013 the original author or authors.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
+                          <option name="notice" value="Copyright ${Calendar.getInstance().get(Calendar.YEAR)} the original author or authors.&#10;&#10;Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);&#10;you may not use this file except in compliance with the License.&#10;You may obtain a copy of the License at&#10;&#10;     http://www.apache.org/licenses/LICENSE-2.0&#10;&#10;Unless required by applicable law or agreed to in writing, software&#10;distributed under the License is distributed on an &quot;AS IS&quot; BASIS,&#10;WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#10;See the License for the specific language governing permissions and&#10;limitations under the License." />
                           <option name="keyword" value="Copyright" />
                           <option name="allowReplaceKeyword" value="" />
                           <option name="myName" value="ASL2" />
                           <option name="myLocal" value="true" />
                       </copyright>
-                '''))
+                """))
                 }
 
                 // Code formatting options
@@ -202,6 +202,7 @@ idea {
                       <excludes>
                         <file url="file://$PROJECT_DIR$/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/JUnitTestClassProcessorTest.groovy" />
                       </excludes>
+                      <option name="heapSize" value="2000" />
                     </component>
                 '''))
             }
@@ -237,6 +238,12 @@ idea {
 
         vmParameters.'@value' = defaultTestVmParams.collect { it.contains(" ") ? "\"$it\"" : it }.join(" ")
 
+        // Add int test environment variables
+        def lang = System.getenv('LANG') ?: 'en_US.UTF-8'
+        def envVars = runConfig.envs.first()
+        envVars.children.each { child -> envVars.remove(child) }
+        envVars.appendNode('env', [name: 'LANG', value: lang])
+
         // Add an application configuration
         runManagerConfig.'@selected' = 'Application.Gradle'
         def appConfig =
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 135073738800..b49a12a7e9f9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 07e3d3d159f7..3a09df3b80af 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Mar 13 18:36:09 CET 2014
+#Tue Apr 29 11:46:15 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions-snapshots/gradle-1.12-20140312230025+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-1.12-bin.zip
diff --git a/settings.gradle b/settings.gradle
index 50074a87c547..5117b02e959f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -23,6 +23,7 @@ include 'cli'
 include 'launcher'
 include 'messaging'
 include 'resources'
+include 'resourcesHttp'
 include 'plugins'
 include 'scala'
 include 'ide'
@@ -55,6 +56,7 @@ include 'jacoco'
 include 'buildInit'
 include 'languageBase'
 include 'languageJvm'
+include 'pluginUse'
 
 rootProject.name = 'gradle'
 rootProject.children.each {project ->
diff --git a/subprojects/announce/src/integTest/groovy/org/gradle/api/plugins/announce/AnnouncePluginIntegrationTest.groovy b/subprojects/announce/src/integTest/groovy/org/gradle/api/plugins/announce/AnnouncePluginIntegrationTest.groovy
new file mode 100644
index 000000000000..b64c00ca2a95
--- /dev/null
+++ b/subprojects/announce/src/integTest/groovy/org/gradle/api/plugins/announce/AnnouncePluginIntegrationTest.groovy
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.plugins.announce
+
+import org.gradle.integtests.fixtures.WellBehavedPluginTest
+
+class AnnouncePluginIntegrationTest extends WellBehavedPluginTest {
+    @Override
+    String getPluginId() {
+        return "announce"
+    }
+
+    @Override
+    String getMainTask() {
+        return "tasks"
+    }
+}
diff --git a/subprojects/announce/src/integTest/groovy/org/gradle/api/plugins/announce/BuildAnnouncementsPluginIntegrationTest.groovy b/subprojects/announce/src/integTest/groovy/org/gradle/api/plugins/announce/BuildAnnouncementsPluginIntegrationTest.groovy
index b60b666418e8..321868ef9e97 100644
--- a/subprojects/announce/src/integTest/groovy/org/gradle/api/plugins/announce/BuildAnnouncementsPluginIntegrationTest.groovy
+++ b/subprojects/announce/src/integTest/groovy/org/gradle/api/plugins/announce/BuildAnnouncementsPluginIntegrationTest.groovy
@@ -30,12 +30,23 @@ class BuildAnnouncementsPluginIntegrationTest extends WellBehavedPluginTest {
 
     def "does not blow up when a local notification mechanism is not available"() {
         buildFile << """
-apply plugin: 'java'
 apply plugin: 'build-announcements'
 """
 
         expect:
-        succeeds 'assemble'
+        succeeds 'tasks'
+    }
+
+    def "does not blow up in headless mode when a local notification mechanism is not available"() {
+        buildFile << """
+apply plugin: 'build-announcements'
+"""
+
+        given:
+        executer.withArgument("-Djava.awt.headless=false")
+
+        expect:
+        succeeds 'tasks'
     }
 
     def "can use custom announcer to receive announcements"() {
diff --git a/subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/DefaultAnnouncerFactory.groovy b/subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/DefaultAnnouncerFactory.groovy
index d78f09a2c035..b0b38e01b40d 100755
--- a/subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/DefaultAnnouncerFactory.groovy
+++ b/subprojects/announce/src/main/groovy/org/gradle/api/plugins/announce/internal/DefaultAnnouncerFactory.groovy
@@ -57,7 +57,7 @@ class DefaultAnnouncerFactory implements AnnouncerFactory {
             case "snarl":
                 return new Snarl(iconProvider)
             case "growl":
-                if (JavaVersion.current().java6Compatible) {
+                if (JavaVersion.current().java6Compatible && !java.awt.GraphicsEnvironment.isHeadless()) {
                     try {
                         return getClass().getClassLoader().loadClass("org.gradle.api.plugins.announce.internal.jdk6.AppleScriptBackedGrowlAnnouncer").newInstance(iconProvider)
                     }
diff --git a/subprojects/base-services/src/main/java/org/gradle/api/Transformer.java b/subprojects/base-services/src/main/java/org/gradle/api/Transformer.java
index aadb1257e7d3..ac3966e5742d 100644
--- a/subprojects/base-services/src/main/java/org/gradle/api/Transformer.java
+++ b/subprojects/base-services/src/main/java/org/gradle/api/Transformer.java
@@ -17,18 +17,18 @@
 
 /**
  * <p>A {@code Transformer} transforms objects of type.</p>
- * 
+ *
  * <p>Implementations are free to return new objects or mutate the incoming value.</p>
  *
- * @param <R> The type the value is transformed to.
- * @param <I> The type of the value to be transformed.
+ * @param <OUT> The type the value is transformed to.
+ * @param <IN> The type of the value to be transformed.
  */
-public interface Transformer<R, I> {
+public interface Transformer<OUT, IN> {
     /**
      * Transforms the given object, and returns the transformed value.
      *
      * @param original The object to transform.
      * @return The transformed object.
      */
-    R transform(I original);
+    OUT transform(IN original);
 }
diff --git a/subprojects/base-services/src/main/java/org/gradle/internal/classpath/ClassPath.java b/subprojects/base-services/src/main/java/org/gradle/internal/classpath/ClassPath.java
index ab6570795be1..7b5dcfbf7f6b 100644
--- a/subprojects/base-services/src/main/java/org/gradle/internal/classpath/ClassPath.java
+++ b/subprojects/base-services/src/main/java/org/gradle/internal/classpath/ClassPath.java
@@ -20,6 +20,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.Collection;
+import java.util.List;
 
 /**
  * An immutable classpath.
@@ -27,11 +28,11 @@
 public interface ClassPath {
     boolean isEmpty();
 
-    Collection<URI> getAsURIs();
+    List<URI> getAsURIs();
 
-    Collection<File> getAsFiles();
+    List<File> getAsFiles();
 
-    Collection<URL> getAsURLs();
+    List<URL> getAsURLs();
 
     URL[] getAsURLArray();
 
diff --git a/subprojects/base-services/src/main/java/org/gradle/internal/classpath/DefaultClassPath.java b/subprojects/base-services/src/main/java/org/gradle/internal/classpath/DefaultClassPath.java
index 61982673b7a6..a702a54a3ecf 100644
--- a/subprojects/base-services/src/main/java/org/gradle/internal/classpath/DefaultClassPath.java
+++ b/subprojects/base-services/src/main/java/org/gradle/internal/classpath/DefaultClassPath.java
@@ -17,16 +17,14 @@
 package org.gradle.internal.classpath;
 
 import org.gradle.internal.UncheckedException;
+import org.gradle.util.CollectionUtils;
 
 import java.io.File;
 import java.io.Serializable;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 /**
  * An immutable classpath.
@@ -35,14 +33,19 @@ public class DefaultClassPath implements ClassPath, Serializable {
     private final List<File> files;
 
     public DefaultClassPath(Iterable<File> files) {
-        this.files = new ArrayList<File>();
-        for (File file : files) {
-            this.files.add(file);
-        }
+        Set<File> noDuplicates = new LinkedHashSet<File>();
+        CollectionUtils.addAll(noDuplicates, files);
+        this.files = new ArrayList<File>(noDuplicates);
     }
-    
+
+    private DefaultClassPath(Set<File> files) {
+        this.files = new ArrayList<File>(files);
+    }
+
     public DefaultClassPath(File... files) {
-        this(Arrays.asList(files));
+        Set<File> noDuplicates = new LinkedHashSet<File>();
+        CollectionUtils.addAll(noDuplicates, files);
+        this.files = new ArrayList<File>(noDuplicates);
     }
 
     @Override
@@ -54,7 +57,7 @@ public boolean isEmpty() {
         return files.isEmpty();
     }
 
-    public Collection<URI> getAsURIs() {
+    public List<URI> getAsURIs() {
         List<URI> urls = new ArrayList<URI>();
         for (File file : files) {
             urls.add(file.toURI());
@@ -62,7 +65,7 @@ public Collection<URI> getAsURIs() {
         return urls;
     }
 
-    public Collection<File> getAsFiles() {
+    public List<File> getAsFiles() {
         return files;
     }
 
@@ -71,7 +74,7 @@ public URL[] getAsURLArray() {
         return result.toArray(new URL[result.size()]);
     }
 
-    public Collection<URL> getAsURLs() {
+    public List<URL> getAsURLs() {
         List<URL> urls = new ArrayList<URL>();
         for (File file : files) {
             try {
@@ -100,8 +103,8 @@ public ClassPath plus(Collection<File> other) {
         return new DefaultClassPath(concat(files, other));
     }
 
-    private Iterable<File> concat(List<File> files1, Collection<File> files2) {
-        List<File> result = new ArrayList<File>();
+    private Set<File> concat(Collection<File> files1, Collection<File> files2) {
+        Set<File> result = new LinkedHashSet<File>();
         result.addAll(files1);
         result.addAll(files2);
         return result;
diff --git a/subprojects/core/src/main/groovy/org/gradle/internal/exceptions/Contextual.java b/subprojects/base-services/src/main/java/org/gradle/internal/exceptions/Contextual.java
similarity index 100%
rename from subprojects/core/src/main/groovy/org/gradle/internal/exceptions/Contextual.java
rename to subprojects/base-services/src/main/java/org/gradle/internal/exceptions/Contextual.java
diff --git a/subprojects/base-services/src/main/java/org/gradle/internal/service/DefaultServiceRegistry.java b/subprojects/base-services/src/main/java/org/gradle/internal/service/DefaultServiceRegistry.java
index 5cc1ad02f980..ac5241c1d0b2 100644
--- a/subprojects/base-services/src/main/java/org/gradle/internal/service/DefaultServiceRegistry.java
+++ b/subprojects/base-services/src/main/java/org/gradle/internal/service/DefaultServiceRegistry.java
@@ -23,6 +23,7 @@
 import org.gradle.internal.concurrent.Stoppable;
 import org.gradle.internal.reflect.JavaReflectionUtil;
 
+import java.io.Closeable;
 import java.lang.reflect.*;
 import java.util.*;
 
@@ -50,7 +51,7 @@
  *
  * <p>Service registries are arranged in a hierarchy. If a service of a given type cannot be located, the registry uses its parent registry, if any, to locate the service.</p>
  */
-public class DefaultServiceRegistry implements ServiceRegistry {
+public class DefaultServiceRegistry implements ServiceRegistry, Closeable {
     private final Object lock = new Object();
     private final CompositeProvider allServices = new CompositeProvider();
     private final OwnServices ownServices;
diff --git a/subprojects/base-services/src/main/java/org/gradle/internal/service/ServiceRegistry.java b/subprojects/base-services/src/main/java/org/gradle/internal/service/ServiceRegistry.java
index b0bd768a615a..ea55354e8515 100644
--- a/subprojects/base-services/src/main/java/org/gradle/internal/service/ServiceRegistry.java
+++ b/subprojects/base-services/src/main/java/org/gradle/internal/service/ServiceRegistry.java
@@ -75,14 +75,4 @@ public interface ServiceRegistry {
      * @throws ServiceLookupException On failure to lookup the specified service factory.
      */
     <T> T newInstance(Class<T> type) throws UnknownServiceException, ServiceLookupException;
-
-    /**
-     * Closes all services for this registry.
-     *
-     * For each service, if the service has a public void close() or stop() method, that method is called to close the service.
-     */
-    void close();
-
-    boolean isClosed();
-
 }
diff --git a/subprojects/base-services/src/main/java/org/gradle/util/CollectionUtils.java b/subprojects/base-services/src/main/java/org/gradle/util/CollectionUtils.java
index e990673ff330..12f2e1599f56 100644
--- a/subprojects/base-services/src/main/java/org/gradle/util/CollectionUtils.java
+++ b/subprojects/base-services/src/main/java/org/gradle/util/CollectionUtils.java
@@ -15,6 +15,7 @@
  */
 package org.gradle.util;
 
+import com.google.common.collect.ImmutableListMultimap;
 import org.gradle.api.Action;
 import org.gradle.api.Transformer;
 import org.gradle.api.specs.Spec;
@@ -211,19 +212,17 @@ public static <T> List<T> flattenCollections(Class<T> type, Object... things) {
     }
 
     public static <T> List<T> toList(Iterable<? extends T> things) {
-        if (things == null) {
-            return new ArrayList<T>(0);
-        }
         if (things instanceof List) {
             @SuppressWarnings("unchecked") List<T> castThings = (List<T>) things;
             return castThings;
         }
-        if (things instanceof Collection) {
-            return new ArrayList<T>((Collection) things);
-        }
-        List<T> list = new ArrayList<T>();
-        for (T thing : things) {
-            list.add(thing);
+        return toMutableList(things);
+    }
+
+    public static <T> List<T> toList(Enumeration<? extends T> things) {
+        AbstractList<T> list = new ArrayList<T>();
+        while (things.hasMoreElements()) {
+            list.add(things.nextElement());
         }
         return list;
     }
@@ -532,4 +531,15 @@ public static <T, I> T inject(T target, Iterable<? extends I> items, Action<Inje
         return target;
     }
 
+    public static <K, V> ImmutableListMultimap<K, V> groupBy(Iterable<? extends V> iterable, Transformer<? extends K, V> grouper) {
+        ImmutableListMultimap.Builder<K, V> builder = ImmutableListMultimap.builder();
+
+        for (V element : iterable) {
+            K key = grouper.transform(element);
+            builder.put(key, element);
+        }
+
+        return builder.build();
+    }
+
 }
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/util/GradleVersion.java b/subprojects/base-services/src/main/java/org/gradle/util/GradleVersion.java
similarity index 89%
rename from subprojects/core/src/main/groovy/org/gradle/util/GradleVersion.java
rename to subprojects/base-services/src/main/java/org/gradle/util/GradleVersion.java
index c87eb2cde212..b024ea736bac 100644
--- a/subprojects/core/src/main/groovy/org/gradle/util/GradleVersion.java
+++ b/subprojects/base-services/src/main/java/org/gradle/util/GradleVersion.java
@@ -16,14 +16,9 @@
 
 package org.gradle.util;
 
-import groovy.lang.GroovySystem;
-import org.apache.ivy.Ivy;
-import org.apache.tools.ant.Main;
 import org.gradle.api.GradleException;
 import org.gradle.api.UncheckedIOException;
 import org.gradle.internal.UncheckedException;
-import org.gradle.internal.jvm.Jvm;
-import org.gradle.internal.os.OperatingSystem;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,7 +50,6 @@ public class GradleVersion implements Comparable<GradleVersion> {
 
     public static final String RESOURCE_NAME = "/org/gradle/build-receipt.properties";
 
-    // TODO - get rid of this static initialiser nonsense
     static {
         URL resource = GradleVersion.class.getResource(RESOURCE_NAME);
 
@@ -86,7 +80,6 @@ public class GradleVersion implements Comparable<GradleVersion> {
         }
     }
 
-
     public static GradleVersion current() {
         return CURRENT;
     }
@@ -166,6 +159,14 @@ public String getBuildTime() {
         return buildTime;
     }
 
+    public String getBuildNumber() {
+        return buildNumber;
+    }
+
+    public String getRevision() {
+        return commitId;
+    }
+
     public boolean isSnapshot() {
         return snapshot != null;
     }
@@ -259,30 +260,6 @@ public int hashCode() {
         return version.hashCode();
     }
 
-    public String prettyPrint() {
-        final StringBuilder sb = new StringBuilder();
-        sb.append("\n------------------------------------------------------------\nGradle ");
-        sb.append(getVersion());
-        sb.append("\n------------------------------------------------------------\n\nBuild time:   ");
-        sb.append(getBuildTime());
-        sb.append("\nBuild number: ");
-        sb.append(buildNumber);
-        sb.append("\nRevision:     ");
-        sb.append(commitId);
-        sb.append("\n\nGroovy:       ");
-        sb.append(GroovySystem.getVersion());
-        sb.append("\nAnt:          ");
-        sb.append(Main.getAntVersion());
-        sb.append("\nIvy:          ");
-        sb.append(Ivy.getIvyVersion());
-        sb.append("\nJVM:          ");
-        sb.append(Jvm.current());
-        sb.append("\nOS:           ");
-        sb.append(OperatingSystem.current());
-        sb.append("\n");
-        return sb.toString();
-    }
-
     public boolean isValid() {
         return versionPart != null;
     }
diff --git a/subprojects/base-services/src/test/groovy/org/gradle/internal/classpath/DefaultClassPathTest.groovy b/subprojects/base-services/src/test/groovy/org/gradle/internal/classpath/DefaultClassPathTest.groovy
index 5d4451846fd2..2e90bd61212b 100644
--- a/subprojects/base-services/src/test/groovy/org/gradle/internal/classpath/DefaultClassPathTest.groovy
+++ b/subprojects/base-services/src/test/groovy/org/gradle/internal/classpath/DefaultClassPathTest.groovy
@@ -19,6 +19,17 @@ import spock.lang.Specification
 import org.gradle.util.Matchers
 
 class DefaultClassPathTest extends Specification {
+    def "removes duplicates when constructed"() {
+        def file1 = new File("a.jar")
+        def file2 = new File("b.jar")
+        def cp1 = new DefaultClassPath(file1, file2, file1, file2)
+        def cp2 = new DefaultClassPath([file1, file1, file2, file1])
+
+        expect:
+        cp1.asFiles == [file1, file2]
+        cp2.asFiles == [file1, file2]
+    }
+
     def "can add classpaths together"() {
         def file1 = new File("a.jar")
         def file2 = new File("b.jar")
@@ -30,6 +41,18 @@ class DefaultClassPathTest extends Specification {
         cp3.asFiles == [file1, file2]
     }
 
+    def "removes duplicates when added together"() {
+        def file1 = new File("a.jar")
+        def file2 = new File("b.jar")
+        def file3 = new File("c.jar")
+        def cp1 = new DefaultClassPath(file1, file2)
+        def cp2 = new DefaultClassPath(file3, file2, file1)
+
+        expect:
+        def cp3 = cp1 + cp2
+        cp3.asFiles == [file1, file2, file3]
+    }
+
     def "add returns lhs when rhs is empty"() {
         def cp1 = new DefaultClassPath(new File("a.jar"))
         def cp2 = new DefaultClassPath()
@@ -48,7 +71,7 @@ class DefaultClassPathTest extends Specification {
 
     def "can add collection of files to classpath"() {
         def file1 = new File("a.jar")
-        def file2 = new File("a.jar")
+        def file2 = new File("b.jar")
         def cp = new DefaultClassPath(file1)
 
         expect:
@@ -62,6 +85,7 @@ class DefaultClassPathTest extends Specification {
         def file3 = new File("c.jar")
         def cp = new DefaultClassPath(file1, file2)
         def same = new DefaultClassPath(file1, file2)
+        def sameWithDuplicates = new DefaultClassPath(file1, file2, file2, file1)
         def differentOrder = new DefaultClassPath(file2, file1)
         def missing = new DefaultClassPath(file2)
         def extra = new DefaultClassPath(file1, file2, file3)
@@ -69,6 +93,7 @@ class DefaultClassPathTest extends Specification {
 
         expect:
         cp Matchers.strictlyEqual(same)
+        cp Matchers.strictlyEqual(sameWithDuplicates)
         cp != differentOrder
         cp != missing
         cp != extra
diff --git a/subprojects/base-services/src/test/groovy/org/gradle/internal/concurrent/DefaultExecutorFactoryTest.groovy b/subprojects/base-services/src/test/groovy/org/gradle/internal/concurrent/DefaultExecutorFactoryTest.groovy
index 04824187dee9..a45265b07528 100644
--- a/subprojects/base-services/src/test/groovy/org/gradle/internal/concurrent/DefaultExecutorFactoryTest.groovy
+++ b/subprojects/base-services/src/test/groovy/org/gradle/internal/concurrent/DefaultExecutorFactoryTest.groovy
@@ -120,7 +120,6 @@ class DefaultExecutorFactoryTest extends ConcurrentSpec {
 
         def failure2 = new RuntimeException()
         def runnable2 = {
-            thread.blockUntil.broken1
             instant.broken2
             throw failure2
         }
@@ -128,6 +127,7 @@ class DefaultExecutorFactoryTest extends ConcurrentSpec {
         when:
         def executor = factory.create('test')
         executor.execute(runnable1)
+        thread.blockUntil.broken1
         executor.execute(runnable2)
         thread.blockUntil.broken2
 
diff --git a/subprojects/base-services/src/test/groovy/org/gradle/util/CollectionUtilsTest.groovy b/subprojects/base-services/src/test/groovy/org/gradle/util/CollectionUtilsTest.groovy
index ae8f0c505116..5992094f7e9a 100644
--- a/subprojects/base-services/src/test/groovy/org/gradle/util/CollectionUtilsTest.groovy
+++ b/subprojects/base-services/src/test/groovy/org/gradle/util/CollectionUtilsTest.groovy
@@ -172,10 +172,10 @@ class CollectionUtilsTest extends Specification {
         expect:
         intersection([collA, collB]) == collC
         where:
-        collA              | collB            | collC
-        []                 | ["a", "b", "c"]  | []
-        ['a', 'b', 'c']    | ["a", "b", "c"]  | ['a', 'b', 'c']
-        ['a', 'b', 'c']    | ["b", "c"]       | ['b', 'c']
+        collA           | collB           | collC
+        []              | ["a", "b", "c"] | []
+        ['a', 'b', 'c'] | ["a", "b", "c"] | ['a', 'b', 'c']
+        ['a', 'b', 'c'] | ["b", "c"]      | ['b', 'c']
     }
 
     def "flattenToList"() {
@@ -289,9 +289,16 @@ class CollectionUtilsTest extends Specification {
         toSet([]).empty
     }
 
+    def "to list"() {
+        expect:
+        toList([1, 2, 3] as Set) == [1, 2, 3]
+        toList([]).empty
+        toList(([1, 2, 3] as Vector).elements()) == [1, 2, 3]
+    }
+
     def "sorting with comparator"() {
         given:
-        def naturalComparator = { a, b -> a<=>b } as Comparator
+        def naturalComparator = { a, b -> a <=> b } as Comparator
 
         expect:
         def l = [1, 2, 3]
@@ -316,6 +323,13 @@ class CollectionUtilsTest extends Specification {
         sort([] as Set) == []
     }
 
+    def "grouping"() {
+        expect:
+        groupBy([1, 2, 3], transformer { "a" }).asMap() == ["a": [1, 2, 3]]
+        groupBy(["a", "b", "c"], transformer { it.toUpperCase() }).asMap() == ["A": ["a"], "B": ["b"], "C": ["c"]]
+        groupBy([], transformer { throw new AssertionError("shouldn't be called") }).isEmpty()
+    }
+
     Spec<?> spec(Closure c) {
         Specs.convertClosureToSpec(c)
     }
diff --git a/subprojects/core/src/test/groovy/org/gradle/util/GradleVersionTest.groovy b/subprojects/base-services/src/test/groovy/org/gradle/util/GradleVersionTest.groovy
similarity index 91%
rename from subprojects/core/src/test/groovy/org/gradle/util/GradleVersionTest.groovy
rename to subprojects/base-services/src/test/groovy/org/gradle/util/GradleVersionTest.groovy
index 21b25af35298..aa223fe185a8 100644
--- a/subprojects/core/src/test/groovy/org/gradle/util/GradleVersionTest.groovy
+++ b/subprojects/base-services/src/test/groovy/org/gradle/util/GradleVersionTest.groovy
@@ -16,11 +16,6 @@
 
 package org.gradle.util
 
-import org.apache.ivy.Ivy
-import org.apache.tools.ant.Main
-import org.codehaus.groovy.runtime.InvokerHelper
-import org.gradle.internal.jvm.Jvm
-import org.gradle.internal.os.OperatingSystem
 import spock.lang.Issue
 import spock.lang.Specification
 
@@ -253,24 +248,4 @@ class GradleVersionTest extends Specification {
         '1.0-milestone-3-20121012100000+1000' | "1.0"
         '2.0-milestone-3'                     | "2.0" // not that we're planning to do this
     }
-
-    def prettyPrint() {
-        String expectedText = """
-------------------------------------------------------------
-Gradle $version.version
-------------------------------------------------------------
-
-Build time:   $version.buildTime
-Build number: $version.buildNumber
-Revision:     $version.commitId
-
-Groovy:       $InvokerHelper.version
-Ant:          $Main.antVersion
-Ivy:          ${Ivy.ivyVersion}
-JVM:          ${Jvm.current()}
-OS:           ${OperatingSystem.current()}
-"""
-        expect:
-        version.prettyPrint() == expectedText
-    }
 }
diff --git a/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/CompareGradleBuilds.java b/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/CompareGradleBuilds.java
index ede1389a7dea..e4c7932bc93c 100644
--- a/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/CompareGradleBuilds.java
+++ b/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/CompareGradleBuilds.java
@@ -18,8 +18,7 @@
 
 import org.gradle.api.*;
 import org.gradle.api.internal.file.FileResolver;
-import org.gradle.internal.filestore.FileStore;
-import org.gradle.api.internal.filestore.PathNormalisingKeyFileStore;
+import org.gradle.internal.resource.local.PathNormalisingKeyFileStore;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.plugins.buildcomparison.compare.internal.BuildComparisonResult;
 import org.gradle.api.plugins.buildcomparison.gradle.internal.ComparableGradleBuildExecuter;
@@ -37,6 +36,7 @@
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.VerificationTask;
+import org.gradle.internal.resource.local.FileStore;
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.logging.ConsoleRenderer;
 import org.gradle.logging.ProgressLogger;
@@ -65,14 +65,9 @@ public class CompareGradleBuilds extends DefaultTask implements VerificationTask
     private boolean ignoreFailures;
     private Object reportDir;
 
-    private final FileResolver fileResolver;
-    private final ProgressLoggerFactory progressLoggerFactory;
-
-    @Inject
-    public CompareGradleBuilds(FileResolver fileResolver, ProgressLoggerFactory progressLoggerFactory, Instantiator instantiator) {
-        this.fileResolver = fileResolver;
-        this.progressLoggerFactory = progressLoggerFactory;
-
+    public CompareGradleBuilds() {
+        FileResolver fileResolver = getFileResolver();
+        Instantiator instantiator = getInstantiator();
         sourceBuild = instantiator.newInstance(DefaultGradleBuildInvocationSpec.class, fileResolver, getProject().getRootDir());
         sourceBuild.setTasks(DEFAULT_TASKS);
         targetBuild = instantiator.newInstance(DefaultGradleBuildInvocationSpec.class, fileResolver, getProject().getRootDir());
@@ -86,6 +81,21 @@ public boolean isSatisfiedBy(Task element) {
         });
     }
 
+    @Inject
+    protected FileResolver getFileResolver() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected ProgressLoggerFactory getProgressLoggerFactory() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * The specification of how to invoke the source build.
      *
@@ -173,7 +183,7 @@ public void setIgnoreFailures(boolean ignoreFailures) {
      */
     @OutputDirectory
     public File getReportDir() {
-        return reportDir == null ? null : fileResolver.resolve(reportDir);
+        return reportDir == null ? null : getFileResolver().resolve(reportDir);
     }
 
     /**
@@ -209,7 +219,7 @@ void compare() {
         ComparableGradleBuildExecuter targetBuildExecuter = new ComparableGradleBuildExecuter(targetBuild);
 
         Logger logger = getLogger();
-        ProgressLogger progressLogger = progressLoggerFactory.newOperation(getClass());
+        ProgressLogger progressLogger = getProgressLoggerFactory().newOperation(getClass());
         progressLogger.setDescription("Gradle Build Comparison");
         progressLogger.setShortDescription(getName());
 
@@ -233,7 +243,7 @@ void compare() {
                 new UnknownBuildOutcomeHtmlRenderer()
         );
 
-        File fileStoreTmpBase = fileResolver.resolve(String.format(TMP_FILESTORAGE_PREFIX + "-%s-%s", getName(), System.currentTimeMillis()));
+        File fileStoreTmpBase = getFileResolver().resolve(String.format(TMP_FILESTORAGE_PREFIX + "-%s-%s", getName(), System.currentTimeMillis()));
         FileStore<String> fileStore = new PathNormalisingKeyFileStore(fileStoreTmpBase);
 
         Map<String, String> hostAttributes = new LinkedHashMap<String, String>(4);
diff --git a/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildComparison.java b/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildComparison.java
index 9f85e9e68c5f..5ca8c4f35478 100644
--- a/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildComparison.java
+++ b/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildComparison.java
@@ -20,7 +20,7 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Transformer;
 import org.gradle.internal.IoActions;
-import org.gradle.internal.filestore.FileStore;
+import org.gradle.internal.resource.local.FileStore;
 import org.gradle.api.invocation.Gradle;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.plugins.buildcomparison.compare.internal.*;
diff --git a/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrer.java b/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrer.java
index 98b320a9332b..cd423baf4928 100644
--- a/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrer.java
+++ b/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrer.java
@@ -17,7 +17,7 @@
 package org.gradle.api.plugins.buildcomparison.gradle.internal;
 
 import org.gradle.api.Transformer;
-import org.gradle.internal.filestore.FileStore;
+import org.gradle.internal.resource.local.FileStore;
 import org.gradle.api.plugins.buildcomparison.outcome.internal.BuildOutcome;
 import org.gradle.api.plugins.buildcomparison.outcome.internal.archive.GeneratedArchiveBuildOutcome;
 import org.gradle.api.plugins.buildcomparison.outcome.internal.unknown.UnknownBuildOutcome;
diff --git a/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetTransformer.java b/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetTransformer.java
index 20765cc1c762..195ad86ea6a8 100644
--- a/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetTransformer.java
+++ b/subprojects/build-comparison/src/main/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetTransformer.java
@@ -17,7 +17,7 @@
 package org.gradle.api.plugins.buildcomparison.gradle.internal;
 
 import org.gradle.api.Transformer;
-import org.gradle.internal.filestore.FileStore;
+import org.gradle.internal.resource.local.FileStore;
 import org.gradle.api.plugins.buildcomparison.outcome.internal.BuildOutcome;
 import org.gradle.api.plugins.buildcomparison.outcome.internal.archive.GeneratedArchiveBuildOutcome;
 import org.gradle.api.plugins.buildcomparison.outcome.internal.unknown.UnknownBuildOutcome;
diff --git a/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/compare/internal/DefaultBuildOutcomeComparatorFactoryTest.groovy b/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/compare/internal/DefaultBuildOutcomeComparatorFactoryTest.groovy
index 22b519b3cb78..6c34163ebe5b 100644
--- a/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/compare/internal/DefaultBuildOutcomeComparatorFactoryTest.groovy
+++ b/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/compare/internal/DefaultBuildOutcomeComparatorFactoryTest.groovy
@@ -77,7 +77,7 @@ class DefaultBuildOutcomeComparatorFactoryTest extends Specification {
     }
 
     private static BuildOutcomeComparator toBuildOutcomeComparator(BuildOutcome buildOutcome) {
-        new BuildOutcomeComparator<>() {
+        new BuildOutcomeComparator() {
             String toString() {
                 "comparator for $buildOutcome"
             }
diff --git a/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrerTest.groovy b/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrerTest.groovy
index 665f6eca8626..66cba82e5f1e 100644
--- a/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrerTest.groovy
+++ b/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetInferrerTest.groovy
@@ -16,7 +16,7 @@
 
 package org.gradle.api.plugins.buildcomparison.gradle.internal
 
-import org.gradle.api.internal.filestore.PathNormalisingKeyFileStore
+import org.gradle.internal.resource.local.PathNormalisingKeyFileStore
 import org.gradle.api.plugins.buildcomparison.fixtures.ProjectOutcomesBuilder
 import org.gradle.api.plugins.buildcomparison.outcome.internal.archive.GeneratedArchiveBuildOutcome
 import org.gradle.api.plugins.buildcomparison.outcome.internal.unknown.UnknownBuildOutcome
diff --git a/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetTransformerTest.groovy b/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetTransformerTest.groovy
index b01fb244ce6c..86bd8a12e410 100644
--- a/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetTransformerTest.groovy
+++ b/subprojects/build-comparison/src/test/groovy/org/gradle/api/plugins/buildcomparison/gradle/internal/GradleBuildOutcomeSetTransformerTest.groovy
@@ -17,7 +17,7 @@
 package org.gradle.api.plugins.buildcomparison.gradle.internal
 
 import org.gradle.api.Action
-import org.gradle.internal.filestore.FileStore
+import org.gradle.internal.resource.local.FileStore
 import org.gradle.api.plugins.buildcomparison.fixtures.ProjectOutcomesBuilder
 import org.gradle.api.plugins.buildcomparison.outcome.internal.archive.GeneratedArchiveBuildOutcome
 import org.gradle.api.plugins.buildcomparison.outcome.internal.unknown.UnknownBuildOutcome
diff --git a/subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/GroovyLibraryInitIntegrationTest.groovy b/subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/GroovyLibraryInitIntegrationTest.groovy
index ced4e048c89d..401c00d9e03b 100644
--- a/subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/GroovyLibraryInitIntegrationTest.groovy
+++ b/subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/GroovyLibraryInitIntegrationTest.groovy
@@ -20,8 +20,10 @@ import org.gradle.buildinit.plugins.fixtures.WrapperTestFixture
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.integtests.fixtures.DefaultTestExecutionResult
 import org.gradle.integtests.fixtures.TestExecutionResult
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
 
-
+@Requires(TestPrecondition.JDK6_OR_LATER)
 class GroovyLibraryInitIntegrationTest extends AbstractIntegrationSpec {
 
     public static final String SAMPLE_LIBRARY_CLASS = "src/main/groovy/Library.groovy"
diff --git a/subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/MavenConversionIntegrationTest.groovy b/subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/MavenConversionIntegrationTest.groovy
index 6d2561a1ea42..8b42209de11e 100644
--- a/subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/MavenConversionIntegrationTest.groovy
+++ b/subprojects/build-init/src/integTest/groovy/org/gradle/buildinit/plugins/MavenConversionIntegrationTest.groovy
@@ -22,9 +22,9 @@ import org.gradle.integtests.fixtures.DefaultTestExecutionResult
 import org.gradle.integtests.fixtures.TestResources
 import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.fixtures.maven.M2Installation
-import org.gradle.test.fixtures.maven.MavenHttpModule
-import org.gradle.test.fixtures.maven.MavenHttpRepository
-import org.gradle.test.fixtures.maven.PomHttpArtifact
+import org.gradle.test.fixtures.server.http.MavenHttpModule
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.PomHttpArtifact
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.gradle.util.SetSystemProperties
 import org.junit.Rule
diff --git a/subprojects/build-init/src/main/groovy/org/gradle/api/tasks/wrapper/Wrapper.java b/subprojects/build-init/src/main/groovy/org/gradle/api/tasks/wrapper/Wrapper.java
index 634067757e0b..e13aa25b0048 100644
--- a/subprojects/build-init/src/main/groovy/org/gradle/api/tasks/wrapper/Wrapper.java
+++ b/subprojects/build-init/src/main/groovy/org/gradle/api/tasks/wrapper/Wrapper.java
@@ -29,6 +29,7 @@
 import org.gradle.wrapper.Install;
 import org.gradle.wrapper.WrapperExecutor;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.net.URL;
 import java.util.Properties;
@@ -84,11 +85,16 @@ public Wrapper() {
         gradleVersion = GradleVersion.current();
     }
 
+    @Inject
+    protected FileLookup getFileLookup() {
+        throw new UnsupportedOperationException();
+    }
+
     @TaskAction
     void generate() {
         File jarFileDestination = getJarFile();
         File unixScript = getScriptFile();
-        FileResolver resolver = getServices().get(FileLookup.class).getFileResolver(unixScript.getParentFile());
+        FileResolver resolver = getFileLookup().getFileResolver(unixScript.getParentFile());
         String jarFileRelativePath = resolver.resolveAsRelativePath(jarFileDestination);
 
         writeProperties(getPropertiesFile());
diff --git a/subprojects/cli/src/main/java/org/gradle/cli/AbstractCommandLineConverter.java b/subprojects/cli/src/main/java/org/gradle/cli/AbstractCommandLineConverter.java
index 07081fe64cdb..f2d3d0162ba2 100644
--- a/subprojects/cli/src/main/java/org/gradle/cli/AbstractCommandLineConverter.java
+++ b/subprojects/cli/src/main/java/org/gradle/cli/AbstractCommandLineConverter.java
@@ -16,21 +16,9 @@
 package org.gradle.cli;
 
 public abstract class AbstractCommandLineConverter<T> implements CommandLineConverter<T> {
-    public T convert(Iterable<String> args) throws CommandLineArgumentException {
-        CommandLineParser parser = new CommandLineParser();
-        configure(parser);
-        return convert(parser.parse(args));
-    }
-
-    public T convert(ParsedCommandLine args) throws CommandLineArgumentException {
-        return convert(args, newInstance());
-    }
-
     public T convert(Iterable<String> args, T target) throws CommandLineArgumentException {
         CommandLineParser parser = new CommandLineParser();
         configure(parser);
         return convert(parser.parse(args), target);
     }
-
-    protected abstract T newInstance();
 }
diff --git a/subprojects/cli/src/main/java/org/gradle/cli/AbstractPropertiesCommandLineConverter.java b/subprojects/cli/src/main/java/org/gradle/cli/AbstractPropertiesCommandLineConverter.java
index b66d3f677505..e68c2d2d9b70 100644
--- a/subprojects/cli/src/main/java/org/gradle/cli/AbstractPropertiesCommandLineConverter.java
+++ b/subprojects/cli/src/main/java/org/gradle/cli/AbstractPropertiesCommandLineConverter.java
@@ -16,7 +16,6 @@
 
 package org.gradle.cli;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public abstract class AbstractPropertiesCommandLineConverter extends AbstractCommandLineConverter<Map<String, String>> {
@@ -30,10 +29,6 @@ public void configure(CommandLineParser parser) {
         option.hasDescription(getPropertyOptionDescription());
     }
 
-    protected Map<String, String> newInstance() {
-        return new HashMap<String, String>();
-    }
-
     public Map<String, String> convert(ParsedCommandLine options, Map<String, String> properties) throws CommandLineArgumentException {
         for (String keyValueExpression : options.option(getPropertyOption()).getValues()) {
             int pos = keyValueExpression.indexOf("=");
diff --git a/subprojects/cli/src/main/java/org/gradle/cli/CommandLineConverter.java b/subprojects/cli/src/main/java/org/gradle/cli/CommandLineConverter.java
index bfc2627c386b..f0c7a3821fd1 100644
--- a/subprojects/cli/src/main/java/org/gradle/cli/CommandLineConverter.java
+++ b/subprojects/cli/src/main/java/org/gradle/cli/CommandLineConverter.java
@@ -16,12 +16,8 @@
 package org.gradle.cli;
 
 public interface CommandLineConverter<T> {
-    T convert(Iterable<String> args) throws CommandLineArgumentException;
-
     T convert(Iterable<String> args, T target) throws CommandLineArgumentException;
 
-    T convert(ParsedCommandLine args) throws CommandLineArgumentException;
-
     T convert(ParsedCommandLine args, T target) throws CommandLineArgumentException;
 
     void configure(CommandLineParser parser);
diff --git a/subprojects/cli/src/test/groovy/org/gradle/cli/AbstractPropertiesCommandLineConverterTest.groovy b/subprojects/cli/src/test/groovy/org/gradle/cli/AbstractPropertiesCommandLineConverterTest.groovy
index 0a3832f1d79b..f66d0e74e2f5 100644
--- a/subprojects/cli/src/test/groovy/org/gradle/cli/AbstractPropertiesCommandLineConverterTest.groovy
+++ b/subprojects/cli/src/test/groovy/org/gradle/cli/AbstractPropertiesCommandLineConverterTest.groovy
@@ -38,7 +38,7 @@ class AbstractPropertiesCommandLineConverterTest extends Specification {
     }
 
     def convert(String... args) {
-        converter.convert(Arrays.asList(args)).sort()
+        converter.convert(Arrays.asList(args), new HashMap<String, String>()).sort()
     }
 
     def "configures property based options"() {
diff --git a/subprojects/cli/src/test/groovy/org/gradle/cli/ProjectPropertiesCommandLineConverterTest.groovy b/subprojects/cli/src/test/groovy/org/gradle/cli/ProjectPropertiesCommandLineConverterTest.groovy
index 00623bab409e..69d2943cb678 100644
--- a/subprojects/cli/src/test/groovy/org/gradle/cli/ProjectPropertiesCommandLineConverterTest.groovy
+++ b/subprojects/cli/src/test/groovy/org/gradle/cli/ProjectPropertiesCommandLineConverterTest.groovy
@@ -22,7 +22,7 @@ class ProjectPropertiesCommandLineConverterTest extends Specification{
   def converter = new ProjectPropertiesCommandLineConverter();
 
   def convert(String... args) {
-    converter.convert(Arrays.asList(args)).sort()
+    converter.convert(Arrays.asList(args), new HashMap<String, String>()).sort()
   }
 
   def "parses project properties args"() {
diff --git a/subprojects/cli/src/test/groovy/org/gradle/cli/SystemPropertiesCommandLineConverterTest.groovy b/subprojects/cli/src/test/groovy/org/gradle/cli/SystemPropertiesCommandLineConverterTest.groovy
index 595e168befe4..44491a105bc9 100644
--- a/subprojects/cli/src/test/groovy/org/gradle/cli/SystemPropertiesCommandLineConverterTest.groovy
+++ b/subprojects/cli/src/test/groovy/org/gradle/cli/SystemPropertiesCommandLineConverterTest.groovy
@@ -22,7 +22,7 @@ class SystemPropertiesCommandLineConverterTest extends Specification {
     def converter = new SystemPropertiesCommandLineConverter();
 
     def convert(String... args) {
-        converter.convert(Arrays.asList(args)).sort()
+        converter.convert(Arrays.asList(args), new HashMap<String, String>()).sort()
     }
 
     def "parses system properties args"() {
diff --git a/subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/CodeQualityPluginIntegrationTest.groovy b/subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/CodeQualityPluginIntegrationTest.groovy
deleted file mode 100644
index 265fd0f0d80b..000000000000
--- a/subprojects/code-quality/src/integTest/groovy/org/gradle/api/plugins/quality/CodeQualityPluginIntegrationTest.groovy
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.plugins.quality
-
-import org.gradle.integtests.fixtures.AbstractIntegrationTest
-import org.gradle.integtests.fixtures.executer.ExecutionFailure
-import org.gradle.test.fixtures.file.TestFile
-import org.hamcrest.Matcher
-import org.junit.Test
-
-import static org.gradle.util.Matchers.containsLine
-import static org.hamcrest.Matchers.*
-
-class CodeQualityPluginIntegrationTest extends AbstractIntegrationTest {
-    {
-        // code-quality plugin is deprecated
-        executer.withDeprecationChecksDisabled()
-    }
-
-    @Test
-    public void handlesEmptyProjects() {
-        testFile('build.gradle') << '''
-apply plugin: 'groovy'
-apply plugin: 'java'
-apply plugin: 'code-quality'
-repositories { mavenCentral() }
-dependencies { compile localGroovy() }
-'''
-        inTestDirectory().withTasks('check').run()
-    }
-
-    @Test
-    public void generatesReportForJavaSource() {
-        testFile('build.gradle') << '''
-apply plugin: 'java'
-apply plugin: 'code-quality'
-repositories { mavenCentral() }
-'''
-        writeCheckstyleConfig()
-
-        testFile('src/main/java/org/gradle/Class1.java') << 'package org.gradle; class Class1 { }'
-        testFile('src/test/java/org/gradle/TestClass1.java') << 'package org.gradle; class TestClass1 { }'
-
-        inTestDirectory().withTasks('check').run()
-
-        testFile('build/checkstyle/main.xml').assertContents(containsClass('org.gradle.Class1'))
-        testFile('build/checkstyle/test.xml').assertContents(containsClass('org.gradle.TestClass1'))
-    }
-
-    @Test
-    public void generatesReportForJavaSourceInGroovySourceDirs() {
-        testFile('build.gradle') << '''
-apply plugin: 'groovy'
-apply plugin: 'code-quality'
-repositories { mavenCentral() }
-dependencies { compile localGroovy() }
-'''
-        writeCheckstyleConfig()
-
-        testFile('src/main/groovy/org/gradle/Class1.java') << 'package org.gradle; class Class1 { }'
-        testFile('src/test/groovy/org/gradle/TestClass1.java') << 'package org.gradle; class TestClass1 { }'
-
-        inTestDirectory().withTasks('check').run()
-
-        testFile('build/checkstyle/main.xml').assertContents(containsClass('org.gradle.Class1'))
-        testFile('build/checkstyle/test.xml').assertContents(containsClass('org.gradle.TestClass1'))
-    }
-
-    private Matcher<String> containsClass(String classname) {
-        return containsLine(containsString(classname.replace('.', File.separator) + '.java'))
-    }
-
-    @Test
-    public void checkstyleOnlyChecksJavaSource() {
-        testFile('build.gradle') << '''
-apply plugin: 'groovy'
-apply plugin: 'code-quality'
-repositories { mavenCentral() }
-dependencies { compile localGroovy() }
-'''
-        writeCheckstyleConfig()
-
-        testFile('src/main/groovy/org/gradle/Class1.java') << 'package org.gradle; class Class1 { }'
-        testFile('src/main/groovy/org/gradle/Class2.java') << 'package org.gradle; class Class2 { }'
-        testFile('src/main/groovy/org/gradle/class3.groovy') << 'package org.gradle; class class3 { }'
-
-        inTestDirectory().withTasks('checkstyleMain').run()
-
-        testFile('build/checkstyle/main.xml').assertExists()
-        testFile('build/checkstyle/main.xml').assertContents(not(containsClass('org.gradle.class3')))
-    }
-
-    @Test
-    public void checkstyleViolationBreaksBuild() {
-        testFile('build.gradle') << '''
-apply plugin: 'groovy'
-apply plugin: 'code-quality'
-repositories { mavenCentral() }
-dependencies { compile localGroovy() }
-'''
-        writeCheckstyleConfig()
-
-        testFile('src/main/java/org/gradle/class1.java') << 'package org.gradle; class class1 { }'
-        testFile('src/main/groovy/org/gradle/class2.java') << 'package org.gradle; class class2 { }'
-
-        ExecutionFailure failure = inTestDirectory().withTasks('check').runWithFailure()
-        failure.assertHasDescription('Execution failed for task \':checkstyleMain\'.')
-        failure.assertThatCause(startsWith('Checkstyle rule violations were found. See the report at'))
-
-        testFile('build/checkstyle/main.xml').assertExists()
-    }
-
-    @Test
-    public void generatesReportForGroovySource() {
-        testFile('build.gradle') << '''
-apply plugin: 'groovy'
-apply plugin: 'code-quality'
-repositories { mavenCentral() }
-dependencies { compile localGroovy() }
-'''
-        writeCodeNarcConfigFile()
-
-        testFile('src/main/groovy/org/gradle/Class1.groovy') << 'package org.gradle; class Class1 { }'
-        testFile('src/test/groovy/org/gradle/TestClass1.groovy') << 'package org.gradle; class TestClass1 { }'
-
-        inTestDirectory().withTasks('check').run()
-
-        testFile('build/reports/codenarc/main.html').assertExists()
-        testFile('build/reports/codenarc/test.html').assertExists()
-    }
-
-    @Test
-    public void codeNarcOnlyChecksGroovySource() {
-        testFile('build.gradle') << '''
-apply plugin: 'groovy'
-apply plugin: 'code-quality'
-repositories { mavenCentral() }
-dependencies { compile localGroovy() }
-'''
-
-        writeCodeNarcConfigFile()
-
-        testFile('src/main/groovy/org/gradle/class1.java') << 'package org.gradle; class class1 { }'
-        testFile('src/main/groovy/org/gradle/Class2.groovy') << 'package org.gradle; class Class2 { }'
-
-        inTestDirectory().withTasks('codenarcMain').run()
-
-        testFile('build/reports/codenarc/main.html').assertExists()
-    }
-
-    @Test
-    public void codeNarcViolationBreaksBuild() {
-        testFile('build.gradle') << '''
-apply plugin: 'groovy'
-apply plugin: 'code-quality'
-repositories { mavenCentral() }
-dependencies { compile localGroovy() }
-'''
-
-        writeCodeNarcConfigFile()
-
-        testFile('src/main/groovy/org/gradle/class1.groovy') << 'package org.gradle; class class1 { }'
-
-        ExecutionFailure failure = inTestDirectory().withTasks('check').runWithFailure()
-        failure.assertHasDescription('Execution failed for task \':codenarcMain\'.')
-        failure.assertThatCause(startsWith('CodeNarc rule violations were found. See the report at:'))
-
-        testFile('build/reports/codenarc/main.html').assertExists()
-    }
-
-    private TestFile writeCheckstyleConfig() {
-        return testFile('config/checkstyle/checkstyle.xml') << '''
-<!DOCTYPE module PUBLIC
-        "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-        "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<module name="Checker">
-    <module name="TreeWalker">
-        <module name="TypeName"/>
-    </module>
-</module>'''
-    }
-
-    private TestFile writeCodeNarcConfigFile() {
-        return testFile('config/codenarc/codenarc.xml') << '''
-<ruleset xmlns="http://codenarc.org/ruleset/1.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://codenarc.org/ruleset/1.0 http://codenarc.org/ruleset-schema.xsd"
-        xsi:noNamespaceSchemaLocation="http://codenarc.org/ruleset-schema.xsd">
-    <ruleset-ref path='rulesets/naming.xml'/>
-</ruleset>
-'''
-    }
-
-}
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy
index d385a9369ada..a7a71d9172f0 100644
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy
+++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Checkstyle.groovy
@@ -23,7 +23,6 @@ import org.gradle.api.reporting.Reporting
 import org.gradle.api.tasks.*
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.logging.ConsoleRenderer
-import org.gradle.util.DeprecationLogger
 
 import javax.inject.Inject
 
@@ -57,39 +56,21 @@ class Checkstyle extends SourceTask implements VerificationTask, Reporting<Check
     @Optional
     Map<String, Object> configProperties = [:]
 
-    /**
-     * The properties available for use in the configuration file. These are substituted into the configuration
-     * file.
-     *
-     * @deprecated renamed to <tt>configProperties</tt>
-     */
-    @Deprecated
-    Map<String, Object> getProperties() {
-        DeprecationLogger.nagUserOfReplacedProperty("Checkstyle.properties", "configProperties")
-        getConfigProperties()
-    }
-
-    /**
-     * The properties available for use in the configuration file. These are substituted into the configuration
-     * file.
-     *
-     * @deprecated renamed to <tt>configProperties</tt>
-     */
-    @Deprecated
-    void setProperties(Map<String, Object> properties) {
-        DeprecationLogger.nagUserOfReplacedProperty("Checkstyle.properties", "configProperties")
-        setConfigProperties(properties)
-    }
-
     @Nested
     private final CheckstyleReportsImpl reports
 
-    private final IsolatedAntBuilder antBuilder
+    Checkstyle() {
+        reports = instantiator.newInstance(CheckstyleReportsImpl, this)
+    }
 
     @Inject
-    Checkstyle(Instantiator instantiator, IsolatedAntBuilder antBuilder) {
-        this.antBuilder = antBuilder
-        reports = instantiator.newInstance(CheckstyleReportsImpl, this)
+    Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    IsolatedAntBuilder getAntBuilder() {
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -123,26 +104,6 @@ class Checkstyle extends SourceTask implements VerificationTask, Reporting<Check
         reports.configure(closure)
     }
 
-    /**
-     * Returns the destination file for the XML report.
-     *
-     * @deprecated Use {@code reports.xml.destination} instead.
-     */
-    @Deprecated
-    File getResultFile() {
-        DeprecationLogger.nagUserOfReplacedProperty("Checkstyle.resultFile", "reports.xml.destination")
-        return reports.xml.destination
-    }
-
-    /**
-     * @deprecated Use {@code reports.xml.destination} instead.
-     */
-    @Deprecated
-    void setResultFile(File file) {
-        DeprecationLogger.nagUserOfReplacedProperty("Checkstyle.resultFile", "reports.xml.destination")
-        reports.xml.destination = file
-    }
-
     /**
      * Whether or not this task will ignore failures and continue running the build.
      */
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy
index 60d26e0532e9..930265a39111 100644
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy
+++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeNarc.groovy
@@ -25,7 +25,6 @@ import org.gradle.api.reporting.Reporting
 import org.gradle.api.tasks.*
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.logging.ConsoleRenderer
-import org.gradle.util.DeprecationLogger
 
 import javax.inject.Inject
 
@@ -63,62 +62,26 @@ class CodeNarc extends SourceTask implements VerificationTask, Reporting<CodeNar
     @Input
     int maxPriority3Violations
 
-    /**
-     * The format type of the CodeNarc report.
-     *
-     * @deprecated Use {@code reports.<report-type>.enabled} instead.
-     */
-    @Deprecated
-    String getReportFormat() {
-        DeprecationLogger.nagUserOfReplacedProperty("CodeNarc.reportFormat", "reports.<report-type>.enabled")
-        reports.firstEnabled?.name
-    }
-
-    /**
-     * @deprecated Use {@code reports.<report-type>.enabled} instead.
-     */
-    @Deprecated
-    void setReportFormat(String reportFormat) {
-        DeprecationLogger.nagUserOfReplacedProperty("CodeNarc.reportFormat", "reports.<report-type>.enabled")
-        reports.each {
-            it.enabled == it.name == reportFormat
-        }
-    }
-
-    /**
-     * The file to write the report to.
-     *
-     * @deprecated Use {@code reports.<report-type>.destination} instead.
-     */
-    @Deprecated
-    File getReportFile() {
-        DeprecationLogger.nagUserOfReplacedProperty("CodeNarc.reportFile", "reports.<report-type>.destination")
-        reports.firstEnabled?.destination
-    }
-
-    /**
-     * @deprecated Use {@code reports.<report-type>.destination} instead.
-     */
-    @Deprecated
-    void setReportFile(File reportFile) {
-        DeprecationLogger.nagUserOfReplacedProperty("CodeNarc.reportFile", "reports.<report-type>.destination")
-        reports.firstEnabled?.destination = reportFile
-    }
-
     @Nested
     private final CodeNarcReportsImpl reports
 
-    private final IsolatedAntBuilder antBuilder
-
     /**
      * Whether or not the build should break when the verifications performed by this task fail.
      */
     boolean ignoreFailures
 
-    @Inject
-    CodeNarc(Instantiator instantiator, IsolatedAntBuilder antBuilder) {
+    CodeNarc() {
         reports = instantiator.newInstance(CodeNarcReportsImpl, this)
-        this.antBuilder = antBuilder
+    }
+
+    @Inject
+    Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    IsolatedAntBuilder getAntBuilder() {
+        throw new UnsupportedOperationException();
     }
 
     @TaskAction
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeQualityPlugin.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeQualityPlugin.groovy
deleted file mode 100644
index 1e7cb8051294..000000000000
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/CodeQualityPlugin.groovy
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.plugins.quality
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.ReportingBasePlugin
-import org.gradle.util.DeprecationLogger
-
-/**
- * A plugin which measures and enforces code quality for Java and Groovy projects.
- *
- * @deprecated use {@link CheckstylePlugin} and {@link CodeNarcPlugin} instead
- */
-@Deprecated
-public class CodeQualityPlugin implements Plugin<Project> {
-    private Project project
-
-    static final String CHECKSTYLE_MAIN_TASK = "checkstyleMain"
-    static final String CHECKSTYLE_TEST_TASK = "checkstyleTest"
-    static final String CODE_NARC_MAIN_TASK = "codenarcMain"
-    static final String CODE_NARC_TEST_TASK = "codenarcTest"
-
-    void apply(Project project) {
-        DeprecationLogger.nagUserOfReplacedPlugin('code-quality', 'checkstyle or codenarc')
-
-        this.project = project
-
-        project.plugins.apply(ReportingBasePlugin)
-        configureCheckstyle()
-        configureCodeNarc()
-    }
-
-    private void configureCheckstyle() {
-        def javaPluginConvention = new JavaCodeQualityPluginConvention(project)
-        project.convention.plugins.javaCodeQuality = javaPluginConvention
-
-        project.plugins.apply(CheckstylePlugin)
-        project.checkstyle.conventionMapping.with {
-            configFile = { javaPluginConvention.checkstyleConfigFile }
-            configProperties = { javaPluginConvention.checkstyleProperties }
-            reportsDir = { javaPluginConvention.checkstyleResultsDir }
-        }
-    }
-
-    private void configureCodeNarc() {
-        def groovyPluginConvention = new GroovyCodeQualityPluginConvention(project)
-        project.convention.plugins.groovyCodeQuality = groovyPluginConvention
-
-        project.plugins.apply(CodeNarcPlugin)
-        project.codenarc.conventionMapping.with {
-            configFile = { groovyPluginConvention.codeNarcConfigFile }
-            reportFormat = { groovyPluginConvention.codeNarcReportsFormat }
-            reportsDir = { groovyPluginConvention.codeNarcReportsDir }
-        }
-    }
-}
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugs.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugs.groovy
index 4e7083ee8e79..f9489bce34f0 100644
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugs.groovy
+++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/FindBugs.groovy
@@ -129,12 +129,18 @@ class FindBugs extends SourceTask implements VerificationTask, Reporting<FindBug
     @Nested
     private final FindBugsReportsImpl reports
 
-    private final Factory<WorkerProcessBuilder> workerFactory
+    FindBugs() {
+        reports = instantiator.newInstance(FindBugsReportsImpl, this)
+    }
 
     @Inject
-    FindBugs(Instantiator instantiator, Factory<WorkerProcessBuilder> workerFactory) {
-        reports = instantiator.newInstance(FindBugsReportsImpl, this)
-        this.workerFactory = workerFactory
+    Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    Factory<WorkerProcessBuilder> getWorkerProcessBuilderFactory() {
+        throw new UnsupportedOperationException();
     }
 
     /**
@@ -176,7 +182,7 @@ class FindBugs extends SourceTask implements VerificationTask, Reporting<FindBug
         logging.captureStandardOutput(LogLevel.DEBUG)
         logging.captureStandardError(LogLevel.DEBUG)
 
-        FindBugsResult result = manager.runWorker(getProject().getProjectDir(), workerFactory, getFindbugsClasspath(), spec)
+        FindBugsResult result = manager.runWorker(getProject().getProjectDir(), workerProcessBuilderFactory, getFindbugsClasspath(), spec)
         evaluateResult(result);
     }
 
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/GroovyCodeQualityPluginConvention.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/GroovyCodeQualityPluginConvention.groovy
deleted file mode 100644
index ddc705e3e126..000000000000
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/GroovyCodeQualityPluginConvention.groovy
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.plugins.quality
-
-import org.gradle.api.Project
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.api.reporting.ReportingExtension
-
-class GroovyCodeQualityPluginConvention {
-    /**
-     * The name of the CodeNarc configuration file, relative to the project directory.
-     */
-    String codeNarcConfigFileName
-
-    /**
-     * The output format of the generated CodeNarc report.
-     */
-    String codeNarcReportsFormat
-
-    /**
-     * The name of the directory to write CodeNarc reports into.
-     */
-    String codeNarcReportsDirName
-
-    private final ProjectInternal project
-
-    def GroovyCodeQualityPluginConvention(Project project) {
-        this.project = project
-        codeNarcConfigFileName = 'config/codenarc/codenarc.xml'
-        codeNarcReportsFormat = "html"
-        codeNarcReportsDirName = 'codenarc'
-    }
-
-    /**
-     * The CodeNarc configuration file.
-     */
-    File getCodeNarcConfigFile() {
-        project.file(codeNarcConfigFileName)
-    }
-
-    /**
-     * The directory to write CodeNarc reports into.
-     */
-    File getCodeNarcReportsDir() {
-        project.extensions.getByType(ReportingExtension).file(codeNarcReportsDirName)
-    }
-}
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDepend.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDepend.groovy
index b493c449b76e..bc6ccb48be42 100644
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDepend.groovy
+++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JDepend.groovy
@@ -54,12 +54,18 @@ class JDepend extends DefaultTask implements Reporting<JDependReports> {
     @Nested
     private final JDependReportsImpl reports
 
-    private final IsolatedAntBuilder antBuilder
+    JDepend() {
+        reports = instantiator.newInstance(JDependReportsImpl, this)
+    }
 
     @Inject
-    JDepend(Instantiator instantiator, IsolatedAntBuilder antBuilder) {
-        this.antBuilder = antBuilder
-        reports = instantiator.newInstance(JDependReportsImpl, this)
+    Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    IsolatedAntBuilder getAntBuilder() {
+        throw new UnsupportedOperationException();
     }
 
     /**
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JavaCodeQualityPluginConvention.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JavaCodeQualityPluginConvention.groovy
deleted file mode 100644
index 2bc63d9a9c9b..000000000000
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/JavaCodeQualityPluginConvention.groovy
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.plugins.quality
-
-import org.gradle.api.Project
-import org.gradle.api.internal.file.FileLookup
-import org.gradle.api.internal.project.ProjectInternal
-
-class JavaCodeQualityPluginConvention {
-
-    /**
-     * The name of the Checkstyle configuration file, relative to the project directory.
-     */
-    String checkstyleConfigFileName
-
-    /**
-     * The name of the directory to write Checkstyle results to, relative to the build directory.
-     */
-    String checkstyleResultsDirName
-
-    /**
-     * The set of properties to substitute into the Checkstyle configuration file.
-     */
-    Map<String, Object> checkstyleProperties = [:]
-
-    private ProjectInternal project
-
-    def JavaCodeQualityPluginConvention(Project project) {
-        this.project = project
-        checkstyleConfigFileName = 'config/checkstyle/checkstyle.xml'
-        checkstyleResultsDirName = 'checkstyle'
-    }
-
-    /**
-     * The Checkstyle configuration file.
-     */
-    File getCheckstyleConfigFile() {
-        project.file(checkstyleConfigFileName)
-    }
-
-    /**
-     * The directory to write the Checkstyle results into.
-     */
-    File getCheckstyleResultsDir() {
-        project.services.get(FileLookup).getFileResolver(project.buildDir).resolve(checkstyleResultsDirName)
-    }
-}
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Pmd.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Pmd.groovy
index 02e545c72124..60cfd8764d54 100644
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Pmd.groovy
+++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/Pmd.groovy
@@ -65,8 +65,6 @@ class Pmd extends SourceTask implements VerificationTask, Reporting<PmdReports>
     @Nested
     private final PmdReportsImpl reports
 
-    private final IsolatedAntBuilder antBuilder
-
     /**
      * Whether or not to allow the build to continue if there are warnings.
      *
@@ -74,9 +72,18 @@ class Pmd extends SourceTask implements VerificationTask, Reporting<PmdReports>
      */
     boolean ignoreFailures
 
-    @Inject Pmd(Instantiator instantiator, IsolatedAntBuilder antBuilder) {
+    Pmd() {
         reports = instantiator.newInstance(PmdReportsImpl, this)
-        this.antBuilder = antBuilder
+    }
+
+    @Inject
+    Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    IsolatedAntBuilder getAntBuilder() {
+        throw new UnsupportedOperationException();
     }
 
     @TaskAction
diff --git a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/PmdPlugin.groovy b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/PmdPlugin.groovy
index da23b35f2d1a..a6e6d50ece6c 100644
--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/PmdPlugin.groovy
+++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/PmdPlugin.groovy
@@ -78,7 +78,7 @@ class PmdPlugin extends AbstractCodeQualityPlugin<Pmd> {
         config.incoming.beforeResolve {
             if (config.dependencies.empty) {
                 VersionNumber version = VersionNumber.parse(extension.toolVersion)
-                String dependency = (version < VersionNumber.parse("5.0.0"))?
+                String dependency = (version < VersionNumber.version(5))?
                     "pmd:pmd:$extension.toolVersion" : "net.sourceforge.pmd:pmd:$extension.toolVersion"
                 config.dependencies.add(project.dependencies.create(dependency))
             }
diff --git a/subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/code-quality.properties b/subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/code-quality.properties
deleted file mode 100755
index d23cb610f44d..000000000000
--- a/subprojects/code-quality/src/main/resources/META-INF/gradle-plugins/code-quality.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=org.gradle.api.plugins.quality.CodeQualityPlugin
diff --git a/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CheckstylePluginTest.groovy b/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CheckstylePluginTest.groovy
index d3afb34705f4..bef2e30ee395 100644
--- a/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CheckstylePluginTest.groovy
+++ b/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CheckstylePluginTest.groovy
@@ -81,7 +81,7 @@ class CheckstylePluginTest extends Specification {
             assert classpath == sourceSet.output
             assert configFile == project.file("config/checkstyle/checkstyle.xml")
             assert configProperties == [:]
-            assert resultFile == project.file("build/reports/checkstyle/${sourceSet.name}.xml")
+            assert reports.xml.destination == project.file("build/reports/checkstyle/${sourceSet.name}.xml")
             assert !ignoreFailures
             assert showViolations
         }
@@ -96,7 +96,7 @@ class CheckstylePluginTest extends Specification {
         task.checkstyleClasspath == project.configurations.checkstyle
         task.configFile == project.file("config/checkstyle/checkstyle.xml")
         task.configProperties == [:]
-        task.resultFile == project.file("build/reports/checkstyle/custom.xml")
+        task.reports.xml.destination == project.file("build/reports/checkstyle/custom.xml")
         !task.ignoreFailures
     }
 
@@ -146,7 +146,7 @@ class CheckstylePluginTest extends Specification {
             assert checkstyleClasspath == project.configurations["checkstyle"]
             assert configFile == project.file("checkstyle-config")
             assert configProperties == [foo: "foo"]
-            assert resultFile == project.file("checkstyle-reports/${sourceSet.name}.xml")
+            assert reports.xml.destination == project.file("checkstyle-reports/${sourceSet.name}.xml")
             assert ignoreFailures
             assert showViolations
         }
@@ -167,7 +167,7 @@ class CheckstylePluginTest extends Specification {
         task.checkstyleClasspath == project.configurations.checkstyle
         task.configFile == project.file("checkstyle-config")
         task.configProperties == [foo: "foo"]
-        task.resultFile == project.file("checkstyle-reports/custom.xml")
+        task.reports.xml.destination == project.file("checkstyle-reports/custom.xml")
         task.ignoreFailures
     }
     
diff --git a/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeNarcPluginTest.groovy b/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeNarcPluginTest.groovy
index 181a965021f5..fc3df61ea89b 100644
--- a/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeNarcPluginTest.groovy
+++ b/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeNarcPluginTest.groovy
@@ -85,8 +85,8 @@ class CodeNarcPluginTest extends Specification {
             assert maxPriority1Violations == 0
             assert maxPriority2Violations == 0
             assert maxPriority3Violations == 0
-            assert reportFormat == "html"
-            assert reportFile == project.file("build/reports/codenarc/${sourceSet.name}.html")
+            assert reports.enabled*.name == ["html"]
+            assert reports.html.destination == project.file("build/reports/codenarc/${sourceSet.name}.html")
             assert ignoreFailures == false
         }
     }
@@ -127,8 +127,8 @@ class CodeNarcPluginTest extends Specification {
             assert maxPriority1Violations == 10
             assert maxPriority2Violations == 50
             assert maxPriority3Violations == 200
-            assert reportFormat == "xml"
-            assert reportFile == project.file("codenarc-reports/${sourceSet.name}.xml")
+            assert reports.enabled*.name == ["xml"]
+            assert reports.xml.destination == project.file("codenarc-reports/${sourceSet.name}.xml")
             assert ignoreFailures == true
         }
     }
@@ -144,8 +144,8 @@ class CodeNarcPluginTest extends Specification {
         task.maxPriority1Violations == 0
         task.maxPriority2Violations == 0
         task.maxPriority3Violations == 0
-        task.reportFormat == "html"
-        task.reportFile == project.file("build/reports/codenarc/custom.html")
+        task.reports.enabled*.name == ["html"]
+        task.reports.html.destination == project.file("build/reports/codenarc/custom.html")
         task.ignoreFailures == false
     }
 
@@ -170,8 +170,8 @@ class CodeNarcPluginTest extends Specification {
         task.maxPriority1Violations == 10
         task.maxPriority2Violations == 50
         task.maxPriority3Violations == 200
-        task.reportFormat == "xml"
-        task.reportFile == project.file("codenarc-reports/custom.xml")
+        task.reports.enabled*.name == ["xml"]
+        task.reports.xml.destination == project.file("codenarc-reports/custom.xml")
         task.ignoreFailures == true
     }
     
diff --git a/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeQualityPluginTest.groovy b/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeQualityPluginTest.groovy
deleted file mode 100644
index 274d893b3ead..000000000000
--- a/subprojects/code-quality/src/test/groovy/org/gradle/api/plugins/quality/CodeQualityPluginTest.groovy
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.plugins.quality
-
-import org.gradle.api.Project
-import org.gradle.api.plugins.GroovyPlugin
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.plugins.ReportingBasePlugin
-import org.gradle.api.tasks.TaskDependencyMatchers
-import org.gradle.util.TestUtil
-import org.junit.Test
-import static org.gradle.util.Matchers.*
-import static org.hamcrest.Matchers.*
-import static org.junit.Assert.*
-import org.gradle.api.plugins.JavaBasePlugin
-import org.gradle.api.plugins.GroovyBasePlugin
-
-class CodeQualityPluginTest {
-    private final Project project = TestUtil.createRootProject()
-    private final CodeQualityPlugin plugin = new CodeQualityPlugin()
-
-    @Test public void appliesCheckstyleAndCodeNarcPlugins() {
-        plugin.apply(project)
-
-        assertTrue(project.plugins.hasPlugin(ReportingBasePlugin))
-        assertTrue(project.plugins.hasPlugin(CheckstylePlugin))
-        assertTrue(project.plugins.hasPlugin(CodeNarcPlugin))
-        assertFalse(project.plugins.hasPlugin(JavaBasePlugin))
-        assertFalse(project.plugins.hasPlugin(GroovyBasePlugin))
-    }
-
-    @Test public void addsConventionObjectsToProject() {
-        plugin.apply(project)
-
-        assertThat(project.convention.plugins.javaCodeQuality, instanceOf(JavaCodeQualityPluginConvention))
-        assertThat(project.checkstyleProperties, equalTo([:]))
-        assertThat(project.checkstyleConfigFile, equalTo(project.file("config/checkstyle/checkstyle.xml")))
-        assertThat(project.file("build/checkstyle"), equalTo(project.checkstyleResultsDir))
-
-        assertThat(project.convention.plugins.groovyCodeQuality, instanceOf(GroovyCodeQualityPluginConvention))
-        assertThat(project.codeNarcConfigFile, equalTo(project.file("config/codenarc/codenarc.xml")))
-        assertThat(project.codeNarcReportsDir, equalTo(project.file("build/reports/codenarc")))
-    }
-
-    @Test public void createsTasksAndAppliesMappingsForEachJavaSourceSet() {
-        plugin.apply(project)
-
-        project.plugins.apply(JavaPlugin)
-        project.checkstyleProperties.someProp = 'someValue'
-
-        def task = project.tasks[CodeQualityPlugin.CHECKSTYLE_MAIN_TASK]
-        assertThat(task, instanceOf(Checkstyle))
-        assertThat(task.source as List, equalTo(project.sourceSets.main.allJava as List))
-        assertThat(task.checkstyleClasspath, equalTo(project.configurations.checkstyle))
-        assertThat(task.configFile, equalTo(project.checkstyleConfigFile))
-        assertThat(task.resultFile, equalTo(project.file("build/checkstyle/main.xml")))
-        assertThat(task.configProperties, equalTo(project.checkstyleProperties))
-        assertThat(task, TaskDependencyMatchers.dependsOn(JavaPlugin.CLASSES_TASK_NAME))
-
-        task = project.tasks[CodeQualityPlugin.CHECKSTYLE_TEST_TASK]
-        assertThat(task, instanceOf(Checkstyle))
-        assertThat(task.source as List, equalTo(project.sourceSets.test.allJava as List))
-        assertThat(task.checkstyleClasspath, equalTo(project.configurations.checkstyle))
-        assertThat(task.configFile, equalTo(project.checkstyleConfigFile))
-        assertThat(task.resultFile, equalTo(project.file("build/checkstyle/test.xml")))
-        assertThat(task.properties, equalTo(project.checkstyleProperties))
-        assertThat(task, TaskDependencyMatchers.dependsOn(JavaPlugin.TEST_CLASSES_TASK_NAME))
-
-        project.sourceSets.create('custom')
-        task = project.tasks['checkstyleCustom']
-        assertThat(task, instanceOf(Checkstyle))
-        assertThat(task.source as List, equalTo(project.sourceSets.custom.allJava as List))
-        assertThat(task.checkstyleClasspath, equalTo(project.configurations.checkstyle))
-        assertThat(task.configFile, equalTo(project.checkstyleConfigFile))
-        assertThat(task.resultFile, equalTo(project.file("build/checkstyle/custom.xml")))
-        assertThat(task.properties, equalTo(project.checkstyleProperties))
-        assertThat(task, TaskDependencyMatchers.dependsOn("customClasses"))
-
-        task = project.tasks[JavaBasePlugin.CHECK_TASK_NAME]
-        assertThat(task, TaskDependencyMatchers.dependsOn(hasItems(CodeQualityPlugin.CHECKSTYLE_MAIN_TASK, CodeQualityPlugin.CHECKSTYLE_TEST_TASK, 'checkstyleCustom')))
-    }
-
-    @Test public void createsTasksAndAppliesMappingsForEachGroovySourceSet() {
-        plugin.apply(project)
-
-        project.plugins.apply(GroovyPlugin)
-
-        def task = project.tasks[CodeQualityPlugin.CODE_NARC_MAIN_TASK]
-        assertThat(task, instanceOf(CodeNarc))
-        assertThat(task.source as List, equalTo(project.sourceSets.main.allGroovy as List))
-        assertThat(task.codenarcClasspath, equalTo(project.configurations.codenarc))
-        assertThat(task.configFile, equalTo(project.codeNarcConfigFile))
-        assertThat(task.reportFile, equalTo(project.file("build/reports/codenarc/main.html")))
-        assertThat(task, TaskDependencyMatchers.dependsOn())
-
-        task = project.tasks[CodeQualityPlugin.CODE_NARC_TEST_TASK]
-        assertThat(task, instanceOf(CodeNarc))
-        assertThat(task.source as List, equalTo(project.sourceSets.test.allGroovy as List))
-        assertThat(task.codenarcClasspath, equalTo(project.configurations.codenarc))
-        assertThat(task.configFile, equalTo(project.codeNarcConfigFile))
-        assertThat(task.reportFormat, equalTo(project.codeNarcReportsFormat))
-        assertThat(task.reportFile, equalTo(project.file("build/reports/codenarc/test.html")))
-        assertThat(task, TaskDependencyMatchers.dependsOn())
-
-        project.sourceSets.create('custom')
-        task = project.tasks['codenarcCustom']
-        assertThat(task, instanceOf(CodeNarc))
-        assertThat(task.source as List, equalTo(project.sourceSets.custom.allGroovy as List))
-        assertThat(task.codenarcClasspath, equalTo(project.configurations.codenarc))
-        assertThat(task.configFile, equalTo(project.codeNarcConfigFile))
-        assertThat(task.reportFormat, equalTo(project.codeNarcReportsFormat))
-        assertThat(task.reportFile, equalTo(project.file("build/reports/codenarc/custom.html")))
-        assertThat(task, TaskDependencyMatchers.dependsOn())
-
-        task = project.tasks[JavaBasePlugin.CHECK_TASK_NAME]
-        assertThat(task, TaskDependencyMatchers.dependsOn(hasItem(CodeQualityPlugin.CODE_NARC_MAIN_TASK)))
-        assertThat(task, TaskDependencyMatchers.dependsOn(hasItem(CodeQualityPlugin.CODE_NARC_TEST_TASK)))
-        assertThat(task, TaskDependencyMatchers.dependsOn(hasItem('codenarcCustom')))
-    }
-
-    @Test public void appliesMappingsForCheckstyleTasksWithoutRequiringTheJavaBasePluginToBeApplied() {
-        plugin.apply(project)
-
-        project.checkstyleProperties.someProp = 'someValue'
-
-        def task = project.tasks.create('checkstyleApi', Checkstyle)
-        assertThat(task.source, isEmpty())
-        assertThat(task.checkstyleClasspath, equalTo(project.configurations.checkstyle))
-        assertThat(task.configFile, equalTo(project.checkstyleConfigFile))
-        assertThat(task.resultFile, equalTo(project.file("build/checkstyle/api.xml")))
-        assertThat(task.configProperties, equalTo(project.checkstyleProperties))
-    }
-
-    @Test public void appliesMappingsForCodeNarcTasksWithoutRequiringTheGroovyBasePluginToBeApplied() {
-        plugin.apply(project)
-
-        project.checkstyleProperties.someProp = 'someValue'
-
-        def task = project.tasks.create('codenarcApi', CodeNarc)
-        assertThat(task.source, isEmpty())
-        assertThat(task.codenarcClasspath, equalTo(project.configurations.codenarc))
-        assertThat(task.configFile, equalTo(project.codeNarcConfigFile))
-        assertThat(task.reportFile, equalTo(project.file("build/reports/codenarc/api.html")))
-    }
-
-}
diff --git a/subprojects/core-impl/core-impl.gradle b/subprojects/core-impl/core-impl.gradle
index e66ee48402b1..bd1f055e6bc4 100644
--- a/subprojects/core-impl/core-impl.gradle
+++ b/subprojects/core-impl/core-impl.gradle
@@ -8,15 +8,17 @@ configurations {
 
 dependencies {
     compile project(":core")
+    compile project(":resourcesHttp")
 
-    compile libraries.commons_httpclient
     compile libraries.commons_lang
     compile libraries.commons_io
     compile libraries.ivy
     compile libraries.slf4j_api
     compile libraries.maven_ant_tasks
-    compile libraries.nekohtml
+    compile libraries.jsch
+    compile libraries.gson
     runtime libraries.xbean //maven3 classes dependency
+    runtime "org.bouncycastle:bcprov-jdk15:1.46@jar"
 
     compile fileTree("$buildDir/libs/jarjar") {
         builtBy 'jarJarMaven3'
@@ -27,7 +29,9 @@ dependencies {
     testCompile libraries.groovy
 
     //this dependency is necessary to run IvySFtpResolverIntegrationTest on ibm jdk
-    integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46@jar"
+    //integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46@jar"
+
+    testFixturesCompile project(":internalIntegTesting")
 }
 
 task jarJarMaven3(type: JarJar) {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/CacheResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/CacheResolveIntegrationTest.groovy
index 5a6f02670749..acf8a78a3a43 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/CacheResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/CacheResolveIntegrationTest.groovy
@@ -15,13 +15,11 @@
  */
 package org.gradle.integtests.resolve
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-public class CacheResolveIntegrationTest extends AbstractDependencyResolutionTest {
+public class CacheResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     public void "cache handles manual deletion of cached artifacts"() {
-        server.start()
-
         given:
         def module = ivyHttpRepo.module('group', 'projectA', '1.2').publish()
 
@@ -59,7 +57,6 @@ task deleteCacheFiles(type: Delete) {
     }
 
     public void "cache entries are segregated between different repositories"() {
-        server.start()
         given:
         def repo1 = ivyHttpRepo('ivy-repo-a')
         def module1 = repo1.module('org.gradle', 'testproject', '1.0').publish()
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ClientModuleDependenciesResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ClientModuleDependenciesResolveIntegrationTest.groovy
index f54052b6320c..2352102fb1cc 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ClientModuleDependenciesResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ClientModuleDependenciesResolveIntegrationTest.groovy
@@ -15,26 +15,22 @@
  */
 package org.gradle.integtests.resolve
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
-import org.junit.Test
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-public class ClientModuleDependenciesResolveIntegrationTest extends AbstractDependencyResolutionTest {
-    @Test
+public class ClientModuleDependenciesResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     public void "uses metadata from Client Module and looks up artifact in declared repositories"() {
         given:
         def repo1 = ivyHttpRepo("repo1")
-        def repo2 = ivyHttpRepo("repo2")
+        def repo2 = mavenHttpRepo("repo2")
         def projectAInRepo1 = repo1.module('group', 'projectA', '1.2')
         def projectAInRepo2 = repo2.module('group', 'projectA', '1.2').publish()
         def projectB = repo1.module('group', 'projectB', '1.3').publish()
 
-        server.start()
-
         and:
         buildFile << """
 repositories {
     ivy { url "${repo1.uri}" }
-    ivy { url "${repo2.uri}" }
+    maven { url "${repo2.uri}" }
 }
 configurations { compile }
 dependencies {
@@ -52,8 +48,8 @@ task listJars << {
         projectB.jar.expectGet()
         projectAInRepo1.ivy.expectGetMissing()
         projectAInRepo1.jar.expectHeadMissing()
-        projectAInRepo2.ivy.expectGet()
-        projectAInRepo2.jar.expectGet()
+        projectAInRepo2.pom.expectGet()
+        projectAInRepo2.artifact.expectGet()
 
         then:
         succeeds('listJars')
@@ -64,4 +60,35 @@ task listJars << {
         then:
         succeeds('listJars')
     }
+
+    def "client module dependency ignores published artifact listing and resolves single jar file"() {
+        def projectA = ivyHttpRepo.module('group', 'projectA', '1.2')
+                .artifact()
+                .artifact(classifier: "extra")
+                .publish()
+
+        buildFile << """
+repositories {
+    ivy { url "${ivyHttpRepo.uri}" }
+}
+configurations {
+    regular
+    clientModule
+}
+dependencies {
+    regular "group:projectA:1.2"
+    clientModule module("group:projectA:1.2")
+}
+task listJars << {
+    assert configurations.regular.collect { it.name } == ['projectA-1.2.jar', 'projectA-1.2-extra.jar']
+    assert configurations.clientModule.collect { it.name } == ['projectA-1.2.jar']
+}
+"""
+
+        when:
+        projectA.allowAll()
+
+        then:
+        succeeds('listJars')
+    }
 }
\ No newline at end of file
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesChangingModulesIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesChangingModulesIntegrationTest.groovy
index b319e8274bcc..1c54c53df8ae 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesChangingModulesIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesChangingModulesIntegrationTest.groovy
@@ -16,17 +16,16 @@
 
 package org.gradle.integtests.resolve
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.test.fixtures.HttpRepository
 
-abstract class ComponentMetadataRulesChangingModulesIntegrationTest extends AbstractDependencyResolutionTest {
+abstract class ComponentMetadataRulesChangingModulesIntegrationTest extends AbstractHttpDependencyResolutionTest {
     abstract HttpRepository getRepo()
     abstract String getRepoDeclaration()
 
     def moduleA = getRepo().module('org.test', 'moduleA', '1.0')
 
     def setup() {
-        server.start()
         moduleA.publish()
         moduleA.allowAll()
     }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesIntegrationTest.groovy
index ce5aabd7b9e1..9183b5ec47ca 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesIntegrationTest.groovy
@@ -15,17 +15,15 @@
  */
 package org.gradle.integtests.resolve
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.test.fixtures.HttpRepository
 
-abstract class ComponentMetadataRulesIntegrationTest extends AbstractDependencyResolutionTest {
+abstract class ComponentMetadataRulesIntegrationTest extends AbstractHttpDependencyResolutionTest {
     abstract HttpRepository getRepo()
     abstract String getRepoDeclaration()
     abstract String getDefaultStatus()
 
     def setup() {
-        server.start()
-
         buildFile <<
 """
 $repoDeclaration
@@ -36,9 +34,15 @@ dependencies {
     compile 'org.test:projectA:1.0'
 }
 
-task resolve(type: Sync) {
-    from configurations.compile
-    into 'libs'
+// implement Sync manually to make sure that task is never up-to-date
+task resolve {
+    doLast {
+        delete 'libs'
+        copy {
+            from configurations.compile
+            into 'libs'
+        }
+    }
 }
 """
     }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesStatusIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesStatusIntegrationTest.groovy
index faa5b4924b77..aae872a669e7 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesStatusIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ComponentMetadataRulesStatusIntegrationTest.groovy
@@ -15,17 +15,15 @@
  */
 package org.gradle.integtests.resolve
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.test.fixtures.HttpRepository
 
-abstract class ComponentMetadataRulesStatusIntegrationTest extends AbstractDependencyResolutionTest {
+abstract class ComponentMetadataRulesStatusIntegrationTest extends AbstractHttpDependencyResolutionTest {
     abstract HttpRepository getRepo()
 
     abstract String getRepoDeclaration()
 
     def setup() {
-        server.start()
-
         buildFile <<
 """
 $repoDeclaration
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/FlatDirJvmLibraryArtifactResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/FlatDirJvmLibraryArtifactResolutionIntegrationTest.groovy
index e4fe71ab0d38..f35892878bcd 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/FlatDirJvmLibraryArtifactResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/FlatDirJvmLibraryArtifactResolutionIntegrationTest.groovy
@@ -24,18 +24,13 @@ class FlatDirJvmLibraryArtifactResolutionIntegrationTest extends AbstractDepende
 repositories {
     flatDir { dir 'repo' }
 }
-configurations { compile }
-dependencies {
-    compile "some.group:some-artifact:1.0"
-}
 """
         fixture = new JvmLibraryArtifactResolveTestFixture(buildFile)
     }
 
     def "resolves and does not cache source and javadoc artifacts"() {
         publishModule()
-        fixture.requestingTypes()
-                .expectSourceArtifact("sources")
+        fixture.expectSourceArtifact("sources")
                 .expectJavadocArtifact("javadoc")
                 .prepare()
 
@@ -63,7 +58,7 @@ dependencies {
     def "resolve missing source and javadoc artifacts"() {
         file("repo/some-artifact-1.0.jar").createFile()
 
-        fixture.requestingTypes().prepare()
+        fixture.prepare()
 
         expect:
         succeeds("verify")
@@ -73,8 +68,7 @@ dependencies {
         file("repo/some-artifact-1.0.jar").createFile()
         file("repo/some-artifact-1.0-sources.jar").createFile()
 
-        fixture.requestingTypes()
-                .expectSourceArtifact("sources")
+        fixture.expectSourceArtifact("sources")
                 .prepare()
 
         expect:
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/JvmLibraryArtifactResolveTestFixture.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/JvmLibraryArtifactResolveTestFixture.groovy
index cab646c4af6c..7a654d7c301b 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/JvmLibraryArtifactResolveTestFixture.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/JvmLibraryArtifactResolveTestFixture.groovy
@@ -17,13 +17,16 @@
 package org.gradle.integtests.resolve
 
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier
-import org.gradle.api.artifacts.resolution.JvmLibraryArtifact
+import org.gradle.api.artifacts.result.Artifact
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact
 import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
 import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionNotFoundException
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ArtifactNotFoundException
 import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactIdentifier
 import org.gradle.test.fixtures.file.TestFile
+
 /**
  * A test fixture that injects a task into a build that uses the Artifact Query API to download some artifacts, validating the results.
  */
@@ -48,7 +51,7 @@ class JvmLibraryArtifactResolveTestFixture {
         this
     }
 
-    JvmLibraryArtifactResolveTestFixture requestingTypes(Class<? extends JvmLibraryArtifact>... artifactTypes) {
+    JvmLibraryArtifactResolveTestFixture requestingTypes(Class<? extends Artifact>... artifactTypes) {
         this.artifactTypes = artifactTypes as List
         this
     }
@@ -106,6 +109,14 @@ class JvmLibraryArtifactResolveTestFixture {
      * Injects the appropriate stuff into the build script.
      */
     void prepare() {
+        buildFile << """
+configurations {
+    ${config}
+}
+dependencies {
+    ${config} "${id.group}:${id.module}:${id.version}"
+}
+"""
         if (unresolvedComponentFailure != null) {
             prepareComponentNotFound()
         } else {
@@ -113,57 +124,70 @@ class JvmLibraryArtifactResolveTestFixture {
         }
     }
 
-    void createVerifyTask(def taskName) {
+    void createVerifyTask(String taskName) {
         buildFile << """
 task $taskName << {
-    def deps = configurations.compile.incoming.resolutionResult.allDependencies as List
+    def deps = configurations.${config}.incoming.resolutionResult.allDependencies as List
     assert deps.size() == 1
     def componentId = deps[0].selected.id
 
     def result = dependencies.createArtifactResolutionQuery()
         .forComponents(deps[0].selected.id)
-        .withArtifacts(JvmLibrary$artifactTypesString)
+        .withArtifacts(JvmLibraryComponent, $artifactTypesString)
         .execute()
 
     assert result.components.size() == 1
-    def jvmLibrary = result.components.iterator().next()
-    assert jvmLibrary.id.group == "${id.group}"
-    assert jvmLibrary.id.module == "${id.module}"
-    assert jvmLibrary.id.version == "${id.version}"
-    assert jvmLibrary instanceof JvmLibrary
-
-    def sourceArtifactFiles = []
-    jvmLibrary.sourcesArtifacts.each { artifact ->
-        assert artifact instanceof JvmLibrarySourcesArtifact
-        if (artifact.failure != null) {
-            ${checkException("artifact.failure", expectedSourceFailure)}
+
+    // Check generic component result
+    def componentResult = result.components.iterator().next()
+    assert componentResult.id.displayName == "${id.displayName}"
+    assert componentResult instanceof ResolvedComponentArtifactsResult
+
+    ${checkComponentResultArtifacts("componentResult", "sources", expectedSources, expectedSourceFailure)}
+    ${checkComponentResultArtifacts("componentResult", "javadoc", expectedJavadoc, expectedJavadocFailure)}
+
+    // Check JvmLibraryComponent component type
+    def jvmLibraries = result.getResolvedComponents(JvmLibraryComponent)
+    assert jvmLibraries.size() == 1
+    def jvmLibrary = jvmLibraries.iterator().next()
+    assert componentResult.id == jvmLibrary.id
+
+    ${checkJvmLibraryArtifacts("jvmLibrary", "sources", expectedSources, expectedSourceFailure)}
+    ${checkJvmLibraryArtifacts("jvmLibrary", "javadoc", expectedJavadoc, expectedJavadocFailure)}
+}
+"""
+    }
+
+    private static String checkComponentResultArtifacts(String componentResult, String type, def expectedFiles, def expectedFailure) {
+        """
+    def ${type}ArtifactResultFiles = []
+    ${componentResult}.getArtifacts(${type.capitalize()}Artifact).each { artifactResult ->
+        if (artifactResult instanceof ResolvedArtifactResult) {
+            ${type}ArtifactResultFiles << artifactResult.file.name
         } else {
-            copy {
-                from artifact.file
-                into "sources"
-            }
-            sourceArtifactFiles << artifact.file.name
+            ${checkException("artifactResult.failure", expectedFailure)}
         }
     }
-    assert sourceArtifactFiles as Set == ${toQuotedList(expectedSources)} as Set
+    assert ${type}ArtifactResultFiles as Set == ${toQuotedList(expectedFiles)} as Set
+"""
+    }
 
-    def javadocArtifactFiles = []
-    jvmLibrary.javadocArtifacts.each { artifact ->
-        assert artifact instanceof JvmLibraryJavadocArtifact
+    private static String checkJvmLibraryArtifacts(String jvmLibrary, String type, def expectedFiles, def expectedFailure) {
+        """
+    def ${type}ArtifactFiles = []
+    ${jvmLibrary}.${type}Artifacts.each { artifact ->
+        assert artifact instanceof ${type.capitalize()}Artifact
         if (artifact.failure != null) {
-            ${checkException("artifact.failure", expectedJavadocFailure)}
+            ${checkException("artifact.failure", expectedFailure)}
         } else {
             copy {
                 from artifact.file
-                into "javadoc"
+                into "${type}"
             }
-            javadocArtifactFiles << artifact.file.name
+            ${type}ArtifactFiles << artifact.file.name
         }
     }
-    assert javadocArtifactFiles as Set == ${toQuotedList(expectedJavadoc)} as Set
-
-    assert result.unresolvedComponents.empty
-}
+    assert ${type}ArtifactFiles as Set == ${toQuotedList(expectedFiles)} as Set
 """
     }
 
@@ -171,10 +195,16 @@ task $taskName << {
         if (expected == null) {
             return "throw $reference"
         }
-        return """
+        String check = """
     assert ${reference} instanceof ${expected.class.name}
     assert ${reference}.message == "${expected.message}"
 """
+        if (expected.cause != null) {
+            check += """
+    assert ${reference}.cause.message =~ "${expected.cause.message}"
+"""
+        }
+        return check
     }
 
     private static String toQuotedList(def values) {
@@ -187,28 +217,26 @@ task verify << {
     def unknownComponentId = [getGroup: {'${id.group}'}, getModule: {'${id.module}'}, getVersion: {'${id.version}'}, getDisplayName: {'unknown'}] as ModuleComponentIdentifier
     def result = dependencies.createArtifactResolutionQuery()
         .forComponents(unknownComponentId)
-        .withArtifacts(JvmLibrary$artifactTypesString)
+        .withArtifacts(JvmLibraryComponent, $artifactTypesString)
         .execute()
 
-    assert result.components.empty
-    assert result.unresolvedComponents.size() == 1
-    for (component in result.unresolvedComponents) {
-        assert component.id.group == "${id.group}"
-        assert component.id.module == "${id.module}"
-        assert component.id.version == "${id.version}"
-        assert component.id.displayName == 'unknown'
-        ${checkException("component.failure", unresolvedComponentFailure)}
-    }
+    assert result.components.size() == 1
+    def component = result.components.iterator().next()
+    assert component instanceof UnresolvedComponentResult
+    assert component.id.group == "${id.group}"
+    assert component.id.module == "${id.module}"
+    assert component.id.version == "${id.version}"
+    assert component.id.displayName == 'unknown'
+    ${checkException("component.failure", unresolvedComponentFailure)}
 }
 """
     }
 
     private String getArtifactTypesString() {
-        def artifactTypesString = ""
-        for (Class<? extends JvmLibraryArtifact> type : artifactTypes) {
-            artifactTypesString += ", ${type.simpleName}"
+        if (artifactTypes.empty) {
+            return [SourcesArtifact, JavadocArtifact].collect({it.simpleName}).join(',')
         }
-        return artifactTypesString
+        return artifactTypes.collect({ it.simpleName }).join(',')
     }
 }
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolveTestFixture.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolveTestFixture.groovy
index ff4cc62cba72..80b089db5a51 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolveTestFixture.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ResolveTestFixture.groovy
@@ -81,8 +81,8 @@ allprojects {
         def expectedFiles = graph.artifactNodes.collect { it.fileName }
         assert actualFiles == expectedFiles
 
-        def actualFirstLevel = configDetails.findAll { it.startsWith('first-level:') }.collect { it.substring(12) }
-        def expectedFirstLevel = graph.root.deps.collect { "[${it.selected.moduleVersionId}:default]" }
+        def actualFirstLevel = configDetails.findAll { it.startsWith('first-level:') }.collect { it.substring(12) } as LinkedHashSet
+        def expectedFirstLevel = graph.root.deps.collect { "[${it.selected.moduleVersionId}:default]" } as LinkedHashSet
         assert actualFirstLevel == expectedFirstLevel
 
         def actualRoot = configDetails.find { it.startsWith('root:') }.substring(5)
@@ -161,10 +161,33 @@ allprojects {
             return root
         }
 
-        def node(String id, String moduleVersion) {
+        def node(Map attrs) {
+            def id = "${attrs.group}:${attrs.module}:${attrs.version}"
+            return node(id, id, attrs)
+        }
+
+        def node(String id, String moduleVersionId) {
+            def attrs
+            if (moduleVersionId.matches(':\\w+:')) {
+                def parts = moduleVersionId.split(':')
+                attrs = [group: null, module: parts[1], version:null]
+                moduleVersionId = ":${attrs.module}:unspecified"
+            } else if (moduleVersionId.matches('\\w+:\\w+:')) {
+                def parts = moduleVersionId.split(':')
+                attrs = [group: parts[0], module: parts[1], version: null]
+                moduleVersionId = "${attrs.group}:${attrs.module}:unspecified"
+            } else {
+                def parts = moduleVersionId.split(':')
+                assert parts.length == 3
+                attrs = [group: parts[1], module: parts[1], version: parts[2]]
+            }
+            return node(id, moduleVersionId, attrs)
+        }
+
+        def node(String id, String moduleVersion, Map attrs) {
             def node = nodes[moduleVersion]
             if (!node) {
-                node = new NodeBuilder(id, moduleVersion, this)
+                node = new NodeBuilder(id, moduleVersion, attrs, this)
                 nodes[moduleVersion] = node
             }
             return node
@@ -174,12 +197,17 @@ allprojects {
     public static class EdgeBuilder {
         final String requested
         final NodeBuilder from
-        final NodeBuilder selected
+        NodeBuilder selected
 
         EdgeBuilder(NodeBuilder from, String requested, NodeBuilder selected) {
             this.from = from
-            this.selected = selected
             this.requested = requested
+            this.selected = selected
+        }
+
+        EdgeBuilder selects(Map selectedModule) {
+            selected = from.graph.node(selectedModule)
+            return this
         }
     }
 
@@ -193,33 +221,13 @@ allprojects {
         final String version
         private String reason
 
-        NodeBuilder(String id, String moduleVersionId, GraphBuilder graph) {
+        NodeBuilder(String id, String moduleVersionId, Map attrs, GraphBuilder graph) {
             this.graph = graph
-            if (moduleVersionId.matches(':\\w+:')) {
-                def parts = moduleVersionId.split(':')
-                this.group = null
-                this.module = parts[1]
-                this.version = null
-                this.moduleVersionId = ":${module}:unspecified"
-            } else if (moduleVersionId.matches('\\w+:\\w+:')) {
-                def parts = moduleVersionId.split(':')
-                this.group = parts[0]
-                this.module = parts[1]
-                this.version = null
-                this.moduleVersionId = "${group}:${module}:unspecified"
-            } else {
-                def parts = moduleVersionId.split(':')
-                assert parts.length == 3
-                this.group = parts[0]
-                this.module = parts[1]
-                this.version = parts[2]
-                this.moduleVersionId = moduleVersionId
-            }
-            if (id == moduleVersionId) {
-                this.id = this.moduleVersionId
-            } else {
-                this.id = id
-            }
+            this.group = attrs.group
+            this.module = attrs.module
+            this.version = attrs.version
+            this.moduleVersionId = moduleVersionId
+            this.id = id
         }
 
         private def getReason() {
@@ -266,7 +274,7 @@ allprojects {
         }
 
         /**
-         * Defines a dependency on the given node.
+         * Defines a dependency from the current node to the given node.
          */
         def edge(String requested, String selectedModuleVersionId) {
             def node = graph.node(selectedModuleVersionId, selectedModuleVersionId)
@@ -274,6 +282,15 @@ allprojects {
             return node
         }
 
+        /**
+         * Defines a dependency of the current node.
+         */
+         EdgeBuilder dependency(Map requested) {
+             def edge = new EdgeBuilder(this, "${requested.group}:${requested.module}:${requested.version}", null)
+             deps << edge
+             return edge
+         }
+
         /**
          * Marks that this node was selected due to conflict resolution.
          */
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/VersionConflictResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/VersionConflictResolutionIntegrationTest.groovy
index 29e093833cd6..036b34d0f067 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/VersionConflictResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/VersionConflictResolutionIntegrationTest.groovy
@@ -374,13 +374,7 @@ project(':tool') {
         otherParent.publish()
 
         def module = mavenRepo.module("org", "someArtifact", '1.0')
-        module.parentPomSection = """
-<parent>
-  <groupId>org</groupId>
-  <artifactId>someParent</artifactId>
-  <version>1.0</version>
-</parent>
-"""
+        module.parent("org", "someParent", "1.0")
         module.publish()
 
         buildFile << """
@@ -529,9 +523,9 @@ task checkDeps << {
 
         Scenario:
          - We have batched up conflicts
-         - parent of one conflicted version is also conflicted
-         - conflicted parent is positioned on the conflicts queue after the conflicted child (the order of declaring dependencies matters)
-         - winning parent depends on a child that previously was evicted
+         - root of one conflicted version is also conflicted
+         - conflicted root is positioned on the conflicts queue after the conflicted child (the order of declaring dependencies matters)
+         - winning root depends on a child that previously was evicted
          - finally, the winning child is an unresolved dependency
         */
         mavenRepo.module("org", "c", '1.0').publish()
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/AliasedArtifactResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/AliasedArtifactResolutionIntegrationTest.groovy
index dea3a73b372b..8ebf2b77adef 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/AliasedArtifactResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/AliasedArtifactResolutionIntegrationTest.groovy
@@ -15,18 +15,16 @@
  */
 package org.gradle.integtests.resolve.artifactreuse
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import spock.lang.Ignore
 
-class AliasedArtifactResolutionIntegrationTest extends AbstractDependencyResolutionTest {
+class AliasedArtifactResolutionIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def mavenRepo1 = mavenHttpRepo("maven1")
     def mavenRepo2 = mavenHttpRepo("maven2")
     def ivyRepo1 = ivyHttpRepo("ivy1")
     def ivyRepo2 = ivyHttpRepo("ivy2")
 
     def setup() {
-        server.start()
-
         buildFile << """
             repositories {
                 if (project.hasProperty('mavenRepository1')) {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/CacheReuseCrossVersionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/CacheReuseCrossVersionIntegrationTest.groovy
index e33cf9d47bca..08f36a1b929f 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/CacheReuseCrossVersionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/CacheReuseCrossVersionIntegrationTest.groovy
@@ -17,7 +17,7 @@ package org.gradle.integtests.resolve.artifactreuse
 
 import org.gradle.integtests.fixtures.TargetVersions
 import org.gradle.test.fixtures.maven.MavenFileRepository
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.junit.Rule
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/M3CacheReuseCrossVersionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/M3CacheReuseCrossVersionIntegrationTest.groovy
index 65c13181c2e3..a0087c9486b7 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/M3CacheReuseCrossVersionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/M3CacheReuseCrossVersionIntegrationTest.groovy
@@ -17,7 +17,7 @@ package org.gradle.integtests.resolve.artifactreuse
 
 import org.gradle.integtests.fixtures.CrossVersionIntegrationSpec
 import org.gradle.integtests.fixtures.TargetVersions
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.junit.Rule
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/MavenM2CacheReuseIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/MavenM2CacheReuseIntegrationTest.groovy
index 291946fb5a7f..4d7c79548308 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/MavenM2CacheReuseIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/MavenM2CacheReuseIntegrationTest.groovy
@@ -15,15 +15,14 @@
  */
 package org.gradle.integtests.resolve.artifactreuse
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-class MavenM2CacheReuseIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenM2CacheReuseIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def "uses cached artifacts from maven local cache"() {
         given:
-        def module1 = mavenHttpRepo.module('gradletest.maven.local.cache.test', "foo", "1.0").publish()
+        def remoteModule = mavenHttpRepo.module('gradletest.maven.local.cache.test', "foo", "1.0").publish()
         m2Installation.generateGlobalSettingsFile()
-        def module2 = m2Installation.mavenRepo().module('gradletest.maven.local.cache.test', "foo", "1.0").publish()
-        server.start()
+        def m2Module = m2Installation.mavenRepo().module('gradletest.maven.local.cache.test', "foo", "1.0").publish()
 
         buildFile.text = """
 repositories {
@@ -39,16 +38,51 @@ task retrieve(type: Sync) {
 }
 """
         and:
-        module1.pom.expectHead()
-        module1.pom.sha1.expectGet()
-        module1.artifact.expectHead()
-        module1.artifact.sha1.expectGet()
+        remoteModule.pom.expectHead()
+        remoteModule.pom.sha1.expectGet()
+        remoteModule.artifact.expectHead()
+        remoteModule.artifact.sha1.expectGet()
 
         when:
         using m2Installation
         run 'retrieve'
 
         then:
-        file('build/foo-1.0.jar').assertIsCopyOf(module2.artifactFile)
+        file('build/foo-1.0.jar').assertIsCopyOf(m2Module.artifactFile)
+    }
+
+    def "does not reuse cached artifacts from maven local cache when they are different to those in the remote repository"() {
+        given:
+        def remoteModule = mavenHttpRepo.module('gradletest.maven.local.cache.test', "foo", "1.0").publish()
+        m2Installation.generateGlobalSettingsFile()
+        m2Installation.mavenRepo().module('gradletest.maven.local.cache.test', "foo", "1.0").publishWithChangedContent()
+
+        buildFile.text = """
+repositories {
+    maven { url "${mavenHttpRepo.uri}" }
+}
+configurations { compile }
+dependencies {
+    compile 'gradletest.maven.local.cache.test:foo:1.0'
+}
+task retrieve(type: Sync) {
+    from configurations.compile
+    into 'build'
+}
+"""
+        and:
+        remoteModule.pom.expectHead()
+        remoteModule.pom.sha1.expectGet()
+        remoteModule.pom.expectGet()
+        remoteModule.artifact.expectHead()
+        remoteModule.artifact.sha1.expectGet()
+        remoteModule.artifact.expectGet()
+
+        when:
+        using m2Installation
+        run 'retrieve'
+
+        then:
+        file('build/foo-1.0.jar').assertIsCopyOf(remoteModule.artifactFile)
     }
 }
\ No newline at end of file
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/ResolutionOverrideIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/ResolutionOverrideIntegrationTest.groovy
index 1c79efaf50a8..4f84d558740e 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/ResolutionOverrideIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/ResolutionOverrideIntegrationTest.groovy
@@ -15,12 +15,11 @@
  */
 package org.gradle.integtests.resolve.artifactreuse
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-class ResolutionOverrideIntegrationTest extends AbstractDependencyResolutionTest {
+class ResolutionOverrideIntegrationTest extends AbstractHttpDependencyResolutionTest {
     public void "will refresh non-changing module when run with --refresh-dependencies"() {
         given:
-        server.start()
         def module = mavenHttpRepo.module('org.name', 'projectA', '1.2').publish()
 
         and:
@@ -66,8 +65,6 @@ task retrieve(type: Sync) {
     }
 
     public void "will recover from missing module when run with --refresh-dependencies"() {
-        server.start()
-
         given:
         def module = mavenHttpRepo.module('org.name', 'projectA', '1.2').publish()
         def artifact = module.artifact
@@ -103,8 +100,6 @@ task showMissing << { println configurations.missing.files }
     }
 
     public void "will recover from missing artifact when run with --refresh-dependencies"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
@@ -147,7 +142,6 @@ task retrieve(type: Sync) {
     public void "will not expire cache entries when run with offline flag"() {
 
         given:
-        server.start()
         def module = mavenHttpRepo.module("org.name", "unique", "1.0-SNAPSHOT").publish()
 
         and:
@@ -193,9 +187,6 @@ task retrieve(type: Sync) {
 
     public void "does not attempt to contact server when run with offline flag"() {
         given:
-        server.start()
-
-        and:
         buildFile << """
 repositories {
     maven { url "${mavenHttpRepo.uri}" }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/SameCacheUsageCrossVersionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/SameCacheUsageCrossVersionIntegrationTest.groovy
index 3daa3663c35f..002b4886e5c1 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/SameCacheUsageCrossVersionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/artifactreuse/SameCacheUsageCrossVersionIntegrationTest.groovy
@@ -21,7 +21,7 @@ import org.gradle.api.internal.artifacts.ivyservice.DefaultCacheLockingManager
 import org.gradle.integtests.fixtures.IgnoreVersions
 import org.gradle.integtests.fixtures.TargetVersions
 import org.gradle.test.fixtures.maven.MavenFileRepository
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.junit.Rule
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedChangingModulesIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedChangingModulesIntegrationTest.groovy
index 3031cb954d36..e134d7eceb7c 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedChangingModulesIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedChangingModulesIntegrationTest.groovy
@@ -16,13 +16,12 @@
 
 package org.gradle.integtests.resolve.caching
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-public class CachedChangingModulesIntegrationTest extends AbstractDependencyResolutionTest {
+public class CachedChangingModulesIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     def "can cache and refresh unique versioned maven artifacts with a classifier"() {
         given:
-        server.start()
         def repo = mavenHttpRepo("repo")
         def module = repo.module("group", "projectA", "1.0-SNAPSHOT")
         def sourceArtifact = module.artifact(classifier: "source")
@@ -93,7 +92,6 @@ public class CachedChangingModulesIntegrationTest extends AbstractDependencyReso
 
     def "can cache and refresh non unique versioned maven artifacts with a classifier"() {
         given:
-        server.start()
         def repo = mavenHttpRepo("repo")
         def module = repo.module("group", "projectA", "1.0-SNAPSHOT").withNonUniqueSnapshots()
         def sourceArtifact = module.artifact(classifier: "source")
@@ -164,7 +162,6 @@ public class CachedChangingModulesIntegrationTest extends AbstractDependencyReso
 
     def "can cache and refresh ivy changing artifacts with a classifier"() {
         given:
-        server.start()
         def repo = ivyHttpRepo("repo")
         def module = repo.module("group", "projectA", "1.0")
         module.artifact(classifier: "source")
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedDependencyResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedDependencyResolutionIntegrationTest.groovy
index dfaaa6835e65..e3e24cba3c71 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedDependencyResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedDependencyResolutionIntegrationTest.groovy
@@ -16,23 +16,22 @@
 
 package org.gradle.integtests.resolve.caching
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.ivy.IvyHttpModule
+import org.gradle.test.fixtures.server.http.IvyHttpModule
 import org.gradle.test.fixtures.server.http.HttpServer
 import spock.lang.Issue
 
 /**
  * We are using Ivy here, but the strategy is the same for any kind of repository.
  */
-class CachedDependencyResolutionIntegrationTest extends AbstractDependencyResolutionTest {
+class CachedDependencyResolutionIntegrationTest extends AbstractHttpDependencyResolutionTest {
     IvyHttpModule module
 
     TestFile downloaded
     TestFile.Snapshot lastState
 
     def setup() {
-        server.start()
         buildFile << """
 repositories {
     ivy { url "${ivyHttpRepo.uri}" }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedMissingModulesIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedMissingModulesIntegrationTest.groovy
index 883cd01bd3c2..272866875c99 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedMissingModulesIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/CachedMissingModulesIntegrationTest.groovy
@@ -16,15 +16,13 @@
 
 package org.gradle.integtests.resolve.caching
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.integtests.fixtures.executer.GradleContextualExecuter
 import spock.lang.IgnoreIf
 
-class CachedMissingModulesIntegrationTest extends AbstractDependencyResolutionTest {
+class CachedMissingModulesIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     public void "caches missing module when module found in another repository"() {
-        server.start()
-
         given:
         def repo1 = ivyHttpRepo("repo1")
         def repo2 = ivyHttpRepo("repo2")
@@ -61,7 +59,6 @@ task showMissing << { println configurations.missing.files }
 
     def "cached not-found information for dynamic version is ignored if module is not available in any repo"() {
         given:
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         repo1.module("group", "projectA", "1.0")
         def repo2 = mavenHttpRepo("repo2")
@@ -119,7 +116,6 @@ task showMissing << { println configurations.missing.files }
 
     def "cached not-found information for fixed version is ignored if module is not available in any repo"() {
         given:
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo1Module = repo1.module("group", "projectA", "1.0")
         def repo1Artifact = repo1Module.artifact
@@ -180,7 +176,6 @@ task showMissing << { println configurations.missing.files }
     @IgnoreIf({ GradleContextualExecuter.isParallel() })
     def "hit each remote repo only once per build and missing module"() {
         given:
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo1Module = repo1.module("group", "projectA", "1.0")
         def repo1Artifact = repo1Module.artifact
@@ -251,7 +246,6 @@ task showMissing << { println configurations.missing.files }
 
     def "does not hit remote repositories if version is available in local repo"() {
         given:
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo1Module = repo1.module("group", "projectA", "1.0")
         def repo2 = mavenRepo("repo2")
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/RecoverFromBrokenResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/RecoverFromBrokenResolutionIntegrationTest.groovy
index 4c829dd3e264..99aa0f0e161f 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/RecoverFromBrokenResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/caching/RecoverFromBrokenResolutionIntegrationTest.groovy
@@ -16,18 +16,15 @@
 
 package org.gradle.integtests.resolve.caching
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
-import org.gradle.test.fixtures.maven.MavenHttpModule
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
+import org.gradle.test.fixtures.server.http.MavenHttpModule
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import org.hamcrest.Matchers
 
-class RecoverFromBrokenResolutionIntegrationTest extends AbstractDependencyResolutionTest {
+class RecoverFromBrokenResolutionIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
-    def repo
-    def module
-
-    def setup() {
-        server.start()
-    }
+    MavenHttpRepository repo
+    MavenHttpModule module
 
     private void buildFileWithSnapshotDependency() {
         buildFile << """
@@ -163,9 +160,9 @@ class RecoverFromBrokenResolutionIntegrationTest extends AbstractDependencyResol
         when:
         publishedMavenModule()
         server.resetExpectations()
-        server.expectGet('/repo/group/projectA/1.0-SNAPSHOT/maven-metadata.xml', 'username', 'password', module.metaDataFile)
-        server.expectGet("/repo/group/projectA/1.0-SNAPSHOT/${module.pomFile.name}", 'username', 'password', module.pomFile)
-        server.expectGet("/repo/group/projectA/1.0-SNAPSHOT/${module.artifactFile.name}", 'username', 'password', module.artifactFile)
+        module.metaData.expectGet('username', 'password')
+        module.pom.expectGet('username', 'password')
+        module.artifact.expectGet('username', 'password')
 
         then:
         run 'retrieve'
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvySFtpResolverIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvySFtpResolverIntegrationTest.groovy
index 2aed311560b6..c08e492d8bd2 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvySFtpResolverIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvySFtpResolverIntegrationTest.groovy
@@ -15,26 +15,16 @@
  */
 package org.gradle.integtests.resolve.custom
 
-import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.AbstractSftpDependencyResolutionTest
 import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
-import org.gradle.test.fixtures.ivy.IvyRepository
-import org.gradle.test.fixtures.server.sftp.SFTPServer
 import org.junit.Rule
 
-class IvySFtpResolverIntegrationTest extends AbstractIntegrationSpec {
-
-    @Rule
-    public final SFTPServer server = new SFTPServer(this)
-
+class IvySFtpResolverIntegrationTest extends AbstractSftpDependencyResolutionTest {
     @Rule ProgressLoggingFixture progressLogging = new ProgressLoggingFixture(executer, temporaryFolder)
 
-    def setup() {
-        requireOwnGradleUserHomeDir()
-    }
-
     public void "can resolve and cache dependencies from an SFTP Ivy repository"() {
         given:
-        def repo = ivyRepo()
+        def repo = ivySftpRepo
         def module = repo.module('group', 'projectA', '1.2')
         module.publish();
 
@@ -47,8 +37,8 @@ repositories {
         port = ${server.port}
         user = "simple"
         userPassword = "simple"
-        addIvyPattern "repos/libs/[organization]/[module]/[revision]/ivy-[revision].xml"
-        addArtifactPattern "repos/libs/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
+        addIvyPattern "repo/[organization]/[module]/[revision]/ivy-[revision].xml"
+        addArtifactPattern "repo/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
     }
 }
 configurations { compile }
@@ -58,27 +48,31 @@ task listJars << {
 }
 """
         when:
+        server.expectRealpath('')
+
+        module.repository.expectDirectoryList('group', 'projectA', '1.2')
+
+        module.ivy.expectStat()
+        module.ivy.expectFileDownload()
+
+        module.repository.expectDirectoryList('group', 'projectA', '1.2')
+
+        module.jar.expectStat()
+        module.jar.expectFileDownload()
+
+        and:
         executer.withDeprecationChecksDisabled()
         run 'listJars'
 
         then:
-        server.fileRequests == ["repos/libs/group/projectA/1.2/ivy-1.2.xml",
-                "repos/libs/group/projectA/1.2/projectA-1.2.jar"
-        ] as Set
-
-        progressLogging.downloadProgressLogged("repos/libs/group/projectA/1.2/ivy-1.2.xml")
-        progressLogging.downloadProgressLogged("repos/libs/group/projectA/1.2/projectA-1.2.jar")
+        progressLogging.downloadProgressLogged("repo/group/projectA/1.2/ivy-1.2.xml")
+        progressLogging.downloadProgressLogged("repo/group/projectA/1.2/projectA-1.2.jar")
 
         when:
-        server.clearRequests()
+        server.resetExpectations()
         executer.withDeprecationChecksDisabled()
-        run 'listJars'
 
         then:
-        server.fileRequests.empty
-    }
-
-    IvyRepository ivyRepo() {
-        return ivy(server.file("repos/libs/"))
+        run 'listJars'
     }
 }
\ No newline at end of file
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvyUrlResolverIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvyUrlResolverIntegrationTest.groovy
index 11d5efbcc187..bf670165dd4a 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvyUrlResolverIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/custom/IvyUrlResolverIntegrationTest.groovy
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 package org.gradle.integtests.resolve.custom
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
 import org.junit.Rule
 
-class IvyUrlResolverIntegrationTest extends AbstractDependencyResolutionTest {
+class IvyUrlResolverIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     @Rule ProgressLoggingFixture progressLogging = new ProgressLoggingFixture(executer, temporaryFolder)
 
@@ -28,7 +29,6 @@ class IvyUrlResolverIntegrationTest extends AbstractDependencyResolutionTest {
     }
 
     public void "can resolve and cache dependencies from an HTTP Ivy repository"() {
-        server.start()
         given:
         final IvyHttpRepository repo = ivyHttpRepo
         def projectA = repo.module('group', 'projectA', '1.2').publish()
@@ -152,7 +152,6 @@ task retrieveDynamicMissing(type: Sync) {
 
     public void "reports module missing when directory listing for module is empty or broken"() {
         given:
-        server.start()
         def repo = ivyHttpRepo
 
         and:
@@ -193,7 +192,6 @@ task testResolve(type: Sync) {
     }
 
     public void "honours changing patterns from custom resolver"() {
-        server.start()
         given:
         def module = ivyHttpRepo.module('group', 'projectA', '1.2-SNAPSHOT').publish()
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/AbstractHttpsRepoResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/AbstractHttpsRepoResolveIntegrationTest.groovy
index d64a2e10d70b..98d7a128b784 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/AbstractHttpsRepoResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/AbstractHttpsRepoResolveIntegrationTest.groovy
@@ -16,13 +16,13 @@
 
 package org.gradle.integtests.resolve.http
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.integtests.fixtures.TestResources
 import org.junit.Rule
 
 import static org.gradle.util.Matchers.containsText
 
-abstract class AbstractHttpsRepoResolveIntegrationTest extends AbstractDependencyResolutionTest {
+abstract class AbstractHttpsRepoResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     @Rule TestResources resources = new TestResources(temporaryFolder)
     File clientStore // contains the client's public and private keys
     File serverStore // contains the server's public and private keys
@@ -32,7 +32,6 @@ abstract class AbstractHttpsRepoResolveIntegrationTest extends AbstractDependenc
     def "resolve with server certificate"() {
         setupCertStores()
         server.enableSsl(serverStore.path, "asdfgh")
-        server.start()
 
         def repoType = setupRepo()
         setupBuildFile(repoType)
@@ -49,7 +48,6 @@ abstract class AbstractHttpsRepoResolveIntegrationTest extends AbstractDependenc
     def "resolve with server and client certificate"() {
         setupCertStores()
         server.enableSsl(serverStore.path, "asdfgh", clientStore.path, "asdfgh")
-        server.start()
 
         def repoType = setupRepo()
         setupBuildFile(repoType)
@@ -68,7 +66,6 @@ abstract class AbstractHttpsRepoResolveIntegrationTest extends AbstractDependenc
     def "decent error message when client can't authenticate server"() {
         setupCertStores()
         server.enableSsl(serverStore.path, "asdfgh")
-        server.start()
 
         def repoType = setupRepo()
         setupBuildFile(repoType)
@@ -87,7 +84,6 @@ abstract class AbstractHttpsRepoResolveIntegrationTest extends AbstractDependenc
     def "decent error message when server can't authenticate client"() {
         setupCertStores()
         server.enableSsl(serverStore.path, "asdfgh", serverStore.path, "asdfgh") // intentionally use wrong trust store for server
-        server.start()
 
         def repoType = setupRepo()
         setupBuildFile(repoType)
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpAuthenticationDependencyResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpAuthenticationDependencyResolutionIntegrationTest.groovy
index cce1527ad8d6..1c27ef782c01 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpAuthenticationDependencyResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpAuthenticationDependencyResolutionIntegrationTest.groovy
@@ -15,29 +15,28 @@
  */
 package org.gradle.integtests.resolve.http
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.hamcrest.Matchers
 import spock.lang.Unroll
 
-class HttpAuthenticationDependencyResolutionIntegrationTest extends AbstractDependencyResolutionTest {
+class HttpAuthenticationDependencyResolutionIntegrationTest extends AbstractHttpDependencyResolutionTest {
     static String badCredentials = "credentials{username 'testuser'; password 'bad'}"
 
     @Unroll
     public void "can resolve dependencies from #authScheme authenticated HTTP ivy repository"() {
-        server.start()
         given:
-        def moduleA = ivyRepo().module('group', 'projectA', '1.2').publish()
-        ivyRepo().module('group', 'projectB', '2.1').publish()
-        ivyRepo().module('group', 'projectB', '2.2').publish()
-        def moduleB = ivyRepo().module('group', 'projectB', '2.3').publish()
-        ivyRepo().module('group', 'projectB', '3.0').publish()
+        def moduleA = ivyHttpRepo.module('group', 'projectA', '1.2').publish()
+        ivyHttpRepo.module('group', 'projectB', '2.1').publish()
+        ivyHttpRepo.module('group', 'projectB', '2.2').publish()
+        def moduleB = ivyHttpRepo.module('group', 'projectB', '2.3').publish()
+        ivyHttpRepo.module('group', 'projectB', '3.0').publish()
 
         and:
         buildFile << """
 repositories {
     ivy {
-        url "http://localhost:${server.port}/repo"
+        url "${ivyHttpRepo.uri}"
 
         credentials {
             password 'password'
@@ -59,11 +58,11 @@ task listJars << {
         server.authenticationScheme = authScheme
 
         and:
-        server.expectGet('/repo/group/projectA/1.2/ivy-1.2.xml', 'username', 'password', moduleA.ivyFile)
-        server.expectGet('/repo/group/projectA/1.2/projectA-1.2.jar', 'username', 'password', moduleA.jarFile)
-        server.expectGetDirectoryListing("/repo/group/projectB/", 'username', 'password', moduleB.moduleDir.parentFile)
-        server.expectGet("/repo/group/projectB/2.3/ivy-2.3.xml", 'username', 'password', moduleB.ivyFile)
-        server.expectGet("/repo/group/projectB/2.3/projectB-2.3.jar", 'username', 'password', moduleB.jarFile)
+        moduleA.ivy.expectGet('username', 'password')
+        moduleA.jar.expectGet('username', 'password')
+        server.expectGetDirectoryListing("/repo/group/projectB/", 'username', 'password', moduleB.backingModule.moduleDir.parentFile)
+        moduleB.ivy.expectGet('username', 'password')
+        moduleB.jar.expectGet('username', 'password')
 
         then:
         succeeds('listJars')
@@ -74,20 +73,19 @@ task listJars << {
 
     @Unroll
     public void "can resolve dependencies from #authScheme authenticated HTTP maven repository"() {
-        server.start()
         given:
-        def moduleA = mavenRepo().module('group', 'projectA', '1.2').publish()
-        mavenRepo().module('group', 'projectB', '2.0').publish()
-        mavenRepo().module('group', 'projectB', '2.2').publish()
-        def moduleB = mavenRepo().module('group', 'projectB', '2.3').publish()
-        mavenRepo().module('group', 'projectB', '3.0').publish()
-        def moduleC = mavenRepo().module('group', 'projectC', '3.1-SNAPSHOT').publish()
-        def moduleD = mavenRepo().module('group', 'projectD', '4-SNAPSHOT').withNonUniqueSnapshots().publish()
+        def moduleA = mavenHttpRepo.module('group', 'projectA', '1.2').publish()
+        mavenHttpRepo.module('group', 'projectB', '2.0').publish()
+        mavenHttpRepo.module('group', 'projectB', '2.2').publish()
+        def moduleB = mavenHttpRepo.module('group', 'projectB', '2.3').publish()
+        mavenHttpRepo.module('group', 'projectB', '3.0').publish()
+        def moduleC = mavenHttpRepo.module('group', 'projectC', '3.1-SNAPSHOT').publish()
+        def moduleD = mavenHttpRepo.module('group', 'projectD', '4-SNAPSHOT').withNonUniqueSnapshots().publish()
         and:
         buildFile << """
 repositories {
     maven {
-        url "http://localhost:${server.port}/repo"
+        url "${mavenHttpRepo.uri}"
 
         credentials {
             password 'password'
@@ -111,19 +109,19 @@ task listJars << {
         server.authenticationScheme = authScheme
 
         and:
-        server.expectGet('/repo/group/projectA/1.2/projectA-1.2.pom', 'username', 'password', moduleA.pomFile)
-        server.expectGet('/repo/group/projectA/1.2/projectA-1.2.jar', 'username', 'password', moduleA.artifactFile)
-        server.expectGet('/repo/group/projectB/maven-metadata.xml', 'username', 'password', moduleB.rootMetaDataFile)
-        server.expectGet('/repo/group/projectB/2.3/projectB-2.3.pom', 'username', 'password', moduleB.pomFile)
-        server.expectGet('/repo/group/projectB/2.3/projectB-2.3.jar', 'username', 'password', moduleB.artifactFile)
+        moduleA.pom.expectGet('username', 'password')
+        moduleA.artifact.expectGet('username', 'password')
+        moduleB.rootMetaData.expectGet('username', 'password')
+        moduleB.pom.expectGet('username', 'password')
+        moduleB.artifact.expectGet('username', 'password')
 
-        server.expectGet('/repo/group/projectC/3.1-SNAPSHOT/maven-metadata.xml', 'username', 'password', moduleC.metaDataFile)
-        server.expectGet("/repo/group/projectC/3.1-SNAPSHOT/projectC-${moduleC.getPublishArtifactVersion()}.pom", 'username', 'password', moduleC.pomFile)
-        server.expectGet("/repo/group/projectC/3.1-SNAPSHOT/projectC-${moduleC.getPublishArtifactVersion()}.jar", 'username', 'password', moduleC.artifactFile)
+        moduleC.metaData.expectGet('username', 'password')
+        moduleC.pom.expectGet('username', 'password')
+        moduleC.artifact.expectGet('username', 'password')
 
-        server.expectGet('/repo/group/projectD/4-SNAPSHOT/maven-metadata.xml', 'username', 'password', moduleD.metaDataFile)
-        server.expectGet("/repo/group/projectD/4-SNAPSHOT/projectD-4-SNAPSHOT.pom", 'username', 'password', moduleD.pomFile)
-        server.expectGet("/repo/group/projectD/4-SNAPSHOT/projectD-4-SNAPSHOT.jar", 'username', 'password', moduleD.artifactFile)
+        moduleD.metaData.expectGet('username', 'password')
+        moduleD.pom.expectGet('username', 'password')
+        moduleD.artifact.expectGet('username', 'password')
 
         then:
         succeeds('listJars')
@@ -134,15 +132,14 @@ task listJars << {
 
     @Unroll
     def "reports failure resolving with #credsName credentials from #authScheme authenticated HTTP ivy repository"() {
-        server.start()
         given:
-        def module = ivyRepo().module('group', 'projectA', '1.2').publish()
+        def module = ivyHttpRepo.module('group', 'projectA', '1.2').publish()
         when:
         settingsFile << 'rootProject.name = "publish"'
         buildFile << """
    repositories {
        ivy {
-            url "http://localhost:${server.port}/repo"
+            url "${ivyHttpRepo.uri}"
             $creds
         }
    }
@@ -177,17 +174,14 @@ task listJars << {
     @Unroll
     def "reports failure resolving with #credsName credentials from #authScheme authenticated HTTP maven repository"() {
         given:
-        server.start()
-
-        and:
-        def module = mavenRepo().module('group', 'projectA', '1.2').publish()
+        def module = mavenHttpRepo.module('group', 'projectA', '1.2').publish()
 
         when:
         settingsFile << 'rootProject.name = "publish"'
         buildFile << """
  repositories {
      maven {
-         url "http://localhost:${server.port}/repo"
+         url "${mavenHttpRepo.uri}"
         $creds
      }
  }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpEncodingDependencyResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpEncodingDependencyResolutionIntegrationTest.groovy
index 2d3140537667..e50634804629 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpEncodingDependencyResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpEncodingDependencyResolutionIntegrationTest.groovy
@@ -15,13 +15,10 @@
  */
 package org.gradle.integtests.resolve.http
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest;
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-
-public class HttpEncodingDependencyResolutionIntegrationTest extends AbstractDependencyResolutionTest {
+public class HttpEncodingDependencyResolutionIntegrationTest extends AbstractHttpDependencyResolutionTest {
     public void "handles gzip encoded content"() {
-        server.start()
-
         given:
         def repo = ivyRepo()
         def module = repo.module('group', 'projectA', '1.2')
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpProxyResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpProxyResolveIntegrationTest.groovy
index 8fc1a6401785..cf8a200ce235 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpProxyResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpProxyResolveIntegrationTest.groovy
@@ -15,23 +15,22 @@
  */
 package org.gradle.integtests.resolve.http
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.gradle.test.fixtures.server.http.TestProxyServer
 import org.gradle.util.SetSystemProperties
 import org.junit.Rule
 import spock.lang.Unroll
 
-class HttpProxyResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class HttpProxyResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     @Rule TestProxyServer proxyServer = new TestProxyServer(server)
     @Rule SetSystemProperties systemProperties = new SetSystemProperties()
 
     public void "uses configured proxy to access remote HTTP repository"() {
-        server.start()
         proxyServer.start()
 
         given:
-        def repo = ivyRepo()
+        def repo = ivyHttpRepo
         def module = repo.module('group', 'projectA', '1.2')
         module.publish()
 
@@ -51,8 +50,8 @@ task listJars << {
         executer.withArguments("-Dhttp.proxyHost=localhost", "-Dhttp.proxyPort=${proxyServer.port}")
 
         and:
-        server.expectGet('/repo/group/projectA/1.2/ivy-1.2.xml', module.ivyFile)
-        server.expectGet('/repo/group/projectA/1.2/projectA-1.2.jar', module.jarFile)
+        module.ivy.expectGet()
+        module.jar.expectGet()
 
         then:
         succeeds('listJars')
@@ -62,11 +61,10 @@ task listJars << {
     }
 
     public void "uses authenticated proxy to access remote HTTP repository"() {
-        server.start()
         proxyServer.start()
 
         given:
-        def repo = ivyRepo()
+        def repo = ivyHttpRepo
         def module = repo.module('group', 'projectA', '1.2')
         module.publish()
 
@@ -92,8 +90,8 @@ task listJars << {
         proxyServer.requireAuthentication('proxyUser', 'proxyPassword')
 
         and:
-        server.expectGet('/repo/group/projectA/1.2/ivy-1.2.xml', module.ivyFile)
-        server.expectGet('/repo/group/projectA/1.2/projectA-1.2.jar', module.jarFile)
+        module.ivy.expectGet()
+        module.jar.expectGet()
 
         then:
         succeeds('listJars')
@@ -104,11 +102,10 @@ task listJars << {
 
     @Unroll
     public void "passes target credentials to #authScheme authenticated server via proxy"() {
-        server.start()
         proxyServer.start()
 
         given:
-        def repo = ivyRepo()
+        def repo = ivyHttpRepo
         def module = repo.module('group', 'projectA', '1.2')
         module.publish()
 
@@ -138,8 +135,8 @@ task listJars << {
         proxyServer.requireAuthentication('proxyUser', 'proxyPassword')
 
         and:
-        server.expectGet('/repo/group/projectA/1.2/ivy-1.2.xml', 'targetUser', 'targetPassword', module.ivyFile)
-        server.expectGet('/repo/group/projectA/1.2/projectA-1.2.jar', 'targetUser', 'targetPassword', module.jarFile)
+        module.ivy.expectGet('targetUser', 'targetPassword')
+        module.jar.expectGet('targetUser', 'targetPassword')
 
         then:
         succeeds('listJars')
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpRedirectResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpRedirectResolveIntegrationTest.groovy
index 0e94c0898096..d61bd18d3e48 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpRedirectResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/http/HttpRedirectResolveIntegrationTest.groovy
@@ -15,18 +15,17 @@
  */
 package org.gradle.integtests.resolve.http
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.gradle.util.SetSystemProperties
 import org.junit.Rule
 import spock.lang.Issue
 
-class HttpRedirectResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class HttpRedirectResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     @Rule SetSystemProperties systemProperties = new SetSystemProperties()
     @Rule public final HttpServer server2 = new HttpServer()
 
     public void "resolves module artifacts via HTTP redirect"() {
-        server.start()
         server2.start()
 
         given:
@@ -56,7 +55,6 @@ task listJars << {
 
     @Issue('GRADLE-2196')
     public void "resolves artifact-only module via HTTP redirect"() {
-        server.start()
         server2.start()
 
         given:
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/AbstractIvyRemoteRepoResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/AbstractIvyRemoteRepoResolveIntegrationTest.groovy
new file mode 100644
index 000000000000..9a4b9ff9018f
--- /dev/null
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/AbstractIvyRemoteRepoResolveIntegrationTest.groovy
@@ -0,0 +1,427 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.resolve.ivy
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
+import org.gradle.test.fixtures.server.RepositoryServer
+import org.junit.Rule
+import spock.lang.Unroll
+
+@Unroll
+abstract class AbstractIvyRemoteRepoResolveIntegrationTest extends AbstractIntegrationSpec {
+
+    abstract RepositoryServer getServer()
+
+    def setup() {
+        requireOwnGradleUserHomeDir()
+    }
+
+    @Rule ProgressLoggingFixture progressLogger = new ProgressLoggingFixture(executer, temporaryFolder)
+
+    void "can resolve dependencies from a remote Ivy repository with #layout layout"() {
+        given:
+        def remoteIvyRepo = server.getRemoteIvyRepo(m2Compatible, null, ivyFilePattern, artifactFilePattern)
+        def module = remoteIvyRepo.module('org.group.name', 'projectA', '1.2')
+        module.publish()
+
+        and:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${remoteIvyRepo.uri}"
+                    $server.validCredentials
+                    layout '$layout'
+                }
+            }
+            configurations { compile }
+            dependencies { compile 'org.group.name:projectA:1.2' }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when:
+        module.ivy.expectDownload()
+        module.jar.expectDownload()
+
+        then:
+        succeeds 'retrieve'
+        file('libs').assertHasDescendants 'projectA-1.2.jar'
+
+        where:
+        layout     | m2Compatible | ivyFilePattern             | artifactFilePattern
+        'gradle'   | false        | 'ivy-[revision].xml'       | '[artifact]-[revision](.[ext])'
+        'maven'    | true         | 'ivy-[revision].xml'       | '[artifact]-[revision](.[ext])'
+        'ivy'      | false        | '[type]s/[artifact].[ext]' | '[type]s/[artifact].[ext]'
+    }
+
+    void "can resolve dependencies from a remote Ivy repository with pattern layout and m2compatible: #m2Compatible"() {
+        given:
+        def remoteIvyRepo = server.getRemoteIvyRepo(m2Compatible, "[module]/[organisation]/[revision]")
+        def module = remoteIvyRepo.module('org.group.name', 'projectA', '1.2')
+        module.publish()
+
+        and:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${remoteIvyRepo.uri}"
+                    $server.validCredentials
+                    layout "pattern", {
+                        artifact "${remoteIvyRepo.baseArtifactPattern}"
+                        ivy "${remoteIvyRepo.baseIvyPattern}"
+                        m2compatible = $m2Compatible
+                    }
+                }
+            }
+            configurations { compile }
+            dependencies { compile 'org.group.name:projectA:1.2' }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when:
+        module.ivy.expectDownload()
+        module.jar.expectDownload()
+
+        then:
+        succeeds 'retrieve'
+        file('libs').assertHasDescendants 'projectA-1.2.jar'
+
+        where:
+        m2Compatible << [false, true]
+    }
+
+    void "can resolve dependencies from a remote Ivy repository with multiple patterns configured"() {
+        given:
+        def emptyRepo = server.getRemoteIvyRepo('/empty')
+        def thirdPartyModuleInEmptyRepo = emptyRepo.module('other', '3rdParty', '1.2')
+        def companyModuleInEmptyRepo = emptyRepo.module('company', 'original', '1.1')
+
+        def thirdPartyIvyRepo = server.getRemoteIvyRepo(false, "third-party/[organisation]/[module]/[revision]")
+        def thirdPartyModule = thirdPartyIvyRepo.module('other', '3rdParty', '1.2')
+        thirdPartyModule.publish()
+        def companyModuleInThirdPartyRepo = thirdPartyIvyRepo.module('company', 'original', '1.1')
+
+        and:
+        def companyIvyRepo = server.getRemoteIvyRepo(false, "company/[module]/[revision]")
+        def companyModule = companyIvyRepo.module('company', 'original', '1.1')
+        companyModule.publish()
+
+
+        and:
+        buildFile << """
+            repositories {
+                ivy {
+                    $server.validCredentials
+                    url "${emptyRepo.uri}"
+                    artifactPattern "${thirdPartyIvyRepo.artifactPattern}"
+                    artifactPattern "${companyIvyRepo.artifactPattern}"
+                    ivyPattern "${thirdPartyIvyRepo.ivyPattern}"
+                    ivyPattern "${companyIvyRepo.ivyPattern}"
+                }
+            }
+            configurations { compile }
+            dependencies {
+                compile 'other:3rdParty:1.2', 'company:original:1.1'
+            }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when:
+        thirdPartyModuleInEmptyRepo.ivy.expectDownloadMissing()
+        thirdPartyModuleInEmptyRepo.jar.expectDownloadMissing()
+        thirdPartyModule.ivy.expectDownload()
+        thirdPartyModule.jar.expectDownload()
+
+        companyModuleInEmptyRepo.ivy.expectDownloadMissing()
+        companyModuleInEmptyRepo.jar.expectDownloadMissing()
+        companyModuleInThirdPartyRepo.ivy.expectDownloadMissing()
+        companyModuleInThirdPartyRepo.jar.expectDownloadMissing()
+        companyModule.ivy.expectDownload()
+        companyModule.jar.expectDownload()
+
+        then:
+        succeeds 'retrieve'
+        file('libs').assertHasDescendants '3rdParty-1.2.jar', 'original-1.1.jar'
+    }
+
+    public void "can resolve and cache dependencies from multiple remote Ivy repositories"() {
+        given:
+        def repo1 = server.getRemoteIvyRepo("/repo1")
+        def repo2 = server.getRemoteIvyRepo("/repo2")
+        def moduleA = repo1.module('group', 'projectA')
+        moduleA.publish()
+        def missingModuleB = repo1.module('group', 'projectB')
+        def moduleB = repo2.module('group', 'projectB')
+        moduleB.publish()
+        def brokenModuleC = repo1.module('group', 'projectC')
+        def moduleC = repo2.module('group', 'projectC')
+        moduleC.publish()
+
+        and:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${repo1.uri}"
+                    $server.validCredentials
+                }
+                ivy {
+                    url "${repo2.uri}"
+                    $server.validCredentials
+                }
+            }
+            configurations {
+                compile {
+                    resolutionStrategy.cacheChangingModulesFor(0, "seconds")
+                }
+            }
+            dependencies {
+                compile 'group:projectA:1.0', 'group:projectB:1.0', 'group:projectC:1.0'
+            }
+            task listJars << {
+                assert configurations.compile.collect { it.name } == ['projectA-1.0.jar', 'projectB-1.0.jar', 'projectC-1.0.jar']
+            }
+        """
+
+        when:
+        moduleA.ivy.expectDownload()
+        moduleA.jar.expectDownload()
+
+        // Handles missing in repo1
+        missingModuleB.ivy.expectDownloadMissing()
+        missingModuleB.jar.expectMetadataRetrieveMissing()
+
+        moduleB.ivy.expectDownload()
+        moduleB.jar.expectDownload()
+
+        // Handles from broken url in repo1 (but does not cache)
+        brokenModuleC.ivy.expectDownloadBroken()
+
+        moduleC.ivy.expectDownload()
+        moduleC.jar.expectDownload()
+
+        then:
+        succeeds('listJars')
+
+        when:
+        server.resetExpectations()
+        // Will always re-attempt a broken repository
+        brokenModuleC.ivy.expectMetadataRetrieveBroken()
+        // No extra calls for cached dependencies
+
+        then:
+        succeeds('listJars')
+    }
+
+    public void "can resolve and cache dependencies from a remote Ivy repository"() {
+        given:
+        def module = server.remoteIvyRepo.module('group', 'projectA', '1.2')
+        module.publish()
+
+        and:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${server.remoteIvyRepo.uri}"
+                    $server.validCredentials
+                }
+            }
+            configurations {
+                compile {
+                    resolutionStrategy.cacheChangingModulesFor(0, "seconds")
+                }
+            }
+            dependencies { compile 'group:projectA:1.2' }
+            task listJars << {
+                assert configurations.compile.collect { it.name } == ['projectA-1.2.jar']
+            }
+        """
+        when:
+        module.ivy.expectDownload()
+        module.jar.expectDownload()
+
+        then:
+        succeeds 'listJars'
+        progressLogger.downloadProgressLogged(module.ivy.uri)
+        progressLogger.downloadProgressLogged(module.jar.uri)
+
+        when:
+        server.resetExpectations()
+
+        then:
+        succeeds 'listJars'
+    }
+
+    public void "can resolve and cache artifact-only dependencies from a remote Ivy repository"() {
+        given:
+        def module = server.remoteIvyRepo.module('group', 'projectA', '1.2')
+        module.publish()
+
+        and:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${server.remoteIvyRepo.uri}"
+                    $server.validCredentials
+                }
+            }
+            configurations {
+                compile {
+                    resolutionStrategy.cacheChangingModulesFor(0, "seconds")
+                }
+            }
+            dependencies { compile 'group:projectA:1.2@jar' }
+            task listJars << {
+                assert configurations.compile.collect { it.name } == ['projectA-1.2.jar']
+            }
+        """
+
+
+        when:
+        module.ivy.expectDownload()
+        module.jar.expectDownload()
+
+        then:
+        succeeds('listJars')
+
+        when:
+        server.resetExpectations()
+        // No extra calls for cached dependencies
+
+        then:
+        succeeds('listJars')
+    }
+
+    def "can resolve and cache artifact-only dependencies with no descriptor from a remote Ivy repository"() {
+        given:
+        def module = server.remoteIvyRepo.module('group', 'projectA', '1.2')
+        module.publish()
+
+        and:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${server.remoteIvyRepo.uri}"
+                    $server.validCredentials
+                }
+            }
+            configurations {
+                compile {
+                    resolutionStrategy.cacheChangingModulesFor(0, "seconds")
+                }
+            }
+            dependencies { compile 'group:projectA:1.2@jar' }
+            task listJars << {
+                assert configurations.compile.collect { it.name } == ['projectA-1.2.jar']
+            }
+        """
+
+
+        when:
+        module.ivy.expectDownloadMissing()
+        module.jar.expectMetadataRetrieve()
+        module.jar.expectDownload()
+
+        then:
+        succeeds('listJars')
+
+        when:
+        server.resetExpectations()
+        // No extra calls for cached dependencies
+
+        then:
+        succeeds('listJars')
+    }
+
+    def "reuses cached details when switching ivy resolve mode"() {
+        given:
+        buildFile << """
+            configurations {
+                compile {
+                    resolutionStrategy.cacheChangingModulesFor(0, "seconds")
+                }
+            }
+            dependencies {
+                repositories {
+                    ivy {
+                        url "${server.remoteIvyRepo.uri}"
+                        $server.validCredentials
+                        resolve.dynamicMode = project.hasProperty('useDynamicResolve')
+                    }
+                }
+                compile 'org:projectA:1.2'
+            }
+            task retrieve(type: Sync) {
+              from configurations.compile
+              into 'libs'
+            }
+        """
+        def moduleA = server.remoteIvyRepo.module('org', 'projectA', '1.2')
+        moduleA.dependsOn(organisation: 'org', module: 'projectB', revision: '1.5', revConstraint: 'latest.integration')
+                .publish()
+
+        def moduleB15 = server.remoteIvyRepo.module('org', 'projectB', '1.5')
+        moduleB15.publish()
+
+        def moduleB16 = server.remoteIvyRepo.module('org', 'projectB', '1.6')
+        moduleB16.publish()
+
+        when:
+        moduleA.ivy.expectDownload()
+        moduleA.jar.expectDownload()
+        moduleB15.ivy.expectDownload()
+        moduleB15.jar.expectDownload()
+        run 'retrieve'
+
+        then:
+        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.5.jar')
+
+        when:
+        server.resetExpectations()
+        server.remoteIvyRepo.expectDirectoryList('org', 'projectB')
+        moduleB16.ivy.expectDownload()
+        moduleB16.jar.expectDownload()
+        executer.withArguments("-PuseDynamicResolve=true")
+        run 'retrieve'
+
+        then:
+        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.6.jar')
+
+        when:
+        server.resetExpectations()
+        run 'retrieve'
+
+        then:
+        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.5.jar')
+
+        when:
+        server.resetExpectations()
+        executer.withArguments("-PuseDynamicResolve=true")
+        run 'retrieve'
+
+        then:
+        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.6.jar')
+    }
+}
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenDescriptorIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenDescriptorIntegrationTest.groovy
index ba878f300999..06e605d8e9dc 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenDescriptorIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenDescriptorIntegrationTest.groovy
@@ -16,11 +16,10 @@
 
 package org.gradle.integtests.resolve.ivy
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-class IvyBrokenDescriptorIntegrationTest extends AbstractDependencyResolutionTest {
+class IvyBrokenDescriptorIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def "reports Ivy descriptor that cannot be parsed"() {
-        server.start()
         given:
         buildFile << """
 repositories {
@@ -51,7 +50,6 @@ task showBroken << { println configurations.compile.files }
     }
 
     def "reports missing parent descriptor"() {
-        server.start()
         given:
         buildFile << """
 repositories {
@@ -84,7 +82,6 @@ task showBroken << { println configurations.compile.files }
     }
 
     def "reports parent descriptor that cannot be parsed"() {
-        server.start()
         given:
         buildFile << """
 repositories {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenRemoteResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenRemoteResolveIntegrationTest.groovy
index bfb3295b144c..67e2d375239e 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenRemoteResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyBrokenRemoteResolveIntegrationTest.groovy
@@ -15,15 +15,13 @@
  */
 package org.gradle.integtests.resolve.ivy
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
 import static org.hamcrest.Matchers.containsString
 
-class IvyBrokenRemoteResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class IvyBrokenRemoteResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     public void "reports and recovers from missing module"() {
-        server.start()
-
         given:
         def repo = ivyHttpRepo("repo1")
         def module = repo.module("group", "projectA", "1.2").publish()
@@ -60,8 +58,6 @@ task showMissing << { println configurations.missing.files }
     }
 
     public void "reports and recovers from failed Ivy descriptor download"() {
-        server.start()
-
         given:
         def module = ivyHttpRepo.module('group', 'projectA', '1.3').publish()
 
@@ -99,8 +95,6 @@ task showBroken << { println configurations.broken.files }
     }
 
     public void "reports and caches missing artifacts"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
@@ -139,8 +133,6 @@ task retrieve(type: Sync) {
     }
 
     public void "reports and recovers from failed artifact download"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyChangingModuleRemoteResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyChangingModuleRemoteResolveIntegrationTest.groovy
index e8dbea533417..6778837a046d 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyChangingModuleRemoteResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyChangingModuleRemoteResolveIntegrationTest.groovy
@@ -15,13 +15,11 @@
  */
 package org.gradle.integtests.resolve.ivy
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-class IvyChangingModuleRemoteResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class IvyChangingModuleRemoteResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     def "detects changed module descriptor when flagged as changing"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
@@ -82,8 +80,6 @@ task retrieve(type: Copy) {
     }
 
     def "can mark a module as changing after first retrieval"() {
-        server.start()
-
         given:
         buildFile << """
 def isChanging = project.hasProperty('isChanging') ? true : false
@@ -132,8 +128,6 @@ task retrieve(type: Copy) {
     }
 
     def "detects changed artifact when flagged as changing"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
@@ -191,8 +185,6 @@ task retrieve(type: Copy) {
     }
 
     def "caches changing module descriptor and artifacts until cache expiry"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
@@ -268,8 +260,6 @@ task retrieve(type: Copy) {
     }
 
     def "can use cache-control DSL to mimic changing pattern for ivy repository"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
@@ -347,8 +337,6 @@ task retrieve(type: Copy) {
     }
 
     def "avoid redownload unchanged artifact when no checksum available"() {
-        server.start()
-
         given:
         buildFile << """
             repositories {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesChangingModulesIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesChangingModulesIntegrationTest.groovy
index 0e32ff47659d..e0e9bf63b208 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesChangingModulesIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesChangingModulesIntegrationTest.groovy
@@ -17,7 +17,7 @@
 package org.gradle.integtests.resolve.ivy
 
 import org.gradle.integtests.resolve.ComponentMetadataRulesChangingModulesIntegrationTest
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
 
 class IvyComponentMetadataRulesChangingModulesIntegrationTest extends ComponentMetadataRulesChangingModulesIntegrationTest {
     IvyHttpRepository getRepo() {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesIntegrationTest.groovy
index 45ed7e281739..2bba95d5d29f 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesIntegrationTest.groovy
@@ -16,7 +16,9 @@
 package org.gradle.integtests.resolve.ivy
 
 import org.gradle.integtests.resolve.ComponentMetadataRulesIntegrationTest
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
+
+import static org.gradle.util.Matchers.containsLine
 
 class IvyComponentMetadataRulesIntegrationTest extends ComponentMetadataRulesIntegrationTest {
     @Override
@@ -39,4 +41,133 @@ repositories {
     String getDefaultStatus() {
         "integration"
     }
+
+    def "can access Ivy extra info by accepting parameter of type IvyModuleDescriptor"() {
+        repo.module('org.test', 'projectA', '1.0').withExtraInfo(foo: "fooValue", bar: "barValue").publish().allowAll()
+
+        buildFile <<
+"""
+def ruleInvoked = false
+
+dependencies {
+    components {
+        eachComponent { details, IvyModuleDescriptor descriptor ->
+            ruleInvoked = true
+            assert descriptor.extraInfo == ["my:foo": "fooValue", "my:bar": "barValue"]
+        }
+    }
+}
+
+resolve.doLast { assert ruleInvoked }
+"""
+
+        expect:
+        succeeds 'resolve'
+        // also works when already cached
+        succeeds 'resolve'
+    }
+
+    def "rule that doesn't initially access Ivy extra info can be changed to get access at any time"() {
+        repo.module('org.test', 'projectA', '1.0').withExtraInfo(foo: "fooValue", bar: "barValue").publish().allowAll()
+        def baseScript = buildFile.text
+
+        when:
+        buildFile.text = baseScript +
+"""
+def ruleInvoked = false
+
+dependencies {
+    components {
+        eachComponent { details ->
+            ruleInvoked = true
+        }
+    }
+}
+
+resolve.doLast { assert ruleInvoked }
+"""
+
+        then:
+        succeeds 'resolve'
+
+        when:
+        buildFile.text = baseScript +
+"""
+def ruleInvoked = false
+
+dependencies {
+    components {
+        eachComponent { details, IvyModuleDescriptor descriptor ->
+            ruleInvoked = true
+            assert descriptor.extraInfo == ["my:foo": "fooValue", "my:bar": "barValue"]
+        }
+    }
+}
+
+resolve.doLast { assert ruleInvoked }
+"""
+
+        then:
+        succeeds 'resolve'
+    }
+
+    def "changed Ivy extra info becomes visible once module is refreshed"() {
+        def baseScript = buildFile.text
+
+        when:
+        repo.module('org.test', 'projectA', '1.0').withExtraInfo(foo: "fooValue", bar: "barValue").publish().allowAll()
+        buildFile.text = baseScript +
+                """
+def ruleInvoked = false
+
+dependencies {
+    components {
+        eachComponent { details, IvyModuleDescriptor descriptor ->
+            ruleInvoked = true
+            assert descriptor.extraInfo == ["my:foo": "fooValue", "my:bar": "barValue"]
+        }
+    }
+}
+
+resolve.doLast { assert ruleInvoked }
+"""
+
+        then:
+        succeeds 'resolve'
+
+        when:
+        repo.module('org.test', 'projectA', '1.0').withExtraInfo(foo: "fooValueChanged", bar: "barValueChanged").publishWithChangedContent()
+
+        then:
+        succeeds 'resolve'
+
+        when:
+        repo.module('org.test', 'projectA', '1.0').withExtraInfo(foo: "fooValueChanged", bar: "barValueChanged").publishWithChangedContent()
+        args("--refresh-dependencies")
+        buildFile.text = baseScript +
+"""
+def ruleInvoked = false
+
+dependencies {
+    components {
+        eachComponent { details, IvyModuleDescriptor descriptor ->
+            ruleInvoked = true
+            file("extraInfo").delete()
+            descriptor.extraInfo.each { key, value ->
+                file("extraInfo") << "\$key->\$value\\n"
+            }
+        }
+    }
+}
+
+resolve.doLast { assert ruleInvoked }
+"""
+
+        then:
+        succeeds 'resolve'
+        // TODO: rule is invoked twice, and changes to extra info are only visible the second time
+        def text = file("extraInfo").text
+        assert containsLine(text, "my:foo->fooValueChanged")
+        assert containsLine(text, "my:bar->barValueChanged")
+    }
 }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesStatusIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesStatusIntegrationTest.groovy
index e4944a198801..c286d7d2a83b 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesStatusIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyComponentMetadataRulesStatusIntegrationTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.integtests.resolve.ivy
 
 import org.gradle.integtests.resolve.ComponentMetadataRulesStatusIntegrationTest
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
 
 class IvyComponentMetadataRulesStatusIntegrationTest extends ComponentMetadataRulesStatusIntegrationTest {
     @Override
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyCustomStatusLatestVersionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyCustomStatusLatestVersionIntegrationTest.groovy
index c5982065875f..f91d6cf1d328 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyCustomStatusLatestVersionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyCustomStatusLatestVersionIntegrationTest.groovy
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 package org.gradle.integtests.resolve.ivy
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
 
-class IvyCustomStatusLatestVersionIntegrationTest extends AbstractDependencyResolutionTest {
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
+
+class IvyCustomStatusLatestVersionIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def "latest.xyz selects highest version with given or higher status"() {
         given:
         buildFile << """
@@ -60,7 +61,6 @@ task retrieve(type: Sync) {
     }
 
     def "uses status provided by component metadata rule for latest.xyz"() {
-        server.start()
         given:
         buildFile << """
 repositories {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorResolveIntegrationTest.groovy
index aea2efbb3b84..cdbf2cee9ae6 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorResolveIntegrationTest.groovy
@@ -15,10 +15,10 @@
  */
 package org.gradle.integtests.resolve.ivy
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import spock.lang.Unroll
 
-class IvyDescriptorResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class IvyDescriptorResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def "substitutes system properties into ivy descriptor"() {
         given:
         ivyRepo.module("org.gradle", "test", "1.45")
@@ -56,7 +56,6 @@ task check << {
 
     def "merges values from parent descriptor file that is available locally"() {
         given:
-        server.start()
         def parentModule = ivyHttpRepo.module("org.gradle.parent", "parent_module", "1.1").dependsOn("org.gradle.dep", "dep_module", "1.1").publish()
         def depModule = ivyHttpRepo.module("org.gradle.dep", "dep_module", "1.1").publish()
 
@@ -96,7 +95,6 @@ task check << {
 
     def "merges values from parent descriptor file"() {
         given:
-        server.start()
         final parentModule = ivyHttpRepo.module("org.gradle.parent", "parent_module", "1.1").dependsOn("org.gradle.dep", "dep_module", "1.1").publish()
         final depModule = ivyHttpRepo.module("org.gradle.dep", "dep_module", "1.1").publish()
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorValidationIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorValidationIntegrationTest.groovy
index 33ace3427ab0..b39afe41e048 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorValidationIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDescriptorValidationIntegrationTest.groovy
@@ -44,7 +44,7 @@ class IvyDescriptorValidationIntegrationTest extends AbstractDependencyResolutio
         succeeds 'resolve'
 
         when:
-        module.ivyFile.setText(module.ivyFile.text.replace('revision="1.4"', 'revision="1.6"'), "utf-8")
+        module.ivyFile.setText(module.ivyFile.text.replace("revision='1.4'", "revision='1.6'"), "utf-8")
 
         then:
         fails 'resolve'
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDynamicRevisionRemoteResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDynamicRevisionRemoteResolveIntegrationTest.groovy
index e433c5177820..73ad955da446 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDynamicRevisionRemoteResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyDynamicRevisionRemoteResolveIntegrationTest.groovy
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 package org.gradle.integtests.resolve.ivy
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.integtests.resolve.ResolveTestFixture
 import org.gradle.test.fixtures.Repository
-import org.gradle.test.fixtures.ivy.IvyHttpModule
+import org.gradle.test.fixtures.encoding.Identifier
+import org.gradle.test.fixtures.server.http.IvyHttpModule
 import spock.lang.Unroll
 
-class IvyDynamicRevisionRemoteResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class IvyDynamicRevisionRemoteResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     ResolveTestFixture resolve
 
     def setup() {
@@ -28,8 +30,6 @@ class IvyDynamicRevisionRemoteResolveIntegrationTest extends AbstractDependencyR
 
         resolve = new ResolveTestFixture(buildFile)
         resolve.prepare()
-
-        server.start()
     }
 
     def "uses latest version from version range and latest status"() {
@@ -74,6 +74,39 @@ dependencies {
         checkResolve "group:projectA:1.+": "group:projectA:1.2", "group:projectB:latest.integration": "group:projectB:2.2"
     }
 
+    @Unroll
+    def "uses latest version from version range with #identifier characters"() {
+        given:
+        def name = identifier.safeForFileName().decorate("name")
+        useRepository ivyHttpRepo
+        buildFile << """
+configurations { compile }
+configurations.all {
+    resolutionStrategy.cacheDynamicVersionsFor 0, "seconds"
+}
+
+dependencies {
+    compile group: /${name}/, name: /${name}/, version: "latest.integration"
+}
+"""
+        when:
+        def projectA1 = ivyHttpRepo.module(name, name, name).publish()
+
+        and:
+        expectGetDynamicRevision(projectA1)
+
+        then:
+        succeeds('checkDeps')
+        resolve.expectGraph {
+            root(":", ":test:") {
+                dependency(group: name, module: name, version: 'latest.integration').selects(group: name, module: name, version: name)
+            }
+        }
+
+        where:
+        identifier << Identifier.all
+    }
+
     def "determines latest version with jar only"() {
         given:
         useRepository ivyHttpRepo
@@ -81,6 +114,7 @@ dependencies {
 configurations { compile }
 dependencies {
   compile group: "group", name: "projectA", version: "1.+"
+  compile group: "group", name: "projectB", version: "latest.integration"
 }
 """
 
@@ -88,21 +122,29 @@ dependencies {
         ivyHttpRepo.module("group", "projectA", "1.1").withNoMetaData().publish()
         def projectA12 = ivyHttpRepo.module("group", "projectA", "1.2").withNoMetaData().publish()
         ivyHttpRepo.module("group", "projectA", "2.0").withNoMetaData().publish()
+        ivyHttpRepo.module("group", "projectB", "1.1").withNoMetaData().publish()
+        def projectB12 = ivyHttpRepo.module("group", "projectB", "1.2").withNoMetaData().publish()
 
         and:
         ivyHttpRepo.expectDirectoryListGet("group", "projectA")
         projectA12.ivy.expectGetMissing()
         projectA12.jar.expectHead()
         projectA12.jar.expectGet()
+        ivyHttpRepo.expectDirectoryListGet("group", "projectB")
+        projectB12.ivy.expectGetMissing()
+        projectB12.jar.expectHead()
+        projectB12.jar.expectGet()
 
         then:
-        checkResolve "group:projectA:1.+": "group:projectA:1.2"
+        checkResolve "group:projectA:1.+": "group:projectA:1.2",
+                     "group:projectB:latest.integration": "group:projectB:1.2"
 
         when: "result is cached"
         server.resetExpectations()
 
         then:
-        checkResolve "group:projectA:1.+": "group:projectA:1.2"
+        checkResolve "group:projectA:1.+": "group:projectA:1.2",
+                     "group:projectB:latest.integration": "group:projectB:1.2"
     }
 
     def "uses latest version with correct status for latest.release and latest.milestone"() {
@@ -187,48 +229,6 @@ dependencies {
         checkResolve "group:projectA:latest.milestone": "group:projectA:1.1"
     }
 
-    def "can get latest version from repository with multiple ivyPatterns"() {
-        given:
-        def repo1 = ivyHttpRepo("ivyRepo1")
-        def repo1version2 = repo1.module('org.test', 'projectA', '1.2').withStatus("milestone").publish()
-        def repo1version3 = repo1.module('org.test', 'projectA', '1.3')
-        def repo2 = ivyHttpRepo("ivyRepo2")
-        repo2.module('org.test', 'projectA', '1.1').withStatus("integration").publish()
-        def repo2version3 = repo2.module('org.test', 'projectA', '1.3').withStatus("integration").publish()
-
-        and:
-        buildFile << """
-repositories {
-    ivy {
-        url "${repo1.uri}"
-        ivyPattern "${repo2.ivyPattern}"
-        artifactPattern "${repo2.artifactPattern}"
-    }
-}
-configurations { compile }
-dependencies {
-  compile 'org.test:projectA:latest.milestone'
-}
-"""
-        when:
-        repo1.expectDirectoryListGet("org.test", "projectA")
-        repo2.expectDirectoryListGet("org.test", "projectA")
-        // TODO - don't need this request
-        repo1version3.ivy.expectGetMissing()
-        repo2version3.ivy.expectGet()
-        repo1version2.ivy.expectGet()
-        repo1version2.jar.expectGet()
-
-        then:
-        checkResolve "org.test:projectA:latest.milestone": "org.test:projectA:1.2"
-
-        when:
-        server.resetExpectations()
-
-        then:
-        checkResolve "org.test:projectA:latest.milestone": "org.test:projectA:1.2"
-    }
-
     def "checks new repositories before returning any cached value"() {
         def repo1 = ivyHttpRepo("repo1")
         def repo2 = ivyHttpRepo("repo2")
@@ -350,7 +350,8 @@ dependencies {
         buildFile << """
 configurations { compile }
 dependencies {
-    compile group: "org.test", name: "projectA", version: project.getProperty('dependencyVersion')
+    compile group: "org.test", name: "projectA", version: "1.+"
+    compile group: "org.test", name: "projectA", version: "latest.integration"
 }
 """
 
@@ -361,20 +362,34 @@ dependencies {
         and:
         expectGetDynamicRevision(projectA12)
 
-        and:
-        executer.withArgument("-PdependencyVersion=1.+")
-
         then:
-        checkResolve "org.test:projectA:1.+": "org.test:projectA:1.2"
+        succeeds "checkDeps"
+        resolve.expectGraph {
+            root(":", ":test:") {
+                edge "org.test:projectA:1.+", "org.test:projectA:1.2"
+                edge "org.test:projectA:latest.integration", "org.test:projectA:1.2"
+            }
+        }
 
         when:
         server.resetExpectations()
 
         and:
-        executer.withArgument("-PdependencyVersion=[1.0,2.0)")
+        buildFile << """
+dependencies {
+    compile group: "org.test", name: "projectA", version: "[1.0,2.0)"
+}
+"""
 
         then:
-        checkResolve "org.test:projectA:[1.0,2.0)": "org.test:projectA:1.2"
+        succeeds "checkDeps"
+        resolve.expectGraph {
+            root(":", ":test:") {
+                edge "org.test:projectA:1.+", "org.test:projectA:1.2"
+                edge "org.test:projectA:latest.integration", "org.test:projectA:1.2"
+                edge "org.test:projectA:[1.0,2.0)", "org.test:projectA:1.2"
+            }
+        }
     }
 
     def "caches resolved revisions until cache expiry"() {
@@ -576,7 +591,7 @@ dependencies {
         checkResolve "org.test:a:[1.0,2.0)": "org.test:a:1.1"
     }
 
-    def "can resolve dynamic versions with multiple ivy patterns"() {
+    def "can resolve dynamic versions from repository with multiple ivy patterns"() {
         given:
         def repo1versions = [:]
         def repo1 = ivyHttpRepo("ivyRepo1")
@@ -614,11 +629,13 @@ dependencies {
 
         when:
         repo1.expectDirectoryListGet("org.test", "projectA")
+        // TODO Should not be looking in repo1, since A3 was not included in the version listing
         repo1versions.A3.ivy.expectGetMissing()
         repo1versions.A3.jar.expectGetMissing()
         expectGetDynamicRevision(repo2versions.A3)
 
         and:
+        // TODO Should not be looking in repo1, since B3 was not included in the version listing
         repo1versions.B3.ivy.expectGetMissing()
         repo2.expectDirectoryListGet("org.test", "projectB")
         repo2versions.B3.ivy.expectGet()
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpRepoResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpRepoResolveIntegrationTest.groovy
index d1cd07f39e45..ca5f20090c43 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpRepoResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpRepoResolveIntegrationTest.groovy
@@ -14,332 +14,17 @@
  * limitations under the License.
  */
 package org.gradle.integtests.resolve.ivy
-
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
-import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
+import org.gradle.test.fixtures.server.RepositoryServer
+import org.gradle.test.fixtures.server.http.RepositoryHttpServer
 import org.junit.Rule
 
-class IvyHttpRepoResolveIntegrationTest extends AbstractDependencyResolutionTest {
-
-    @Rule ProgressLoggingFixture progressLogger = new ProgressLoggingFixture(executer, temporaryFolder)
-
-    public void "can resolve and cache dependencies from an HTTP Ivy repository"() {
-        server.start()
-        given:
-        def module = ivyHttpRepo.module('group', 'projectA', '1.2').publish()
-
-        and:
-        buildFile << """
-repositories {
-    ivy { url "${ivyHttpRepo.uri}" }
-}
-configurations {
-    compile {
-        resolutionStrategy.cacheChangingModulesFor(0, "seconds")
-    }
-}
-dependencies { compile 'group:projectA:1.2' }
-task listJars << {
-    assert configurations.compile.collect { it.name } == ['projectA-1.2.jar']
-}
-"""
-        when:
-        module.ivy.expectGet()
-        module.jar.expectGet()
-
-        then:
-        succeeds 'listJars'
-        progressLogger.downloadProgressLogged("http://localhost:${server.port}/repo/group/projectA/1.2/ivy-1.2.xml")
-        progressLogger.downloadProgressLogged("http://localhost:${server.port}/repo/group/projectA/1.2/projectA-1.2.jar")
-
-        when:
-        server.resetExpectations()
-        then:
-        succeeds 'listJars'
-    }
-
-    public void "can resolve and cache artifact-only dependencies from an HTTP Ivy repository"() {
-        server.start()
-        given:
-        def module = ivyHttpRepo.module('group', 'projectA', '1.2').publish()
-
-        and:
-        buildFile << """
-repositories {
-    ivy { url "${ivyHttpRepo.uri}" }
-}
-configurations {
-    compile {
-        resolutionStrategy.cacheChangingModulesFor(0, "seconds")
-    }
-}
-dependencies { compile 'group:projectA:1.2@jar' }
-task listJars << {
-    assert configurations.compile.collect { it.name } == ['projectA-1.2.jar']
-}
-"""
-
-
-        when:
-        module.ivy.expectGet()
-        module.jar.expectGet()
-
-        then:
-        succeeds('listJars')
-
-        when:
-        server.resetExpectations()
-        // No extra calls for cached dependencies
-
-        then:
-        succeeds('listJars')
-    }
-
-    def "can resolve and cache artifact-only dependencies with no descriptor from a HTTP repository"() {
-        server.start()
-        given:
-        def module = ivyHttpRepo.module('group', 'projectA', '1.2').publish()
-
-        and:
-        buildFile << """
-repositories {
-    ivy { url "${ivyHttpRepo.uri}" }
-}
-configurations {
-    compile {
-        resolutionStrategy.cacheChangingModulesFor(0, "seconds")
-    }
-}
-dependencies { compile 'group:projectA:1.2@jar' }
-task listJars << {
-    assert configurations.compile.collect { it.name } == ['projectA-1.2.jar']
-}
-"""
-
-
-        when:
-        module.ivy.expectGetMissing()
-        module.jar.expectHead()
-        module.jar.expectGet()
-
-        then:
-        succeeds('listJars')
-
-        when:
-        server.resetExpectations()
-        // No extra calls for cached dependencies
-
-        then:
-        succeeds('listJars')
-    }
-
-    public void "can resolve and cache dependencies from multiple HTTP Ivy repositories"() {
-        server.start()
-        given:
-        def repo1 = ivyHttpRepo("repo1")
-        def repo2 = ivyHttpRepo("repo2")
-        def moduleA = repo1.module('group', 'projectA').publish()
-        def missingModuleB = repo1.module('group', 'projectB')
-        def moduleB = repo2.module('group', 'projectB').publish()
-        def brokenModuleC = repo1.module('group', 'projectC')
-        def moduleC = repo2.module('group', 'projectC').publish()
-
-        and:
-        buildFile << """
-repositories {
-    ivy { url "${repo1.uri}" }
-    ivy { url "${repo2.uri}" }
-}
-configurations {
-    compile {
-        resolutionStrategy.cacheChangingModulesFor(0, "seconds")
-    }
-}
-dependencies {
-    compile 'group:projectA:1.0', 'group:projectB:1.0', 'group:projectC:1.0'
-}
-task listJars << {
-    assert configurations.compile.collect { it.name } == ['projectA-1.0.jar', 'projectB-1.0.jar', 'projectC-1.0.jar']
-}
-"""
-
-        when:
-        moduleA.ivy.expectGet()
-        moduleA.jar.expectGet()
-
-        // Handles missing in repo1
-        missingModuleB.ivy.expectGetMissing()
-        missingModuleB.jar.expectHeadMissing()
-
-        moduleB.ivy.expectGet()
-        moduleB.jar.expectGet()
-
-        // Handles from broken url in repo1 (but does not cache)
-        brokenModuleC.ivy.expectGetBroken()
-
-        moduleC.ivy.expectGet()
-        moduleC.jar.expectGet()
-
-        then:
-        succeeds('listJars')
-
-        when:
-        server.resetExpectations()
-        // Will always re-attempt a broken repository
-        brokenModuleC.ivy.expectHeadBroken()
-        // No extra calls for cached dependencies
-
-        then:
-        succeeds('listJars')
-    }
-
-    public void "uses all configured patterns to resolve artifacts and caches result"() {
-        server.start()
-
-        given:
-        def module = ivyRepo().module('group', 'projectA', '1.2').publish()
-
-        buildFile << """
-repositories {
-    ivy {
-        url "http://localhost:${server.port}/first"
-        artifactPattern "http://localhost:${server.port}/second/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
-        artifactPattern "http://localhost:${server.port}/third/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
-        ivyPattern "http://localhost:${server.port}/second/[module]/[revision]/ivy.xml"
-        ivyPattern "http://localhost:${server.port}/third/[module]/[revision]/ivy.xml"
-    }
-}
-configurations {
-    compile {
-        resolutionStrategy.cacheChangingModulesFor(0, "seconds")
-    }
-}
-dependencies {
-    compile 'group:projectA:1.2'
-}
-task show << { println configurations.compile.files }
-"""
-
-        when:
-        server.expectGetMissing('/first/group/projectA/1.2/ivy-1.2.xml')
-        server.expectGetMissing('/first/group/projectA/1.2/projectA-1.2.jar')
-        server.expectGetMissing('/second/projectA/1.2/ivy.xml')
-        server.expectGetMissing('/second/projectA/1.2/projectA-1.2.jar')
-        server.expectGet('/third/projectA/1.2/ivy.xml', module.ivyFile)
-        server.expectGet('/third/projectA/1.2/projectA-1.2.jar', module.jarFile)
-
-        then:
-        succeeds('show')
-
-        when:
-        server.resetExpectations()
-
-        then:
-        succeeds('show')
-    }
-
-    public void "replaces org.name with org/name when using maven layout"() {
-        server.start()
-
-        given:
-        def module = ivyRepo().module('org.name.here', 'projectA', '1.2').publish()
-
-        buildFile << """
-repositories {
-    ivy {
-        url "http://localhost:${server.port}"
-        layout "maven"
-    }
-}
-configurations { compile }
-dependencies {
-    compile 'org.name.here:projectA:1.2'
-}
-
-task retrieve(type: Sync) {
-    from configurations.compile
-    into 'libs'
-}
-"""
-
-        when:
-        server.expectGet('/org/name/here/projectA/1.2/ivy-1.2.xml', module.ivyFile)
-        server.expectGet('/org/name/here/projectA/1.2/projectA-1.2.jar', module.jarFile)
-
-        and:
-        succeeds('retrieve')
-
-        then:
-        file('libs').assertHasDescendants('projectA-1.2.jar')
-    }
-
-    def "reuses cached details when switching ivy resolve mode"() {
-        given:
-        server.start()
-        buildFile << """
-configurations {
-    compile {
-        resolutionStrategy.cacheChangingModulesFor(0, "seconds")
-    }
-}
-dependencies {
-    repositories {
-        ivy {
-            url "${ivyHttpRepo.uri}"
-            resolve.dynamicMode = project.hasProperty('useDynamicResolve')
-        }
-    }
-    compile 'org:projectA:1.2'
-}
-task retrieve(type: Sync) {
-  from configurations.compile
-  into 'libs'
-}
-"""
-        def moduleA = ivyHttpRepo.module('org', 'projectA', '1.2')
-                .dependsOn(organisation: 'org', module: 'projectB', revision: '1.5', revConstraint: 'latest.integration')
-                .publish()
-
-        def moduleB15 = ivyHttpRepo.module('org', 'projectB', '1.5')
-                .publish()
-
-        def moduleB16 = ivyHttpRepo.module('org', 'projectB', '1.6')
-                .publish()
-
-        when:
-        moduleA.ivy.expectGet()
-        moduleA.jar.expectGet()
-        moduleB15.ivy.expectGet()
-        moduleB15.jar.expectGet()
-        run 'retrieve'
-
-        then:
-        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.5.jar')
-
-        when:
-        server.resetExpectations()
-        ivyHttpRepo.expectDirectoryListGet('org', 'projectB')
-        moduleB16.ivy.expectGet()
-        moduleB16.jar.expectGet()
-        executer.withArguments("-PuseDynamicResolve=true")
-        run 'retrieve'
-
-        then:
-        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.6.jar')
-
-        when:
-        server.resetExpectations()
-        run 'retrieve'
-
-        then:
-        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.5.jar')
+class IvyHttpRepoResolveIntegrationTest extends AbstractIvyRemoteRepoResolveIntegrationTest {
 
-        when:
-        server.resetExpectations()
-        executer.withArguments("-PuseDynamicResolve=true")
-        run 'retrieve'
+    @Rule
+    final RepositoryHttpServer server = new RepositoryHttpServer(this)
 
-        then:
-        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.6.jar')
+    @Override
+    RepositoryServer getServer() {
+        return server
     }
 }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpsRepoResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpsRepoResolveIntegrationTest.groovy
index ab1bc8a19d73..12daa3c687ee 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpsRepoResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyHttpsRepoResolveIntegrationTest.groovy
@@ -20,9 +20,9 @@ import org.gradle.integtests.resolve.http.AbstractHttpsRepoResolveIntegrationTes
 
 class IvyHttpsRepoResolveIntegrationTest extends AbstractHttpsRepoResolveIntegrationTest {
     protected String setupRepo() {
-        def module = ivyRepo().module('my-group', 'my-module').publish()
-        server.allowGetOrHead('/repo1/my-group/my-module/1.0/ivy-1.0.xml', module.ivyFile)
-        server.allowGetOrHead('/repo1/my-group/my-module/1.0/my-module-1.0.jar', module.jarFile)
+        def module = ivyHttpRepo('repo1').module('my-group', 'my-module').publish()
+        module.ivy.allowGetOrHead()
+        module.jar.allowGetOrHead()
         "ivy"
     }
 }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyJvmLibraryArtifactResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyJvmLibraryArtifactResolutionIntegrationTest.groovy
index 907163e54e90..39806168a522 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyJvmLibraryArtifactResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyJvmLibraryArtifactResolutionIntegrationTest.groovy
@@ -15,23 +15,21 @@
  */
 package org.gradle.integtests.resolve.ivy
 
-import org.gradle.api.artifacts.resolution.JvmLibraryJavadocArtifact
-import org.gradle.api.artifacts.resolution.JvmLibrarySourcesArtifact
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ArtifactResolveException
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.integtests.resolve.JvmLibraryArtifactResolveTestFixture
 import org.gradle.test.fixtures.ivy.IvyRepository
 import spock.lang.Unroll
 
-// TODO:DAZ Test can resolve multiple source/javadoc artifacts declared in 'sources'/'javadoc' configuration
-class IvyJvmLibraryArtifactResolutionIntegrationTest extends AbstractDependencyResolutionTest {
+class IvyJvmLibraryArtifactResolutionIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def fileRepo = ivyRepo
     def httpRepo = ivyHttpRepo
     def module = httpRepo.module("some.group", "some-artifact", "1.0")
     JvmLibraryArtifactResolveTestFixture fixture
 
     def setup() {
-        server.start()
         initBuild(httpRepo)
 
         fixture = new JvmLibraryArtifactResolveTestFixture(buildFile)
@@ -39,20 +37,16 @@ class IvyJvmLibraryArtifactResolutionIntegrationTest extends AbstractDependencyR
         publishModule()
     }
 
-    def initBuild(IvyRepository repo, String module = "some.group:some-artifact:1.0") {
+    def initBuild(IvyRepository repo) {
         buildFile.text = """
 repositories {
     ivy { url '$repo.uri' }
 }
-configurations { compile }
-dependencies {
-    compile "${module}"
-}
 """
     }
 
     def "resolve sources artifacts"() {
-        fixture.requestingTypes(JvmLibrarySourcesArtifact)
+        fixture.requestingTypes(SourcesArtifact)
                 .expectSourceArtifact("my-sources")
                 .prepare()
 
@@ -65,7 +59,7 @@ dependencies {
     }
 
     def "resolve javadoc artifacts"() {
-        fixture.requestingTypes(JvmLibraryJavadocArtifact)
+        fixture.requestingTypes(JavadocArtifact)
                 .expectJavadocArtifact("my-javadoc")
                 .prepare()
 
@@ -78,15 +72,56 @@ dependencies {
     }
 
     def "resolve all artifacts"() {
-        fixture.requestingTypes()
-                .expectSourceArtifact("my-sources")
+        fixture.expectSourceArtifact("my-sources")
+                .expectJavadocArtifact("my-javadoc")
+                .prepare()
+
+        when:
+        module.ivy.expectGet()
+        module.getArtifact(classifier: "my-sources").expectGet()
+        module.getArtifact(classifier: "my-javadoc").expectGet()
+
+        then:
+        checkArtifactsResolvedAndCached()
+    }
+
+    def "resolves multiple artifacts of the same type"() {
+        given:
+        module.artifact(type: "source", classifier: "other-sources", ext: "jar", conf: "sources")
+        module.artifact(type: "javadoc", classifier: "other-javadoc", ext: "jar", conf: "javadoc")
+        module.publish()
+
+        fixture.expectSourceArtifact("my-sources")
+                .expectSourceArtifact("other-sources")
                 .expectJavadocArtifact("my-javadoc")
+                .expectJavadocArtifact("other-javadoc")
                 .prepare()
 
         when:
         module.ivy.expectGet()
         module.getArtifact(classifier: "my-sources").expectGet()
+        module.getArtifact(classifier: "other-sources").expectGet()
         module.getArtifact(classifier: "my-javadoc").expectGet()
+        module.getArtifact(classifier: "other-javadoc").expectGet()
+
+        then:
+        checkArtifactsResolvedAndCached()
+    }
+
+    def "resolves when configurations are present and empty"() {
+        given:
+        def module1 = httpRepo.module("some.group", "some-artifact", "1.1")
+        module1.configuration("sources")
+        module1.configuration("javadoc")
+        // Add an artifact to prevent the default artifact being added with conf='*'
+        module1.artifact([conf: 'default'])
+        module1.publish()
+
+        and:
+        fixture.withComponentVersion("some.group", "some-artifact", "1.1").prepare()
+
+        when:
+        module1.ivy.expectGet()
 
         then:
         checkArtifactsResolvedAndCached()
@@ -94,7 +129,7 @@ dependencies {
 
     @Unroll
     def "fetches missing artifacts for module #condition"() {
-        fixture.requestingTypes(JvmLibrarySourcesArtifact)
+        fixture.requestingTypes(SourcesArtifact)
                 .expectSourceArtifactNotFound("my-sources")
                 .prepare()
         buildFile << """
@@ -107,7 +142,9 @@ dependencies {
 }
 
 if (project.hasProperty('nocache')) {
-    configurations.compile.resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
 }
 """
 
@@ -153,12 +190,14 @@ dependencies {
 }
 
 if (project.hasProperty('nocache')) {
-    configurations.compile.resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
 }
 """
 
         final sourceArtifact = module.getArtifact(classifier: "my-sources")
-        fixture.requestingTypes(JvmLibrarySourcesArtifact)
+        fixture.requestingTypes(SourcesArtifact)
                 .expectSourceArtifact("my-sources")
                 .prepare()
 
@@ -232,14 +271,25 @@ if (project.hasProperty('nocache')) {
         checkArtifactsResolvedAndCached()
     }
 
-    def "resolves when some artifacts are broken"() {
+    def "resolves and recovers from broken artifacts"() {
+        given:
+        module.artifact(type: "source", classifier: "broken-sources", ext: "jar", conf: "sources")
+        module.publish()
+
         fixture.expectSourceArtifact("my-sources")
-                .expectJavadocArtifactFailure(new ArtifactResolveException("Could not download artifact 'some.group:some-artifact:1.0:some-artifact-my-javadoc.jar'"))
+                .expectSourceArtifactFailure(new ArtifactResolveException(
+                                                "Could not download artifact 'some.group:some-artifact:1.0:some-artifact-broken-sources.jar'",
+                                                new Throwable("Received status code 500 from server: broken")))
+                .expectJavadocArtifactFailure(new ArtifactResolveException(
+                                                "Could not download artifact 'some.group:some-artifact:1.0:some-artifact-my-javadoc.jar'",
+                                                new Throwable("Received status code 500 from server: broken")))
                 .prepare()
 
         when:
         module.ivy.expectGet()
         module.getArtifact(classifier: "my-sources").expectGet()
+        module.getArtifact(classifier: "broken-sources").expectGetBroken()
+
         module.getArtifact(classifier: "my-javadoc").expectGetBroken()
 
         then:
@@ -248,12 +298,14 @@ if (project.hasProperty('nocache')) {
         when:
         fixture.clearExpectations()
                 .expectSourceArtifact("my-sources")
+                .expectSourceArtifact("broken-sources")
                 .expectJavadocArtifact("my-javadoc")
                 .createVerifyTask("verifyFixed")
 
         and:
         server.resetExpectations()
-        // Only the broken artifact is not cached
+        // Only the broken artifacts are not cached
+        module.getArtifact(classifier: "broken-sources").expectGet()
         module.getArtifact(classifier: "my-javadoc").expectGet()
 
         then:
@@ -263,8 +315,7 @@ if (project.hasProperty('nocache')) {
     def "resolve and does not cache artifacts from local repository"() {
         initBuild(fileRepo)
 
-        fixture.requestingTypes()
-                .expectSourceArtifact("my-sources")
+        fixture.expectSourceArtifact("my-sources")
                 .expectJavadocArtifact("my-javadoc")
                 .prepare()
 
@@ -283,16 +334,13 @@ if (project.hasProperty('nocache')) {
     }
 
     def "can resolve artifacts with maven scheme from ivy repository"() {
-        initBuild(httpRepo, "some.group:some-artifact:1.1")
-
         // Published with no configurations, and a source artifact only
         def moduleWithMavenScheme = httpRepo.module("some.group", "some-artifact", "1.1")
         moduleWithMavenScheme.artifact(classifier: "sources")
         moduleWithMavenScheme.publish()
 
-
         fixture.withComponentVersion("some.group", "some-artifact", "1.1")
-                .requestingTypes(JvmLibrarySourcesArtifact, JvmLibraryJavadocArtifact)
+                .requestingTypes(SourcesArtifact, JavadocArtifact)
                 .expectSourceArtifact("sources")
                 .prepare()
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyModuleResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyModuleResolveIntegrationTest.groovy
index 54adec27cd87..ab57d6fa4147 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyModuleResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvyModuleResolveIntegrationTest.groovy
@@ -16,10 +16,10 @@
 
 package org.gradle.integtests.resolve.ivy
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import spock.lang.Unroll
 
-class IvyModuleResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class IvyModuleResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def "wildcard on LHS of configuration mapping includes all public configurations of target module"() {
         given:
         buildFile << """
@@ -88,8 +88,6 @@ task retrieve(type: Sync) {
     @Unroll
     def "correctly handles configuration mapping rule '#rule'"() {
         given:
-        server.start()
-
         buildFile << """
 configurations {
     compile
@@ -220,4 +218,41 @@ task retrieve(type: Sync) {
         then:
         file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-1.5.jar', 'projectC-alpha-12.jar')
     }
+
+    def "prefers module with metadata to module with no metadata"() {
+        given:
+        def repo1 = ivyHttpRepo("repo1")
+        def moduleWithNoMetaData = repo1.module("org.gradle", "test", "1.45").withNoMetaData().publish()
+        def repo2 = ivyHttpRepo("repo2")
+        def moduleWithMetaData = repo2.module("org.gradle", "test", "1.45").publishWithChangedContent()
+        assert moduleWithNoMetaData.jarFile.text != moduleWithMetaData.jarFile.text
+
+        and:
+        buildFile << """
+repositories {
+    ivy { url "${repo1.uri}" }
+    ivy { url "${repo2.uri}" }
+}
+configurations { compile }
+dependencies {
+    compile "org.gradle:test:1.45"
+}
+
+task retrieve(type: Sync) {
+    from configurations.compile
+    into "libs"
+}
+"""
+
+        when:
+        moduleWithNoMetaData.ivy.expectGetMissing()
+        moduleWithNoMetaData.jar.expectHead()
+        moduleWithMetaData.ivy.expectGet()
+        moduleWithMetaData.jar.expectGet()
+        succeeds "retrieve"
+
+        then:
+        file("libs").assertHasDescendants("test-1.45.jar")
+        file("libs/test-1.45.jar").assertIsCopyOf(moduleWithMetaData.jarFile)
+    }
 }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoDynamicRevisionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoDynamicRevisionIntegrationTest.groovy
new file mode 100644
index 000000000000..52b872531938
--- /dev/null
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoDynamicRevisionIntegrationTest.groovy
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.resolve.ivy
+
+import org.gradle.integtests.fixtures.AbstractSftpDependencyResolutionTest
+
+class IvySftpRepoDynamicRevisionIntegrationTest extends AbstractSftpDependencyResolutionTest {
+    def "uses latest version from version range and latest status"() {
+        given:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${ivySftpRepo.uri}"
+                    credentials {
+                        username 'sftp'
+                        password 'sftp'
+                    }
+                }
+            }
+
+            configurations { compile }
+
+            dependencies {
+                compile group: "group", name: "projectA", version: "1.+"
+                compile group: "group", name: "projectB", version: "latest.integration"
+            }
+
+            configurations.all {
+                resolutionStrategy.cacheDynamicVersionsFor 0, "seconds"
+            }
+
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when: "Version 1.1 is published"
+        def projectA1 = ivySftpRepo.module("group", "projectA", "1.1")
+        projectA1.publish()
+        ivySftpRepo.module("group", "projectA", "2.0").publish()
+        def projectB1 = ivySftpRepo.module("group", "projectB", "1.1")
+        projectB1.publish()
+
+        and:
+        server.expectStat('/repo/group/projectA/')
+        server.expectDirectoryList('/repo/group/projectA/')
+
+        projectA1.ivy.expectMetadataRetrieve()
+        projectA1.ivy.expectFileDownload()
+
+        server.expectStat('/repo/group/projectB/')
+        server.expectDirectoryList('/repo/group/projectB/')
+
+        projectB1.ivy.expectMetadataRetrieve()
+        projectB1.ivy.expectFileDownload()
+
+        projectA1.jar.expectMetadataRetrieve()
+        projectA1.jar.expectFileDownload()
+
+        projectB1.jar.expectMetadataRetrieve()
+        projectB1.jar.expectFileDownload()
+
+        and:
+        run 'retrieve'
+
+        then: "Version 1.1 is used"
+        file('libs').assertHasDescendants('projectA-1.1.jar', 'projectB-1.1.jar')
+        file('libs/projectA-1.1.jar').assertIsCopyOf(projectA1.jarFile)
+        file('libs/projectB-1.1.jar').assertIsCopyOf(projectB1.jarFile)
+
+        when: "New versions are published"
+        server.resetExpectations()
+        def projectA2 = ivySftpRepo.module("group", "projectA", "1.2")
+        projectA2.publish()
+        def projectB2 = ivySftpRepo.module("group", "projectB", "2.2")
+        projectB2.publish()
+
+        and:
+        server.expectStat('/repo/group/projectA/')
+        server.expectDirectoryList('/repo/group/projectA/')
+
+        projectA2.ivy.expectMetadataRetrieve()
+        projectA2.ivy.expectFileDownload()
+
+        server.expectStat('/repo/group/projectB/')
+        server.expectDirectoryList('/repo/group/projectB/')
+
+        projectB2.ivy.expectMetadataRetrieve()
+        projectB2.ivy.expectFileDownload()
+
+        projectA2.jar.expectMetadataRetrieve()
+        projectA2.jar.expectFileDownload()
+
+        projectB2.jar.expectMetadataRetrieve()
+        projectB2.jar.expectFileDownload()
+
+        and:
+        run 'retrieve'
+
+        then: "New versions are used"
+        file('libs').assertHasDescendants('projectA-1.2.jar', 'projectB-2.2.jar')
+        file('libs/projectA-1.2.jar').assertIsCopyOf(projectA2.jarFile)
+        file('libs/projectB-2.2.jar').assertIsCopyOf(projectB2.jarFile)
+    }
+}
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoErrorsIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoErrorsIntegrationTest.groovy
new file mode 100644
index 000000000000..ce0dcb3e3d42
--- /dev/null
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoErrorsIntegrationTest.groovy
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.resolve.ivy
+
+import org.gradle.integtests.fixtures.AbstractSftpDependencyResolutionTest
+
+class IvySftpRepoErrorsIntegrationTest extends AbstractSftpDependencyResolutionTest {
+    void "resolve missing dependencies from a SFTP Ivy repository"() {
+        given:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${ivySftpRepo.uri}"
+                    credentials {
+                        username 'sftp'
+                        password 'sftp'
+                    }
+                }
+            }
+            configurations { compile }
+            dependencies { compile 'org.group.name:projectA:1.2' }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        def module = ivySftpRepo.module('org.group.name', 'projectA', '1.2')
+
+        when:
+        module.ivy.expectMetadataRetrieve()
+        module.jar.expectMetadataRetrieve()
+
+        then:
+        fails 'retrieve'
+        failure.assertHasDescription("Could not resolve all dependencies for configuration ':compile'.")
+                .assertHasCause('Could not find org.group.name:projectA:1.2')
+    }
+
+    void "resolve missing dynamic dependencies from a SFTP Ivy repository"() {
+        given:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${ivySftpRepo.uri}"
+                    credentials {
+                        username 'sftp'
+                        password 'sftp'
+                    }
+                }
+            }
+            configurations { compile }
+            dependencies { compile 'org.group.name:projectA:1.+' }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when:
+        server.expectStat('/repo/org.group.name/projectA/')
+
+        then:
+        fails 'retrieve'
+        failure.assertHasDescription("Could not resolve all dependencies for configuration ':compile'.")
+                .assertHasCause('Could not find any version that matches org.group.name:projectA:1.+')
+    }
+
+    void "resolve dependencies from a SFTP Ivy repository with invalid credentials"() {
+        given:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${ivySftpRepo.uri}"
+                    credentials {
+                        username 'bad'
+                        password 'credentials'
+                    }
+                }
+            }
+            configurations { compile }
+            dependencies { compile 'org.group.name:projectA:1.2' }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when:
+        fails 'retrieve'
+
+        then:
+        failure.assertHasDescription("Could not resolve all dependencies for configuration ':compile'.")
+                .assertHasCause('Could not resolve org.group.name:projectA:1.2')
+                .assertHasCause("Invalid credentials for SFTP server at ${ivySftpRepo.serverUri}")
+    }
+
+    void "resolve dependencies from an unreachable SFTP Ivy repository"() {
+        given:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${ivySftpRepo.uri}"
+                    credentials {
+                        username 'sftp'
+                        password 'sftp'
+                    }
+                }
+            }
+            configurations { compile }
+            dependencies { compile 'org.group.name:projectA:1.2' }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when:
+        server.stop()
+
+        then:
+        fails 'retrieve'
+
+        and:
+        failure.assertHasDescription("Could not resolve all dependencies for configuration ':compile'.")
+                .assertHasCause('Could not resolve org.group.name:projectA:1.2')
+                .assertHasCause("Could not connect to SFTP server at ${ivySftpRepo.serverUri}")
+    }
+
+    void 'resolve dependencies from a SFTP Ivy that returns a failure'() {
+        given:
+        buildFile << """
+            repositories {
+                ivy {
+                    url "${ivySftpRepo.uri}"
+                    credentials {
+                        username 'sftp'
+                        password 'sftp'
+                    }
+                }
+            }
+            configurations { compile }
+            dependencies { compile 'org.group.name:projectA:1.2' }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when:
+        ivySftpRepo.module('org.group.name', 'projectA', '1.2').ivy.expectMetadataRetrieveBroken()
+
+        and:
+        failure = executer.withStackTraceChecksDisabled().withTasks('retrieve').runWithFailure()
+
+        then:
+        failure.assertHasDescription("Could not resolve all dependencies for configuration ':compile'.")
+                .assertHasCause('Could not resolve org.group.name:projectA:1.2')
+                .assertHasCause("Could not get resource 'sftp://$ivySftpRepo.uri.host:$ivySftpRepo.uri.port/repo/org.group.name/projectA/1.2/ivy-1.2.xml'")
+    }
+}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapperTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoResolveIntegrationTest.groovy
similarity index 54%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapperTest.groovy
rename to subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoResolveIntegrationTest.groovy
index fd6ef5b2fd99..4f46351389ed 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapperTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/ivy/IvySftpRepoResolveIntegrationTest.groovy
@@ -14,15 +14,23 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental
+package org.gradle.integtests.resolve.ivy
 
-import spock.lang.Specification
+import org.gradle.test.fixtures.server.RepositoryServer
+import org.gradle.test.fixtures.server.sftp.SFTPServer
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
+import org.junit.Rule
 
-class OutputClassMapperTest extends Specification {
+@Requires(TestPrecondition.JDK6_OR_LATER)
+class IvySftpRepoResolveIntegrationTest extends AbstractIvyRemoteRepoResolveIntegrationTest {
 
-    def "maps output classes"() {
-        expect:
-        new OutputClassMapper(new File("root")).getOutputFile("Foo") == new File("root/Foo.class")
-        new OutputClassMapper(new File("root")).getOutputFile("com.org.Bar") == new File("root/com/org/Bar.class")
+    @Rule
+    final SFTPServer server = new SFTPServer(this)
+
+    @Override
+    RepositoryServer getServer() {
+        return server
     }
 }
+
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/BadPomFileResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/BadPomFileResolveIntegrationTest.groovy
index c720ed1ae343..565768f81dd1 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/BadPomFileResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/BadPomFileResolveIntegrationTest.groovy
@@ -15,10 +15,10 @@
  */
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import spock.lang.Issue
 
-class BadPomFileResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class BadPomFileResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     @Issue("http://issues.gradle.org/browse/GRADLE-1005")
     def "can handle self referencing dependency"() {
         given:
@@ -43,8 +43,6 @@ class BadPomFileResolveIntegrationTest extends AbstractDependencyResolutionTest
     @Issue("http://issues.gradle.org/browse/GRADLE-2861")
     def "can handle pom with placeholders in dependency management"() {
         given:
-        server.start()
-
         def parent = mavenHttpRepo.module('group', 'parent', '1.0').publish()
         parent.pomFile.text = parent.pomFile.text.replace("</project>", """
 <dependencyManagement>
@@ -85,7 +83,6 @@ class BadPomFileResolveIntegrationTest extends AbstractDependencyResolutionTest
     }
 
     public void "reports POM that cannot be parsed"() {
-        server.start()
         given:
         buildFile << """
 repositories {
@@ -116,8 +113,6 @@ task showBroken << { println configurations.compile.files }
 
     def "reports missing parent POM"() {
         given:
-        server.start()
-
         def parent = mavenHttpRepo.module("org", "parent", "1.0")
 
         def child = mavenHttpRepo.module("org", "child", "1.0")
@@ -152,8 +147,6 @@ task showBroken << { println configurations.compile.files }
 
     def "reports parent POM that cannot be parsed"() {
         given:
-        server.start()
-
         def parent = mavenHttpRepo.module("org", "parent", "1.0").publish()
         parent.pomFile.text = "<project/>"
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/LegacyMavenRepoResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/LegacyMavenRepoResolveIntegrationTest.groovy
index 6e2ff2e90324..ff32b5979d30 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/LegacyMavenRepoResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/LegacyMavenRepoResolveIntegrationTest.groovy
@@ -16,110 +16,10 @@
 
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
-
-class LegacyMavenRepoResolveIntegrationTest extends AbstractDependencyResolutionTest {
-    def "can configure legacy Maven resolver to verify artifact using checksums"() {
-        server.start()
-
-        given:
-        def module = mavenHttpRepo.module("group", "module", "1.2").publishWithChangedContent()
-        buildFile << """
-repositories {
-    def repo = mavenRepo url: '${mavenHttpRepo.uri}'
-    repo.checksums = 'sha1,md5'
-}
-
-configurations {
-    check
-}
-
-dependencies {
-    check 'group:module:1.2'
-}
-
-task check << {
-    configurations.check.files*.name == 'module-1.2.jar'
-}
-"""
-        and:
-        module.pom.expectGet()
-        module.pom.sha1.expectGetMissing()
-        module.pom.md5.expectGet()
-        module.artifact.expectGet()
-        module.artifact.sha1.expectGetMissing()
-        module.artifact.md5.expectGet()
-        executer.withDeprecationChecksDisabled()
-
-        expect:
-        succeeds 'check'
-
-        when:
-        module.publishWithChangedContent()
-
-        and:
-        server.resetExpectations()
-        module.pom.expectHead()
-        module.pom.sha1.expectGet()
-        module.pom.expectGet()
-        // TODO - shouldn't get checksum twice
-        module.pom.sha1.expectGet()
-        module.artifact.expectHead()
-        module.artifact.sha1.expectGet()
-        module.artifact.expectGet()
-        // TODO - shouldn't get checksum twice
-        module.artifact.sha1.expectGet()
-        executer.withDeprecationChecksDisabled()
-
-        then:
-        executer.withArguments("--refresh-dependencies")
-        succeeds 'check'
-    }
-
-    def "fails when checksum does not match artifact contents"() {
-        server.start()
-
-        given:
-        def module = mavenHttpRepo.module("group", "module", "1.2").publishWithChangedContent()
-        buildFile << """
-repositories {
-    def repo = mavenRepo url: '${mavenHttpRepo.uri}'
-    repo.checksums = 'sha1'
-}
-
-configurations {
-    check
-}
-
-dependencies {
-    check 'group:module:1.2'
-}
-
-task check << {
-    configurations.check.files*.name == 'module-1.2.jar'
-}
-"""
-        and:
-        module.pom.expectGet()
-        module.pom.sha1.expectGet()
-        module.artifact.expectGet()
-        module.artifact.sha1.expectGet()
-
-        and:
-        module.artifact.sha1.file.text = '1234'
-
-        and:
-        executer.withDeprecationChecksDisabled()
-
-        expect:
-        fails 'check'
-        failureHasCause("Could not download artifact 'group:module:1.2:module.jar'")
-        failureHasCause("invalid sha1: expected=1234 computed=2ee22701c9bd9af023ed20917897da5ce77336bc")
-    }
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
+class LegacyMavenRepoResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def "can configure resolver to fail when descriptor is not present"() {
-        server.start()
-
         given:
         def module = mavenHttpRepo.module("group", "module", "1.2").publish()
 
@@ -153,8 +53,6 @@ task check << {
     }
 
     def "can configure resolver to ignore poms"() {
-        server.start()
-
         given:
         def module = mavenHttpRepo.module("group", "module", "1.2").publish()
 
@@ -189,8 +87,6 @@ task check << {
     }
 
     def "can configure resolver to ignore maven-metadata.xml when resolving snapshots"() {
-        server.start()
-
         given:
         def module = mavenHttpRepo.module("group", "module", "1.2-SNAPSHOT").withNonUniqueSnapshots().publish()
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenBrokenRemoteResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenBrokenRemoteResolveIntegrationTest.groovy
index 024afa091646..a13bfe969677 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenBrokenRemoteResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenBrokenRemoteResolveIntegrationTest.groovy
@@ -16,12 +16,10 @@
 
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-class MavenBrokenRemoteResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenBrokenRemoteResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     public void "reports and recovers from failed POM download"() {
-        server.start()
-
         given:
         def module = mavenHttpRepo.module('group', 'projectA', '1.3').publish()
 
@@ -59,8 +57,6 @@ task showBroken << { println configurations.broken.files }
     }
 
     public void "reports and recovers from failed artifact download"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesChangingModulesIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesChangingModulesIntegrationTest.groovy
index 75e0535f42d1..cfa7578e5185 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesChangingModulesIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesChangingModulesIntegrationTest.groovy
@@ -17,7 +17,7 @@
 package org.gradle.integtests.resolve.maven
 
 import org.gradle.integtests.resolve.ComponentMetadataRulesChangingModulesIntegrationTest
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 
 class MavenComponentMetadataRulesChangingModulesIntegrationTest extends ComponentMetadataRulesChangingModulesIntegrationTest {
     MavenHttpRepository getRepo() {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesIntegrationTest.groovy
index cd8dac5eade6..7fb71782226f 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesIntegrationTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.integtests.resolve.maven
 
 import org.gradle.integtests.resolve.ComponentMetadataRulesIntegrationTest
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 
 class MavenComponentMetadataRulesIntegrationTest extends ComponentMetadataRulesIntegrationTest {
     @Override
@@ -39,4 +39,35 @@ repositories {
     String getDefaultStatus() {
         "release"
     }
+
+    def "rule that accepts IvyModuleDescriptor isn't invoked for Maven component"() {
+        repo.module('org.test', 'projectA', '1.0').publish().allowAll()
+
+        buildFile <<
+"""
+def plainRuleInvoked = false
+def ivyRuleInvoked = false
+
+dependencies {
+    components {
+        eachComponent { details ->
+            plainRuleInvoked = true
+        }
+        eachComponent { details, IvyModuleDescriptor descriptor ->
+            ivyRuleInvoked = true
+        }
+    }
+}
+
+resolve.doLast {
+    assert plainRuleInvoked
+    assert !ivyRuleInvoked
+}
+"""
+
+        expect:
+        succeeds 'resolve'
+        // also works when already cached
+        succeeds 'resolve'
+    }
 }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesStatusIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesStatusIntegrationTest.groovy
index 7a8c9e47e242..15db6e6d333f 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesStatusIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenComponentMetadataRulesStatusIntegrationTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.integtests.resolve.maven
 
 import org.gradle.integtests.resolve.ComponentMetadataRulesStatusIntegrationTest
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 
 class MavenComponentMetadataRulesStatusIntegrationTest extends ComponentMetadataRulesStatusIntegrationTest {
     MavenHttpRepository getRepo() {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenCustomPackagingResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenCustomPackagingResolveIntegrationTest.groovy
index 642dc601c319..c7f5040bd080 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenCustomPackagingResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenCustomPackagingResolveIntegrationTest.groovy
@@ -16,10 +16,10 @@
 
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import spock.lang.Issue
 
-class MavenCustomPackagingResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenCustomPackagingResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     @Issue("http://issues.gradle.org/browse/GRADLE-2984")
     def "can resolve dependency with custom packaging"() {
@@ -36,8 +36,6 @@ class MavenCustomPackagingResolveIntegrationTest extends AbstractDependencyResol
         // Not publishing, just allowing the HTTP requests to 404
         mavenHttpRepo.module("local", "local", "1.0").allowAll()
 
-        server.start()
-
         when:
         buildScript """
             configurations {
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDependencyResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDependencyResolveIntegrationTest.groovy
index f1573d925605..d9b4738adcce 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDependencyResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDependencyResolveIntegrationTest.groovy
@@ -138,7 +138,7 @@ task check << {
 
     @Requires(TestPrecondition.ONLINE)
     def "resolves dependencies on real projects"() {
-        // Hibernate core brings in conflicts, exclusions and parent poms
+        // Hibernate core brings in conflicts, exclusions and root poms
         // Add a direct dependency on an earlier version of commons-collection than required by hibernate core
         // Logback classic depends on a later version of slf4j-api than required by hibernate core
 
@@ -181,14 +181,14 @@ task check << {
     assert compile.collect { it.name } == [
         'logback-classic-0.9.30.jar',
         'hibernate-core-3.6.7.Final.jar',
-        'commons-collections-3.1.jar',
         'logback-core-0.9.30.jar',
         'slf4j-api-1.6.2.jar',
         'antlr-2.7.6.jar',
         'dom4j-1.6.1.jar',
         'hibernate-commons-annotations-3.2.0.Final.jar',
         'hibernate-jpa-2.0-api-1.0.1.Final.jar',
-        'jta-1.1.jar'
+        'jta-1.1.jar',
+        'commons-collections-3.1.jar'
     ]
 
     assert compile.resolvedConfiguration.resolvedArtifacts.collect { it.file.name } == [
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDynamicResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDynamicResolveIntegrationTest.groovy
index bed461efbef0..abd3ce5149ce 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDynamicResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenDynamicResolveIntegrationTest.groovy
@@ -16,13 +16,11 @@
 
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-class MavenDynamicResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenDynamicResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     def "can resolve snapshot versions with version range"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
@@ -84,8 +82,6 @@ task retrieve(type: Sync) {
 
     def "can resolve dynamic version declared in pom as transitive dependency from HTTP Maven repository"() {
         given:
-        server.start()
-
         mavenHttpRepo.module('org.test', 'projectC', '1.1').publish()
         def projectC = mavenHttpRepo.module('org.test', 'projectC', '1.5').publish()
         mavenHttpRepo.module('org.test', 'projectC', '2.0').publish()
@@ -134,7 +130,6 @@ task retrieve(type: Sync) {
 
     def "falls back to directory listing when maven-metadata.xml is missing"() {
         given:
-        server.start()
         mavenHttpRepo.module('org.test', 'projectA', '1.0').publish()
         def projectA = mavenHttpRepo.module('org.test', 'projectA', '1.5').publish()
 
@@ -177,7 +172,6 @@ task retrieve(type: Sync) {
 
     def "does not cache broken module information"() {
         given:
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo2 = mavenHttpRepo("repo2")
         def projectA1 = repo1.module('group', 'projectA', '1.1').publish()
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenHttpRepoResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenHttpRepoResolveIntegrationTest.groovy
index 1eb8d15e7260..87a52488e536 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenHttpRepoResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenHttpRepoResolveIntegrationTest.groovy
@@ -15,18 +15,18 @@
  */
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
+import org.gradle.test.fixtures.encoding.Identifier
 import org.junit.Rule
+import spock.lang.Unroll
 
-class MavenHttpRepoResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenHttpRepoResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     @Rule ProgressLoggingFixture progressLogging = new ProgressLoggingFixture(executer, temporaryFolder)
 
     def "can resolve and cache dependencies from HTTP Maven repository"() {
         given:
-        server.start()
-
         def projectB = mavenHttpRepo.module('group', 'projectB', '1.0').publish()
         def projectA = mavenHttpRepo.module('group', 'projectA').dependsOn('group', 'projectB', '1.0').publish()
 
@@ -77,8 +77,56 @@ task retrieve(type: Sync) {
         file('libs/projectA-1.0.jar').assertHasNotChangedSince(snapshot)
     }
 
+    @Unroll
+    def "can resolve with GAV containing #identifier characters"() {
+        def value = identifier.safeForFileName().decorate("name")
+
+        given:
+        def projectB = mavenHttpRepo.module(value, value, value).publish()
+        def projectA = mavenHttpRepo.module('group', 'projectA').dependsOn(value, value, value).publish()
+
+        buildFile << """
+repositories {
+    maven { url '${mavenHttpRepo.uri}' }
+}
+configurations {
+    compile {
+        resolutionStrategy.cacheChangingModulesFor(0, "seconds")
+    }
+}
+dependencies {
+    compile 'group:projectA:1.0'
+}
+
+task retrieve(type: Sync) {
+    into 'libs'
+    from configurations.compile
+}
+"""
+
+        when:
+        projectA.pom.expectGet()
+        projectA.artifact.expectGet()
+        projectB.pom.expectGet()
+        projectB.artifact.expectGet()
+
+        and:
+        run 'retrieve'
+
+        then:
+        file('libs').assertHasDescendants('projectA-1.0.jar', "${value}-${value}.jar")
+
+        and:
+        progressLogging.downloadProgressLogged(projectA.pom.uri)
+        progressLogging.downloadProgressLogged(projectA.artifact.uri)
+        progressLogging.downloadProgressLogged(projectB.pom.uri)
+        progressLogging.downloadProgressLogged(projectB.artifact.uri)
+
+        where:
+        identifier << Identifier.all
+    }
+
     def "can resolve and cache artifact-only dependencies from an HTTP Maven repository"() {
-        server.start()
         given:
         def module = mavenHttpRepo.module('group', 'projectA', '1.2')
         module.publish()
@@ -116,7 +164,6 @@ task listJars << {
     }
 
     def "can resolve and cache artifact-only dependencies with no pom from an HTTP Maven repository"() {
-        server.start()
         given:
         def module = mavenHttpRepo.module('group', 'projectA', '1.2')
         module.publish()
@@ -156,7 +203,6 @@ task listJars << {
 
     def "can resolve and cache dependencies from multiple HTTP Maven repositories"() {
         given:
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo2 = mavenHttpRepo("repo2")
 
@@ -206,7 +252,6 @@ task listJars << {
 
     def "uses artifactsUrl to resolve artifacts"() {
         given:
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo2 = mavenHttpRepo("repo2")
 
@@ -244,8 +289,6 @@ task listJars << {
 
     def "can resolve and cache dependencies from HTTP Maven repository with invalid settings.xml"() {
         given:
-        server.start()
-
         def projectB = mavenHttpRepo.module('group', 'projectB', '1.0').publish()
         def projectA = mavenHttpRepo.module('group', 'projectA').dependsOn('group', 'projectB', '1.0').publish()
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJvmLibraryArtifactResolutionIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJvmLibraryArtifactResolutionIntegrationTest.groovy
index dd37e574c7d5..15c6a669ab1a 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJvmLibraryArtifactResolutionIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenJvmLibraryArtifactResolutionIntegrationTest.groovy
@@ -15,15 +15,15 @@
  */
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.api.artifacts.resolution.JvmLibraryJavadocArtifact
-import org.gradle.api.artifacts.resolution.JvmLibrarySourcesArtifact
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ArtifactResolveException
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.integtests.resolve.JvmLibraryArtifactResolveTestFixture
 import org.gradle.test.fixtures.maven.MavenRepository
 import spock.lang.Unroll
 
-class MavenJvmLibraryArtifactResolutionIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenJvmLibraryArtifactResolutionIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def repo = mavenHttpRepo
     def fileRepo = mavenRepo
     def module = repo.module("some.group", "some-artifact", "1.0")
@@ -32,7 +32,6 @@ class MavenJvmLibraryArtifactResolutionIntegrationTest extends AbstractDependenc
     JvmLibraryArtifactResolveTestFixture fixture
 
     def setup() {
-        server.start()
         initBuild(repo)
 
         fixture = new JvmLibraryArtifactResolveTestFixture(buildFile)
@@ -40,20 +39,16 @@ class MavenJvmLibraryArtifactResolutionIntegrationTest extends AbstractDependenc
         module.publish()
     }
 
-    def initBuild(MavenRepository repo, String module = "some.group:some-artifact:1.0") {
+    def initBuild(MavenRepository repo) {
         buildFile.text = """
 repositories {
     maven { url '$repo.uri' }
 }
-configurations { compile }
-dependencies {
-    compile "${module}"
-}
 """
     }
 
     def "resolves and caches source artifacts"() {
-        fixture.requestingTypes(JvmLibrarySourcesArtifact)
+        fixture.requestingTypes(SourcesArtifact)
                 .expectSourceArtifact("sources")
                 .prepare()
 
@@ -67,7 +62,7 @@ dependencies {
     }
 
     def "resolve javadoc artifacts"() {
-        fixture.requestingTypes(JvmLibraryJavadocArtifact)
+        fixture.requestingTypes(JavadocArtifact)
                 .expectJavadocArtifact("javadoc")
                 .prepare()
 
@@ -81,8 +76,7 @@ dependencies {
     }
 
     def "resolves and caches all artifacts"() {
-        fixture.requestingTypes()
-                .expectSourceArtifact("sources")
+        fixture.expectSourceArtifact("sources")
                 .expectJavadocArtifact("javadoc")
                 .prepare()
 
@@ -99,10 +93,11 @@ dependencies {
 
     @Unroll
     def "fetches missing snapshot artifacts #condition"() {
-        initBuild(repo, "some.group:some-artifact:1.0-SNAPSHOT")
         buildFile << """
 if (project.hasProperty('nocache')) {
-    configurations.compile.resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
 }
 """
 
@@ -111,7 +106,7 @@ if (project.hasProperty('nocache')) {
         snapshotModule.publish()
 
         fixture.withComponentVersion("some.group", "some-artifact", "1.0-SNAPSHOT")
-                .requestingTypes(JvmLibrarySourcesArtifact)
+                .requestingTypes(SourcesArtifact)
                 .prepare()
 
         when:
@@ -149,10 +144,11 @@ if (project.hasProperty('nocache')) {
 
     @Unroll
     def "updates snapshot artifacts #condition"() {
-        initBuild(repo, "some.group:some-artifact:1.0-SNAPSHOT")
         buildFile << """
 if (project.hasProperty('nocache')) {
-    configurations.compile.resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
 }
 """
 
@@ -161,7 +157,7 @@ if (project.hasProperty('nocache')) {
         snapshotModule.publish()
 
         fixture.withComponentVersion("some.group", "some-artifact", "1.0-SNAPSHOT")
-                .requestingTypes(JvmLibrarySourcesArtifact)
+                .requestingTypes(SourcesArtifact)
                 .expectSourceArtifact("sources")
                 .prepare()
 
@@ -185,7 +181,7 @@ if (project.hasProperty('nocache')) {
         snapshotModule.pom.sha1.expectGet()
         snapshotModule.pom.expectGet()
         snapshotSources.expectHead()
-        // TODO:DAZ Extra head request should not be required
+        // TODO Extra head request should not be required
         snapshotSources.expectHead()
         snapshotSources.sha1.expectGet()
         snapshotSources.expectGet()
@@ -213,7 +209,7 @@ if (project.hasProperty('nocache')) {
     }
 
     def "resolve and caches missing artifacts of existing component"() {
-        fixture.requestingTypes().prepare()
+        fixture.prepare()
 
         when:
         module.pom.expectGet()
@@ -225,8 +221,7 @@ if (project.hasProperty('nocache')) {
     }
 
     def "resolves and caches artifacts where some are present"() {
-        fixture.requestingTypes()
-                .expectSourceArtifact("sources")
+        fixture.expectSourceArtifact("sources")
                 .prepare()
 
         when:
@@ -240,7 +235,7 @@ if (project.hasProperty('nocache')) {
     }
 
     def "reports on failure to list artifacts and recovers on subsequent resolve"() {
-        fixture.requestingTypes(JvmLibrarySourcesArtifact)
+        fixture.requestingTypes(SourcesArtifact)
                 .expectComponentResolutionFailure(new ArtifactResolveException("Could not determine artifacts for component 'some.group:some-artifact:1.0'"))
                 .prepare()
 
@@ -266,8 +261,10 @@ if (project.hasProperty('nocache')) {
     }
 
     def "resolves and recovers from broken artifacts"() {
-        fixture.requestingTypes(JvmLibraryJavadocArtifact)
-                .expectJavadocArtifactFailure(new ArtifactResolveException("Could not download artifact 'some.group:some-artifact:1.0:some-artifact-javadoc.jar'"))
+        fixture.requestingTypes(JavadocArtifact)
+                .expectJavadocArtifactFailure(new ArtifactResolveException(
+                                                "Could not download artifact 'some.group:some-artifact:1.0:some-artifact-javadoc.jar'",
+                                                new Throwable("Received status code 500 from server: broken")))
                 .prepare()
 
         when:
@@ -294,7 +291,7 @@ if (project.hasProperty('nocache')) {
     def "resolve and does not cache artifacts from local repository"() {
         initBuild(fileRepo)
 
-        fixture.requestingTypes(JvmLibrarySourcesArtifact)
+        fixture.requestingTypes(SourcesArtifact)
                 .expectSourceArtifact("sources")
                 .prepare()
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLatestResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLatestResolveIntegrationTest.groovy
index 25e0eaca9117..686ce9cb3ba7 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLatestResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenLatestResolveIntegrationTest.groovy
@@ -15,9 +15,9 @@
  */
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-class MavenLatestResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenLatestResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def "latest selector works correctly when no snapshot versions are present"() {
         given:
         mavenRepo().module('group', 'projectA', '1.0').publish()
@@ -67,7 +67,6 @@ task retrieve(type: Sync) {
 
     def "snapshot versions are considered integration status when using latest selector"() {
         given:
-        server.start()
         mavenHttpRepo.getModuleMetaData('group', 'projectA').allowGetOrHead()
         mavenHttpRepo.module('group', 'projectA', '1.0').publish().allowAll()
         mavenHttpRepo.module('group', 'projectA', '1.2-SNAPSHOT').publish().allowAll()
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenParentPomResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenParentPomResolveIntegrationTest.groovy
index 2891987867f4..243c0ef69e6f 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenParentPomResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenParentPomResolveIntegrationTest.groovy
@@ -15,15 +15,13 @@
  */
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import spock.lang.Issue
 
-class MavenParentPomResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenParentPomResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     def "includes dependencies from parent pom"() {
         given:
-        server.start()
-
         def parentDep = mavenHttpRepo.module("org", "parent_dep", "1.2").publish()
         def childDep = mavenHttpRepo.module("org", "child_dep", "1.7").publish()
 
@@ -80,8 +78,6 @@ task retrieve(type: Sync) {
     @Issue("GRADLE-2641")
     def "can handle parent pom with SNAPSHOT version"() {
         given:
-        server.start()
-
         def parent = mavenHttpRepo.module("org", "parent", "1.0-SNAPSHOT")
         parent.hasPackaging('pom')
         parent.publish()
@@ -118,7 +114,6 @@ task retrieve(type: Sync) {
 
     def "looks for parent pom in different repository"() {
         given:
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo2 = mavenHttpRepo("repo2")
 
@@ -163,7 +158,6 @@ task retrieve(type: Sync) {
 
     def "fails with reasonable message if parent module is an ivy module"() {
         given:
-        server.start()
         def child = mavenHttpRepo.module("org", "child")
         child.parent("org", "parent", "1.0")
         child.publish()
@@ -200,8 +194,6 @@ task retrieve(type: Sync) {
 
     def "uses cached parent pom located in a different repository"() {
         given:
-        server.start()
-
         def repo1 = mavenHttpRepo("repo1")
         def repo2 = mavenHttpRepo("repo2")
 
@@ -275,8 +267,6 @@ task retrieveChild2(type: Sync) {
     @Issue("GRADLE-2861")
     def "two modules that share common parent"() {
         given:
-        server.start()
-
         def parent = mavenHttpRepo.module("org", "parent", "1.0")
         parent.hasPackaging('pom')
         parent.publish()
@@ -321,8 +311,6 @@ task retrieve(type: Sync) {
     @Issue("GRADLE-2861")
     def "module that has a parent and grandparent module"() {
         given:
-        server.start()
-
         def grandParent = mavenHttpRepo.module("org", "grandparent", "1.0")
         grandParent.hasPackaging('pom')
         grandParent.publish()
@@ -366,8 +354,6 @@ task retrieve(type: Sync) {
 
     def "parent pom parsing with custom properties for dependency coordinates"() {
         given:
-        server.start()
-
         def parent = mavenHttpRepo.module('group', 'parent', '1.0').publish()
         parent.pomFile.text = parent.pomFile.text.replace("</project>", """
 <properties>
@@ -415,8 +401,6 @@ task retrieve(type: Sync) {
 
     def "dependency with same group ID and artifact ID defined in child and parent is used from child"() {
         given:
-        server.start()
-
         def parent = mavenHttpRepo.module('group', 'parent', '1.0').dependsOn('my.group', 'myartifact', '1.1').publish()
         mavenHttpRepo.module('my.group', 'myartifact', '1.1').publish()
         def depModule = mavenHttpRepo.module('my.group', 'myartifact', '1.3').publish()
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomPackagingResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomPackagingResolveIntegrationTest.groovy
index 9d86a627ea13..872a627e51de 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomPackagingResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomPackagingResolveIntegrationTest.groovy
@@ -15,20 +15,19 @@
  */
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
-import org.gradle.test.fixtures.maven.MavenHttpModule
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
+import org.gradle.test.fixtures.server.http.MavenHttpModule
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import spock.lang.FailsWith
 import spock.lang.Issue
 
-class MavenPomPackagingResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenPomPackagingResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     MavenHttpRepository repo1
     MavenHttpRepository repo2
     MavenHttpModule projectARepo1
     MavenHttpModule projectARepo2
 
     public setup() {
-        server.start()
         repo1 = mavenHttpRepo("repo1")
         repo2 = mavenHttpRepo("repo2")
         projectARepo1 = repo1.module('group', 'projectA')
@@ -268,7 +267,7 @@ if (project.hasProperty('skipCache')) {
         fails 'retrieve'
 
         and:
-        result.error.contains("Artifact 'group:projectA:1.0:projectA.jar' not found.")
+        failure.assertHasCause("Artifact 'group:projectA:1.0:projectA.jar' not found.")
     }
 
     def "will use non-jar dependency type to determine jar artifact location"() {
@@ -287,9 +286,6 @@ compile('group:projectA:1.0') {
 
         and:
         projectARepo1.pom.expectGet()
-
-        // TODO:GRADLE-2188 This call should not be required, since "type='zip'" on the dependency alleviates the need to check for the packaging artifact
-        projectARepo1.artifact(type: 'custom').expectHeadMissing()
         projectARepo1.artifact(type: 'zip').expectGet()
 
         then:
@@ -321,8 +317,6 @@ compile 'group:mavenProject:1.0'
         mavenProject.artifact.expectHeadMissing()
 
         projectARepo1.pom.expectGet()
-        // TODO:GRADLE-2188 This call should not be required, since "type='zip'" on the dependency alleviates the need to check for the packaging artifact
-        projectARepo1.artifact(type: 'custom').expectHeadMissing()
         projectARepo1.artifact(type: 'zip').expectGet()
 
         then:
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomResolveIntegrationTest.groovy
index 957be86cb273..1aea8d428714 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenPomResolveIntegrationTest.groovy
@@ -16,12 +16,10 @@
 
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 
-class MavenPomResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenPomResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     def "follows relocation to another group"() {
-        server.start()
-
         given:
         def original = mavenHttpRepo.module("groupA", "projectA", "1.2").publishPom()
         original.pomFile.text = """
@@ -53,6 +51,7 @@ task retrieve(type: Sync) {
 
         and:
         original.pom.expectGet()
+        original.artifact.expectHead()
         newModule.pom.expectGet()
         newModule.artifact.expectGet()
 
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenProfileResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenProfileResolveIntegrationTest.groovy
index 358a14c8bfb0..15c904993c60 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenProfileResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenProfileResolveIntegrationTest.groovy
@@ -16,17 +16,17 @@
 
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
 import org.gradle.integtests.resolve.ResolveTestFixture
+import org.gradle.internal.id.UUIDGenerator
 
-class MavenProfileResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenProfileResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
     ResolveTestFixture resolve
 
     def setup() {
         settingsFile << "rootProject.name = 'test' "
         resolve = new ResolveTestFixture(buildFile)
         resolve.prepare()
-        server.start()
     }
 
     def "uses properties from active profile to resolve dependency"() {
@@ -215,4 +215,271 @@ dependencies { compile 'groupA:artifactA:1.2' }
             }
         }
     }
+
+    def "uses properties from profile activated by the absence of a property"() {
+        given:
+        String customPropertyName = new UUIDGenerator().generateId()
+        def requestedModule = mavenHttpRepo.module("groupA", "artifactA", "1.2").publish()
+        requestedModule.pomFile.text = """
+<project>
+    <groupId>groupA</groupId>
+    <artifactId>artifactA</artifactId>
+    <version>1.2</version>
+    <dependencies>
+        <dependency>
+            <groupId>\${groupId.prop}</groupId>
+            <artifactId>\${artifactId.prop}</artifactId>
+            <version>\${version.prop}</version>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <properties>
+                <groupId.prop>groupB</groupId.prop>
+                <artifactId.prop>artifactB</artifactId.prop>
+                <version.prop>1.4</version.prop>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        def transitiveModule = mavenHttpRepo.module("groupB", "artifactB", "1.4").publish()
+
+        and:
+        buildFile << """
+repositories { maven { url '${mavenHttpRepo.uri}' } }
+configurations { compile }
+dependencies { compile 'groupA:artifactA:1.2' }
+"""
+
+        and:
+        requestedModule.pom.expectGet()
+        requestedModule.artifact.expectGet()
+        transitiveModule.pom.expectGet()
+        transitiveModule.artifact.expectGet()
+
+        when:
+        run "checkDeps"
+
+        then:
+        resolve.expectGraph {
+            root(":", ":test:unspecified") {
+                module("groupA:artifactA:1.2") {
+                    module("groupB:artifactB:1.4")
+                }
+            }
+        }
+    }
+
+    def "uses properties from profile activated by absence of system property over active by default to resolve dependency"() {
+        given:
+        def requestedModule = mavenHttpRepo.module("groupA", "artifactA", "1.2").publish()
+        requestedModule.pomFile.text = """
+<project>
+    <groupId>groupA</groupId>
+    <artifactId>artifactA</artifactId>
+    <version>1.2</version>
+    <dependencies>
+        <dependency>
+            <groupId>\${groupId.prop}</groupId>
+            <artifactId>\${artifactId.prop}</artifactId>
+            <version>\${version.prop}</version>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <groupId.prop>groupB</groupId.prop>
+                <artifactId.prop>artifactB</artifactId.prop>
+                <version.prop>1.4</version.prop>
+            </properties>
+        </profile>
+        <profile>
+            <id>profile-2</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <properties>
+                <groupId.prop>groupB</groupId.prop>
+                <artifactId.prop>artifactB</artifactId.prop>
+                <version.prop>1.5</version.prop>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        def transitiveModule = mavenHttpRepo.module("groupB", "artifactB", "1.5").publish()
+
+        and:
+        buildFile << """
+repositories { maven { url '${mavenHttpRepo.uri}' } }
+configurations { compile }
+dependencies { compile 'groupA:artifactA:1.2' }
+"""
+
+        and:
+        requestedModule.pom.expectGet()
+        requestedModule.artifact.expectGet()
+        transitiveModule.pom.expectGet()
+        transitiveModule.artifact.expectGet()
+
+        when:
+        run "checkDeps"
+
+        then:
+        resolve.expectGraph {
+            root(":", ":test:unspecified") {
+                module("groupA:artifactA:1.2") {
+                    module("groupB:artifactB:1.5")
+                }
+            }
+        }
+    }
+
+    def "uses dependency management defaults from profile activated by absence of system property to resolve dependency"() {
+        given:
+        def requestedModule = mavenHttpRepo.module("groupA", "artifactA", "1.2").publish()
+        requestedModule.pomFile.text = """
+<project>
+    <groupId>groupA</groupId>
+    <artifactId>artifactA</artifactId>
+    <version>1.2</version>
+    <dependencies>
+        <dependency>
+            <groupId>groupB</groupId>
+            <artifactId>artifactB</artifactId>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>groupB</groupId>
+                        <artifactId>artifactB</artifactId>
+                        <version>1.4</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        def transitiveModule = mavenHttpRepo.module("groupB", "artifactB", "1.4").publish()
+
+        and:
+        buildFile << """
+repositories { maven { url '${mavenHttpRepo.uri}' } }
+configurations { compile }
+dependencies { compile 'groupA:artifactA:1.2' }
+"""
+
+        and:
+        requestedModule.pom.expectGet()
+        requestedModule.artifact.expectGet()
+        transitiveModule.pom.expectGet()
+        transitiveModule.artifact.expectGet()
+
+        when:
+        run "checkDeps"
+
+        then:
+        resolve.expectGraph {
+            root(":", ":test:unspecified") {
+                module("groupA:artifactA:1.2") {
+                    module("groupB:artifactB:1.4")
+                }
+            }
+        }
+    }
+
+    def "resolves dependency from profile activated by absence of system property"() {
+        given:
+        def requestedModule = mavenHttpRepo.module("groupA", "artifactA", "1.2").publish()
+        requestedModule.pomFile.text = """
+<project>
+    <groupId>groupA</groupId>
+    <artifactId>artifactA</artifactId>
+    <version>1.2</version>
+    <dependencies>
+        <dependency>
+            <groupId>groupB</groupId>
+            <artifactId>artifactB</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>groupB</groupId>
+            <artifactId>artifactB</artifactId>
+            <version>1.7</version>
+        </dependency>
+    </dependencies>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                    <value>BLUE</value>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>groupB</groupId>
+                    <artifactId>artifactB</artifactId>
+                    <version>1.4</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        def transitiveModule = mavenHttpRepo.module("groupB", "artifactB", "1.4").publish()
+
+        and:
+        buildFile << """
+repositories { maven { url '${mavenHttpRepo.uri}' } }
+configurations { compile }
+dependencies { compile 'groupA:artifactA:1.2' }
+"""
+
+        and:
+        requestedModule.pom.expectGet()
+        requestedModule.artifact.expectGet()
+        transitiveModule.pom.expectGet()
+        transitiveModule.artifact.expectGet()
+
+        when:
+        run "checkDeps"
+
+        then:
+        resolve.expectGraph {
+            root(":", ":test:unspecified") {
+                module("groupA:artifactA:1.2") {
+                    module("groupB:artifactB:1.4")
+                }
+            }
+        }
+    }
 }
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSftpRepoResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSftpRepoResolveIntegrationTest.groovy
new file mode 100644
index 000000000000..5ae2ca8558b2
--- /dev/null
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSftpRepoResolveIntegrationTest.groovy
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.resolve.maven
+
+import org.gradle.integtests.fixtures.AbstractSftpDependencyResolutionTest
+
+class MavenSftpRepoResolveIntegrationTest extends AbstractSftpDependencyResolutionTest {
+    void "can resolve dependencies from a SFTP Maven repository"() {
+        given:
+        def mavenSftpRepo = getMavenSftpRepo()
+        def module = mavenSftpRepo.module('org.group.name', 'projectA', '1.2')
+        module.publish()
+
+        and:
+        buildFile << """
+            repositories {
+                maven {
+                    url "${mavenSftpRepo.uri}"
+                    credentials {
+                        username 'sftp'
+                        password 'sftp'
+                    }
+                }
+            }
+            configurations { compile }
+            dependencies { compile 'org.group.name:projectA:1.2' }
+            task retrieve(type: Sync) {
+                from configurations.compile
+                into 'libs'
+            }
+        """
+
+        when:
+        module.pom.expectMetadataRetrieve()
+        module.pom.expectFileDownload()
+
+        module.artifact.expectMetadataRetrieve()
+        module.artifact.expectFileDownload()
+
+        then:
+        succeeds 'retrieve'
+        file('libs').assertHasDescendants 'projectA-1.2.jar'
+    }
+}
diff --git a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSnapshotResolveIntegrationTest.groovy b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSnapshotResolveIntegrationTest.groovy
index 83cb4ec0e1e6..17eee92c0845 100644
--- a/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSnapshotResolveIntegrationTest.groovy
+++ b/subprojects/core-impl/src/integTest/groovy/org/gradle/integtests/resolve/maven/MavenSnapshotResolveIntegrationTest.groovy
@@ -15,15 +15,14 @@
  */
 package org.gradle.integtests.resolve.maven
 
-import org.gradle.integtests.fixtures.AbstractDependencyResolutionTest
-import org.gradle.test.fixtures.maven.MavenHttpModule
+import org.gradle.integtests.fixtures.AbstractHttpDependencyResolutionTest
+import org.gradle.test.fixtures.server.http.MavenHttpModule
 import spock.lang.Ignore
 import spock.lang.Issue
 
-class MavenSnapshotResolveIntegrationTest extends AbstractDependencyResolutionTest {
+class MavenSnapshotResolveIntegrationTest extends AbstractHttpDependencyResolutionTest {
 
     def "can find and cache snapshots in multiple Maven HTTP repositories"() {
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo2 = mavenHttpRepo("repo2")
 
@@ -85,7 +84,6 @@ task retrieve(type: Sync) {
     }
 
     def "can find and cache snapshots in Maven HTTP repository with additional artifact urls"() {
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
         def repo2 = mavenHttpRepo("repo2")
 
@@ -144,7 +142,6 @@ task retrieve(type: Sync) {
     }
 
     def "can find and cache snapshots in Maven HTTP repository with artifact classifier"() {
-        server.start()
         def repo1 = mavenHttpRepo("repo1")
 
         given:
@@ -194,8 +191,6 @@ task retrieve(type: Sync) {
     }
 
     def "will detect changed snapshot artifacts when pom has not changed"() {
-        server.start()
-
         buildFile << """
 repositories {
     maven { url "${mavenHttpRepo.uri}" }
@@ -251,8 +246,6 @@ task retrieve(type: Sync) {
     }
 
     def "uses cached snapshots from a Maven HTTP repository until the snapshot timeout is reached"() {
-        server.start()
-
         given:
         buildFile << """
 repositories {
@@ -323,8 +316,6 @@ task retrieve(type: Sync) {
     }
 
     def "does not download snapshot artifacts after expiry when snapshot has not changed"() {
-        server.start()
-
         buildFile << """
 repositories {
     maven { url "${mavenHttpRepo.uri}" }
@@ -373,7 +364,6 @@ task retrieve(type: Sync) {
     }
 
     def "does not download snapshot artifacts more than once per build"() {
-        server.start()
         given:
         def module = mavenHttpRepo.module("org.gradle.integtests.resolve", "testproject", "1.0-SNAPSHOT").publish()
 
@@ -419,7 +409,6 @@ tasks.getByPath(":a:retrieve").dependsOn ":b:retrieve"
 
     @Ignore //TODO SF need to rework this test. First step might be turning off in-memory metadata caching for this test.
     def "can update snapshot artifact during build even if it is locked earlier in build"() {
-        server.start()
         given:
         def module = mavenHttpRepo("/repo", maven("repo1")).module("org.gradle.integtests.resolve", "testproject", "1.0-SNAPSHOT").withNonUniqueSnapshots().publish()
         def module2 = mavenHttpRepo("/repo", maven("repo2")).module("org.gradle.integtests.resolve", "testproject", "1.0-SNAPSHOT").withNonUniqueSnapshots().publish()
@@ -493,8 +482,6 @@ project('second') {
     }
 
     def "avoid redownload unchanged artifact when no checksum available"() {
-        server.start()
-
         given:
         buildFile << """
             repositories {
@@ -566,8 +553,6 @@ project('second') {
     @Issue("GRADLE-3017")
     def "resolves changed metadata in snapshot dependency"() {
         given:
-        server.start()
-
         def projectB1 = mavenHttpRepo.module('group', 'projectB', '1.0').publish()
         def projectB2 = mavenHttpRepo.module('group', 'projectB', '2.0').publish()
         def projectA = mavenHttpRepo.module('group', 'projectA', "1.0-SNAPSHOT").dependsOn('group', 'projectB', '1.0').publish()
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java
index ff2b74731c79..a91144adb305 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java
@@ -15,6 +15,7 @@
  */
 package org.gradle.api.internal.artifacts;
 
+import org.gradle.api.Project;
 import org.gradle.api.artifacts.PublishArtifact;
 import org.gradle.api.artifacts.dsl.ArtifactHandler;
 import org.gradle.api.artifacts.dsl.ComponentMetadataHandler;
@@ -38,12 +39,13 @@
 import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.PublishLocalComponentFactory;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
 import org.gradle.api.internal.artifacts.mvnsettings.LocalMavenRepositoryLocator;
+import org.gradle.api.internal.artifacts.query.DefaultArtifactResolutionQueryFactory;
 import org.gradle.api.internal.artifacts.repositories.DefaultBaseRepositoryFactory;
 import org.gradle.api.internal.artifacts.repositories.legacy.LegacyDependencyResolverRepositoryFactory;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory;
-import org.gradle.api.internal.artifacts.resolution.DefaultArtifactResolutionQueryFactory;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore;
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.internal.service.DefaultServiceRegistry;
 import org.gradle.internal.service.ServiceRegistration;
@@ -77,7 +79,7 @@ private static class DependencyResolutionScopeServices {
         BaseRepositoryFactory createBaseRepositoryFactory(LocalMavenRepositoryLocator localMavenRepositoryLocator, Instantiator instantiator, FileResolver fileResolver,
                                                           RepositoryTransportFactory repositoryTransportFactory, LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
                                                           LegacyDependencyResolverRepositoryFactory legacyDependencyResolverRepositoryFactory,
-                                                          ResolverStrategy resolverStrategy) {
+                                                          ResolverStrategy resolverStrategy, ArtifactIdentifierFileStore artifactIdentifierFileStore) {
             return new DefaultBaseRepositoryFactory(
                     localMavenRepositoryLocator,
                     fileResolver,
@@ -85,7 +87,8 @@ BaseRepositoryFactory createBaseRepositoryFactory(LocalMavenRepositoryLocator lo
                     repositoryTransportFactory,
                     locallyAvailableResourceFinder,
                     legacyDependencyResolverRepositoryFactory,
-                    resolverStrategy
+                    resolverStrategy,
+                    artifactIdentifierFileStore
             );
         }
 
@@ -143,6 +146,12 @@ ArtifactResolutionQueryFactory createArtifactResolutionQueryFactory(Configuratio
         }
     }
 
+    private static class DependencyMetaDataProviderImpl implements DependencyMetaDataProvider {
+        public ModuleInternal getModule() {
+            return new DefaultModule("unspecified", "unspecified", Project.DEFAULT_VERSION, Project.DEFAULT_STATUS);
+        }
+    }
+
     private static class DefaultDependencyResolutionServices implements DependencyResolutionServices {
         private final ServiceRegistry services;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifact.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifact.java
index 70e081470bc7..e6026913cc7c 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifact.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifact.java
@@ -16,11 +16,9 @@
 package org.gradle.api.internal.artifacts;
 
 import org.gradle.api.artifacts.ResolvedArtifact;
-import org.gradle.api.artifacts.ResolvedDependency;
 import org.gradle.api.artifacts.ResolvedModuleVersion;
 import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
 import org.gradle.internal.Factory;
-import org.gradle.util.DeprecationLogger;
 
 import java.io.File;
 
@@ -28,12 +26,10 @@ public class DefaultResolvedArtifact implements ResolvedArtifact {
     private final ResolvedModuleVersion owner;
     private final IvyArtifactName artifact;
     private long id;
-    private final Factory<ResolvedDependency> ownerSource;
     private Factory<File> artifactSource;
     private File file;
 
-    public DefaultResolvedArtifact(ResolvedModuleVersion owner, Factory<ResolvedDependency> ownerSource, IvyArtifactName artifact, Factory<File> artifactSource, long id) {
-        this.ownerSource = ownerSource;
+    public DefaultResolvedArtifact(ResolvedModuleVersion owner, IvyArtifactName artifact, Factory<File> artifactSource, long id) {
         this.owner = owner;
         this.artifact = artifact;
         this.id = id;
@@ -44,15 +40,6 @@ public long getId() {
         return id;
     }
 
-    public ResolvedDependency getResolvedDependency() {
-        DeprecationLogger.nagUserOfDeprecated(
-                "ResolvedArtifact.getResolvedDependency()",
-                "For version info use ResolvedArtifact.getModuleVersion(), to access the dependency graph use ResolvedConfiguration.getFirstLevelModuleDependencies()"
-        );
-        //resolvedDependency is expensive so lazily create it
-        return ownerSource.create();
-    }
-
     public ResolvedModuleVersion getModuleVersion() {
         return owner;
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java
index 3e7ca5ef44e7..b4758023a046 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java
@@ -27,7 +27,7 @@
 import org.gradle.api.internal.artifacts.ivyservice.dynamicversions.SingleFileBackedModuleVersionsCache;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ResolveIvyFactory;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.StartParameterResolutionOverride;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache.InMemoryDependencyMetadataCache;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache.InMemoryCachedRepositoryFactory;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestVersionStrategy;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
@@ -37,6 +37,7 @@
 import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleArtifactsCache;
 import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleMetaDataCache;
 import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.PublishLocalComponentFactory;
+import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.DependencyDescriptorFactory;
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.DefaultProjectComponentRegistry;
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.DefaultProjectPublicationRegistry;
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.ProjectPublicationRegistry;
@@ -44,21 +45,20 @@
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.store.ResolutionResultsStoreFactory;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
 import org.gradle.api.internal.artifacts.mvnsettings.*;
-import org.gradle.api.internal.artifacts.repositories.cachemanager.DownloadingRepositoryArtifactCache;
-import org.gradle.api.internal.artifacts.repositories.cachemanager.LocalFileRepositoryArtifactCache;
 import org.gradle.api.internal.artifacts.repositories.legacy.CustomIvyResolverRepositoryFactory;
 import org.gradle.api.internal.artifacts.repositories.legacy.DownloadingRepositoryCacheManager;
 import org.gradle.api.internal.artifacts.repositories.legacy.LegacyDependencyResolverRepositoryFactory;
 import org.gradle.api.internal.artifacts.repositories.legacy.LocalFileRepositoryCacheManager;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory;
-import org.gradle.api.internal.externalresource.cached.ByUrlCachedExternalResourceIndex;
-import org.gradle.api.internal.externalresource.ivy.ArtifactAtRepositoryCachedArtifactIndex;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
-import org.gradle.api.internal.externalresource.local.ivy.LocallyAvailableResourceFinderFactory;
+import org.gradle.internal.resource.cached.ByUrlCachedExternalResourceIndex;
+import org.gradle.internal.resource.cached.ivy.ArtifactAtRepositoryCachedArtifactIndex;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.ivy.LocallyAvailableResourceFinderFactory;
+import org.gradle.internal.resource.transport.sftp.SftpClientFactory;
 import org.gradle.api.internal.file.FileLookup;
 import org.gradle.api.internal.file.TemporaryFileProvider;
 import org.gradle.api.internal.file.TmpDirTemporaryFileProvider;
-import org.gradle.api.internal.filestore.UniquePathKeyFileStore;
+import org.gradle.internal.resource.local.UniquePathKeyFileStore;
 import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore;
 import org.gradle.api.internal.notations.*;
 import org.gradle.api.internal.project.ProjectInternal;
@@ -79,8 +79,8 @@
  * The set of dependency management services that are created per build.
  */
 class DependencyManagementBuildScopeServices {
-    InMemoryDependencyMetadataCache createInMemoryDependencyMetadataCache() {
-        return new InMemoryDependencyMetadataCache();
+    InMemoryCachedRepositoryFactory createInMemoryDependencyMetadataCache() {
+        return new InMemoryCachedRepositoryFactory();
     }
 
     DependencyManagementServices createDependencyManagementServices(ServiceRegistry parent) {
@@ -193,28 +193,23 @@ LatestStrategy createLatestStrategy(VersionMatcher versionMatcher) {
         return new LatestVersionStrategy(versionMatcher);
     }
 
-    LocalFileRepositoryArtifactCache createLocalRepositoryArtifactCache() {
-        return new LocalFileRepositoryArtifactCache();
+    SftpClientFactory createSftpClientFactory() {
+        return new SftpClientFactory();
     }
 
-    DownloadingRepositoryArtifactCache createDownloadingRepositoryArtifactCache(ArtifactIdentifierFileStore artifactIdentifierFileStore, ByUrlCachedExternalResourceIndex externalResourceIndex,
-                                                                                TemporaryFileProvider temporaryFileProvider, CacheLockingManager cacheLockingManager) {
-        return new DownloadingRepositoryArtifactCache(artifactIdentifierFileStore,
-                externalResourceIndex,
-                temporaryFileProvider,
-                cacheLockingManager);
-    }
-
-    RepositoryTransportFactory createRepositoryTransportFactory(ProgressLoggerFactory progressLoggerFactory, LocalFileRepositoryArtifactCache localFileRepositoryArtifactCache,
-                                                                DownloadingRepositoryArtifactCache downloadingRepositoryArtifactCache, TemporaryFileProvider temporaryFileProvider,
-                                                                ByUrlCachedExternalResourceIndex externalResourceIndex, BuildCommencedTimeProvider buildCommencedTimeProvider) {
+    RepositoryTransportFactory createRepositoryTransportFactory(ProgressLoggerFactory progressLoggerFactory,
+                                                                TemporaryFileProvider temporaryFileProvider,
+                                                                ByUrlCachedExternalResourceIndex externalResourceIndex,
+                                                                BuildCommencedTimeProvider buildCommencedTimeProvider,
+                                                                SftpClientFactory sftpClientFactory,
+                                                                CacheLockingManager cacheLockingManager) {
         return new RepositoryTransportFactory(
                 progressLoggerFactory,
-                localFileRepositoryArtifactCache,
-                downloadingRepositoryArtifactCache,
                 temporaryFileProvider,
                 externalResourceIndex,
-                buildCommencedTimeProvider
+                buildCommencedTimeProvider,
+                sftpClientFactory,
+                cacheLockingManager
         );
     }
 
@@ -234,7 +229,7 @@ LegacyDependencyResolverRepositoryFactory createCustomerResolverRepositoryFactor
 
     ResolveIvyFactory createResolveIvyFactory(StartParameter startParameter, ModuleVersionsCache moduleVersionsCache, ModuleMetaDataCache moduleMetaDataCache, ModuleArtifactsCache moduleArtifactsCache,
                                               ArtifactAtRepositoryCachedArtifactIndex artifactAtRepositoryCachedArtifactIndex, CacheLockingManager cacheLockingManager,
-                                              BuildCommencedTimeProvider buildCommencedTimeProvider, InMemoryDependencyMetadataCache inMemoryDependencyMetadataCache,
+                                              BuildCommencedTimeProvider buildCommencedTimeProvider, InMemoryCachedRepositoryFactory inMemoryCachedRepositoryFactory,
                                               VersionMatcher versionMatcher, LatestStrategy latestStrategy) {
         StartParameterResolutionOverride startParameterResolutionOverride = new StartParameterResolutionOverride(startParameter);
         return new ResolveIvyFactory(
@@ -245,18 +240,19 @@ ResolveIvyFactory createResolveIvyFactory(StartParameter startParameter, ModuleV
                 cacheLockingManager,
                 startParameterResolutionOverride,
                 buildCommencedTimeProvider,
-                inMemoryDependencyMetadataCache,
+                inMemoryCachedRepositoryFactory,
                 versionMatcher,
                 latestStrategy);
     }
 
-    ArtifactDependencyResolver createArtifactDependencyResolver(ResolveIvyFactory resolveIvyFactory, PublishLocalComponentFactory publishModuleDescriptorConverter,
+    ArtifactDependencyResolver createArtifactDependencyResolver(ResolveIvyFactory resolveIvyFactory, PublishLocalComponentFactory publishModuleDescriptorConverter, DependencyDescriptorFactory dependencyDescriptorFactory,
                                                                 CacheLockingManager cacheLockingManager, IvyContextManager ivyContextManager, ResolutionResultsStoreFactory resolutionResultsStoreFactory,
                                                                 VersionMatcher versionMatcher, LatestStrategy latestStrategy, ProjectRegistry<ProjectInternal> projectRegistry,
                                                                 ComponentIdentifierFactory componentIdentifierFactory) {
         ArtifactDependencyResolver resolver = new DefaultDependencyResolver(
                 resolveIvyFactory,
                 publishModuleDescriptorConverter,
+                dependencyDescriptorFactory,
                 new DefaultProjectComponentRegistry(
                         publishModuleDescriptorConverter,
                         projectRegistry),
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServices.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServices.java
index 77d9f071cc9e..7052953ca9e4 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServices.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/DependencyManagementGlobalScopeServices.java
@@ -49,17 +49,10 @@ ConfigurationsToModuleDescriptorConverter createConfigurationsToModuleDescriptor
     }
 
     DependencyDescriptorFactory createDependencyDescriptorFactory(ExcludeRuleConverter excludeRuleConverter, ExternalModuleIvyDependencyDescriptorFactory descriptorFactory) {
-        DefaultClientModuleMetaDataFactory clientModuleDescriptorFactory = new DefaultClientModuleMetaDataFactory();
-        DependencyDescriptorFactory dependencyDescriptorFactory = new DefaultDependencyDescriptorFactory(
-                new ClientModuleIvyDependencyDescriptorFactory(
-                        excludeRuleConverter,
-                        clientModuleDescriptorFactory
-                ),
+        return new DefaultDependencyDescriptorFactory(
                 new ProjectIvyDependencyDescriptorFactory(
                         excludeRuleConverter),
                 descriptorFactory);
-        clientModuleDescriptorFactory.setDependencyDescriptorFactory(dependencyDescriptorFactory);
-        return dependencyDescriptorFactory;
     }
 
     ResolveLocalComponentFactory createResolveModuleDescriptorConverter(ModuleDescriptorFactory moduleDescriptorFactory,
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfiguration.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfiguration.java
index 177b0c3a652c..7a4f1a8b1483 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfiguration.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfiguration.java
@@ -25,8 +25,6 @@
 import org.gradle.api.internal.DefaultDomainObjectSet;
 import org.gradle.api.internal.artifacts.*;
 import org.gradle.api.internal.file.AbstractFileCollection;
-import org.gradle.api.internal.tasks.AbstractTaskDependency;
-import org.gradle.api.internal.tasks.TaskDependencyResolveContext;
 import org.gradle.api.specs.Spec;
 import org.gradle.api.specs.Specs;
 import org.gradle.api.tasks.TaskDependency;
@@ -256,48 +254,11 @@ public TaskDependency getBuildDependencies() {
      * {@inheritDoc}
      */
     public TaskDependency getTaskDependencyFromProjectDependency(final boolean useDependedOn, final String taskName) {
-        return new AbstractTaskDependency() {
-            public void resolve(TaskDependencyResolveContext context) {
-                if (useDependedOn) {
-                    addTaskDependenciesFromProjectsIDependOn(taskName, context);
-                } else {
-                    Project thisProject = context.getTask().getProject();
-                    addTaskDependenciesFromProjectsDependingOnMe(thisProject, taskName, context);
-                }
-            }
-
-            private void addTaskDependenciesFromProjectsIDependOn(final String taskName,
-                                                                  final TaskDependencyResolveContext context) {
-                Set<ProjectDependency> projectDependencies = getAllDependencies().withType(ProjectDependency.class);
-                for (ProjectDependency projectDependency : projectDependencies) {
-                    Task nextTask = projectDependency.getDependencyProject().getTasks().findByName(taskName);
-                    if (nextTask != null) {
-                        context.add(nextTask);
-                    }
-                }
-            }
-
-            private void addTaskDependenciesFromProjectsDependingOnMe(final Project thisProject, final String taskName,
-                                                                      final TaskDependencyResolveContext context) {
-                Set<Task> tasksWithName = thisProject.getRootProject().getTasksByName(taskName, true);
-                for (Task nextTask : tasksWithName) {
-                    Configuration configuration = nextTask.getProject().getConfigurations().findByName(getName());
-                    if (configuration != null && doesConfigurationDependOnProject(configuration, thisProject)) {
-                        context.add(nextTask);
-                    }
-                }
-            }
-        };
-    }
-
-    private static boolean doesConfigurationDependOnProject(Configuration configuration, Project project) {
-        Set<ProjectDependency> projectDependencies = configuration.getAllDependencies().withType(ProjectDependency.class);
-        for (ProjectDependency projectDependency : projectDependencies) {
-            if (projectDependency.getDependencyProject().equals(project)) {
-                return true;
-            }
+        if (useDependedOn) {
+            return new TasksFromProjectDependencies(taskName, getAllDependencies());
+        } else {
+            return new TasksFromDependentProjects(taskName, getName());
         }
-        return false;
     }
 
     public DependencySet getDependencies() {
@@ -569,4 +530,5 @@ public ResolutionResult getResolutionResult() {
             return DefaultConfiguration.this.cachedResolverResults.getResolutionResult();
         }
     }
+
 }
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromDependentProjects.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromDependentProjects.java
new file mode 100644
index 000000000000..255ad6560223
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromDependentProjects.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.configurations;
+
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.artifacts.Configuration;
+import org.gradle.api.artifacts.ProjectDependency;
+import org.gradle.api.internal.tasks.AbstractTaskDependency;
+import org.gradle.api.internal.tasks.TaskDependencyResolveContext;
+
+import java.util.Set;
+
+class TasksFromDependentProjects extends AbstractTaskDependency {
+
+    private final String taskName;
+    private final String configurationName;
+    private final TaskDependencyChecker checker;
+
+    public TasksFromDependentProjects(String taskName, String configurationName) {
+        this(taskName, configurationName, new TaskDependencyChecker());
+    }
+
+    public TasksFromDependentProjects(String taskName, String configurationName, TaskDependencyChecker checker) {
+        this.taskName = taskName;
+        this.configurationName = configurationName;
+        this.checker = checker;
+    }
+
+    public void resolve(TaskDependencyResolveContext context) {
+        Project thisProject = context.getTask().getProject();
+        Set<Task> tasksWithName = thisProject.getRootProject().getTasksByName(taskName, true);
+        for (Task nextTask : tasksWithName) {
+            boolean isDependency = checker.isDependent(thisProject, configurationName, nextTask.getProject());
+            if (isDependency) {
+                context.add(nextTask);
+            }
+        }
+    }
+
+    static class TaskDependencyChecker {
+        //checks if candidate project is dependent of the origin project with given configuration
+        boolean isDependent(Project originProject, String configurationName, Project candidateProject) {
+            Configuration configuration = candidateProject.getConfigurations().findByName(configurationName);
+            return configuration != null && doesConfigurationDependOnProject(configuration, originProject);
+        }
+
+        private static boolean doesConfigurationDependOnProject(Configuration configuration, Project project) {
+            Set<ProjectDependency> projectDependencies = configuration.getAllDependencies().withType(ProjectDependency.class);
+            for (ProjectDependency projectDependency : projectDependencies) {
+                if (projectDependency.getDependencyProject().equals(project)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public String getConfigurationName() {
+        return configurationName;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromProjectDependencies.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromProjectDependencies.java
new file mode 100644
index 000000000000..68b9097817a7
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromProjectDependencies.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.configurations;
+
+import org.gradle.api.Task;
+import org.gradle.api.artifacts.DependencySet;
+import org.gradle.api.artifacts.ProjectDependency;
+import org.gradle.api.internal.project.ProjectInternal;
+import org.gradle.api.internal.tasks.AbstractTaskDependency;
+import org.gradle.api.internal.tasks.TaskDependencyResolveContext;
+
+import java.util.Set;
+
+class TasksFromProjectDependencies extends AbstractTaskDependency {
+    private final String taskName;
+    private final DependencySet dependencies;
+
+    public TasksFromProjectDependencies(String taskName, DependencySet dependencies) {
+        this.taskName = taskName;
+        this.dependencies = dependencies;
+    }
+
+    public void resolve(TaskDependencyResolveContext context) {
+        resolveProjectDependencies(context, dependencies.withType(ProjectDependency.class));
+    }
+
+    void resolveProjectDependencies(TaskDependencyResolveContext context, Set<ProjectDependency> projectDependencies) {
+        for (ProjectDependency projectDependency : projectDependencies) {
+            //in configure-on-demand we don't know if the project was configured, hence explicit evaluate.
+            // Not especially tidy, we should clean this up while working on new configuration model.
+            ((ProjectInternal) projectDependency.getDependencyProject()).evaluate();
+
+            Task nextTask = projectDependency.getDependencyProject().getTasks().findByName(taskName);
+            if (nextTask != null) {
+                context.add(nextTask);
+            }
+        }
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandler.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandler.java
index 0b717c68c255..7009d8cf6b63 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandler.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandler.java
@@ -15,33 +15,71 @@
  */
 package org.gradle.api.internal.artifacts.dsl;
 
+import com.google.common.collect.Lists;
+import groovy.lang.Closure;
 import org.gradle.api.Action;
+import org.gradle.api.GradleException;
 import org.gradle.api.artifacts.ComponentMetadataDetails;
+import org.gradle.api.artifacts.IvyModuleDescriptor;
 import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
 import org.gradle.api.artifacts.dsl.ComponentMetadataHandler;
+import org.gradle.api.internal.artifacts.ivyservice.DefaultIvyModuleDescriptor;
 import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionResolveException;
+import org.gradle.api.internal.artifacts.metadata.IvyModuleVersionMetaData;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData;
 import org.gradle.api.internal.artifacts.repositories.resolver.ComponentMetadataDetailsAdapter;
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.listener.ActionBroadcast;
 
+import java.util.List;
+
 public class DefaultComponentMetadataHandler implements ComponentMetadataHandler, ModuleMetadataProcessor {
     private final Instantiator instantiator;
-    private final ActionBroadcast<ComponentMetadataDetails> moduleRules = new ActionBroadcast<ComponentMetadataDetails>();
+    private final ActionBroadcast<ComponentMetadataDetails> ruleActions = new ActionBroadcast<ComponentMetadataDetails>();
+    private final List<Closure<?>> ruleClosures = Lists.newArrayList();
 
     public DefaultComponentMetadataHandler(Instantiator instantiator) {
         this.instantiator = instantiator;
     }
 
     public void eachComponent(Action<? super ComponentMetadataDetails> rule) {
-        moduleRules.add(rule);
+        ruleActions.add(rule);
+    }
+
+    public void eachComponent(Closure<?> closure) {
+        ruleClosures.add(closure);
     }
 
     public void process(ModuleVersionMetaData metadata) {
         ComponentMetadataDetails details = instantiator.newInstance(ComponentMetadataDetailsAdapter.class, metadata);
-        moduleRules.execute(details);
+        ruleActions.execute(details);
+        executeRuleClosures(metadata, details);
         if (!metadata.getStatusScheme().contains(metadata.getStatus())) {
             throw new ModuleVersionResolveException(metadata.getId(), "Unexpected status '" + metadata.getStatus() + "' specified for %s. Expected one of: " +  metadata.getStatusScheme());
         }
     }
+
+    private void executeRuleClosures(ModuleVersionMetaData metadata, ComponentMetadataDetails details) {
+        for (Closure<?> closure : ruleClosures) {
+            executeRuleClosure(metadata, details, closure);
+        }
+    }
+
+    private void executeRuleClosure(ModuleVersionMetaData metadata, ComponentMetadataDetails details, Closure<?> closure) {
+        List<Object> args = Lists.newArrayList();
+        // TODO: make sure that same argType doesn't occur multiple times?
+        for (Class<?> argType : closure.getParameterTypes()) {
+            if (argType == ComponentMetadataDetails.class || argType == Object.class) {
+                args.add(details);
+            } else if (argType == IvyModuleDescriptor.class) {
+                if (!(metadata instanceof IvyModuleVersionMetaData)) {
+                    return;
+                }
+                args.add(new DefaultIvyModuleDescriptor(((IvyModuleVersionMetaData) metadata).getExtraInfo()));
+            } else {
+                throw new GradleException(String.format("Unsupported parameter type for component metadata rule: %s", argType.getName()));
+            }
+        }
+        closure.call(args.toArray());
+    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveResult.java
index 98852c1a38fa..596faa0ecc50 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveResult.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveResult.java
@@ -32,4 +32,8 @@ public interface ArtifactResolveResult {
      */
     File getFile() throws ArtifactResolveException;
 
+    /**
+     * Returns true if the result either has a file, or a failure.
+     */
+    boolean hasResult();
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolver.java
index cfa543b3fc01..a9402fdffd94 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolver.java
@@ -21,13 +21,17 @@
 
 public interface ArtifactResolver {
     /**
-     * Resolves a set of artifacts belonging to the given component, based on the supplied context. Any failures are packaged up in the result.
+     * Resolves a set of artifacts belonging to the given component, based on the supplied usage. Any failures are packaged up in the result.
      */
-    void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result);
+    void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage usage, BuildableArtifactSetResolveResult result);
+
+    /**
+     * Resolves a set of artifacts belonging to the given component, with the type specified. Any failures are packaged up in the result.
+     */
+    void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result);
 
     /**
      * Resolves the given artifact. Any failures are packaged up in the result.
      */
-    // TODO:DAZ Make this less ModuleVersion centric: ModuleSource should be an attribute of the component subtype only
     void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactType.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactType.java
new file mode 100644
index 000000000000..0f95c578cfab
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactType.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice;
+
+import org.gradle.api.artifacts.result.Artifact;
+
+public interface ArtifactType {
+    Class<? extends Artifact> getType();
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayout.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayout.java
index 4c6bbb481e60..6ae2386f6fbd 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayout.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayout.java
@@ -22,7 +22,10 @@
 public enum CacheLayout {
     ROOT(null, "modules", 2),
     FILE_STORE(ROOT, "files", 1),
-    META_DATA(ROOT, "metadata", 6);
+    META_DATA(ROOT, "metadata", 12);
+
+    // If you update the META_DATA version, also update DefaultGradleDistribution.getArtifactCacheLayoutVersion() (which is the historical record)
+    // If you update FILE_STORE, you may also need to update LocallyAvailableResourceFinderFactory
 
     private final String name;
     private final CacheLayout parent;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveContext.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ComponentUsage.java
similarity index 88%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveContext.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ComponentUsage.java
index 30ba366cffac..a19da25d4704 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactResolveContext.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ComponentUsage.java
@@ -15,7 +15,6 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice;
 
-public interface ArtifactResolveContext {
-    String getId();
-    String getDescription();
+public interface ComponentUsage {
+    String getConfigurationName();
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ContextualArtifactResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ContextualArtifactResolver.java
index c503663aba8c..32c05d40018a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ContextualArtifactResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ContextualArtifactResolver.java
@@ -32,26 +32,34 @@ public ContextualArtifactResolver(CacheLockingManager lockingManager, IvyContext
         this.delegate = delegate;
     }
 
-    public void resolveModuleArtifacts(final ComponentMetaData component, final ArtifactResolveContext context, final BuildableArtifactSetResolveResult result) {
-        lockingManager.useCache(String.format("Resolve %s for %s", context.getDescription(), component), new Runnable() {
-            public void run() {
-                ivyContextManager.withIvy(new Action<Ivy>() {
-                    public void execute(Ivy ivy) {
-                        delegate.resolveModuleArtifacts(component, context, result);
-                    }
-                });
+    public void resolveModuleArtifacts(final ComponentMetaData component, final ArtifactType artifactType, final BuildableArtifactSetResolveResult result) {
+        executeInContext(String.format("Resolve %s for %s", artifactType, component), new Action<Ivy>() {
+            public void execute(Ivy ivy) {
+                delegate.resolveModuleArtifacts(component, artifactType, result);
+            }
+        });
+    }
+
+    public void resolveModuleArtifacts(final ComponentMetaData component, final ComponentUsage usage, final BuildableArtifactSetResolveResult result) {
+        executeInContext(String.format("Resolve %s for %s", usage, component), new Action<Ivy>() {
+            public void execute(Ivy ivy) {
+                delegate.resolveModuleArtifacts(component, usage, result);
             }
         });
     }
 
     public void resolveArtifact(final ComponentArtifactMetaData artifact, final ModuleSource moduleSource, final BuildableArtifactResolveResult result) {
-        lockingManager.useCache(String.format("Resolve %s", artifact), new Runnable() {
+        executeInContext(String.format("Resolve %s", artifact), new Action<Ivy>() {
+            public void execute(Ivy ivy) {
+                delegate.resolveArtifact(artifact, moduleSource, result);
+            }
+        });
+    }
+
+    private void executeInContext(String description, final Action<Ivy> action) {
+        lockingManager.useCache(description, new Runnable() {
             public void run() {
-                ivyContextManager.withIvy(new Action<Ivy>() {
-                    public void execute(Ivy ivy) {
-                        delegate.resolveArtifact(artifact, moduleSource, result);
-                    }
-                });
+                ivyContextManager.withIvy(action);
             }
         });
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactTypeResolveContext.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultArtifactType.java
similarity index 63%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactTypeResolveContext.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultArtifactType.java
index 485499554f7f..4e69c553c45d 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ArtifactTypeResolveContext.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultArtifactType.java
@@ -15,24 +15,20 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice;
 
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.result.Artifact;
 
-public class ArtifactTypeResolveContext implements ArtifactResolveContext {
-    private final Class<? extends SoftwareArtifact> artifactType;
+public class DefaultArtifactType implements ArtifactType {
+    private final Class<? extends Artifact> artifactType;
 
-    public ArtifactTypeResolveContext(Class<? extends SoftwareArtifact> artifactType) {
+    public DefaultArtifactType(Class<? extends Artifact> artifactType) {
         this.artifactType = artifactType;
     }
 
-    public Class<? extends SoftwareArtifact> getArtifactType() {
+    public Class<? extends Artifact> getType() {
         return artifactType;
     }
 
-    public String getId() {
-        return "artifacts:" + artifactType.getName();
-    }
-
-    public String getDescription() {
-        return String.format("artifacts of type %s", artifactType);
+    public String toString() {
+        return String.format("artifacts of type %s", artifactType.getSimpleName());
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResult.java
index 36077247da42..a88787817e64 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResult.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResult.java
@@ -48,6 +48,10 @@ public File getFile() throws ArtifactResolveException {
         return file;
     }
 
+    public boolean hasResult() {
+        return failure != null || file != null;
+    }
+
     private void assertResolved() {
         assertHasResult();
         if (failure != null) {
@@ -56,7 +60,7 @@ private void assertResolved() {
     }
 
     private void assertHasResult() {
-        if (failure == null && file == null) {
+        if (!hasResult()) {
             throw new IllegalStateException("No result has been specified.");
         }
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultCacheLockingManager.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultCacheLockingManager.java
index f28845f8503f..8e693a518bd0 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultCacheLockingManager.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultCacheLockingManager.java
@@ -30,8 +30,6 @@
 
 public class DefaultCacheLockingManager implements CacheLockingManager {
 
-    // If you update this, also update DefaultGradleDistribution.getArtifactCacheLayoutVersion() (which is the historical record)
-    // You should also update LocallyAvailableResourceFinderFactory
     public static final VersionNumber CACHE_LAYOUT_VERSION = CacheLayout.META_DATA.getVersion();
 
     private final PersistentCache cache;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ConfigurationResolveContext.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultComponentUsage.java
similarity index 74%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ConfigurationResolveContext.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultComponentUsage.java
index c922e2bbad26..b3ab1cdf19f5 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ConfigurationResolveContext.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultComponentUsage.java
@@ -15,10 +15,10 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice;
 
-public class ConfigurationResolveContext implements ArtifactResolveContext {
+public class DefaultComponentUsage implements ComponentUsage {
     private final String configurationName;
 
-    public ConfigurationResolveContext(String configurationName) {
+    public DefaultComponentUsage(String configurationName) {
         this.configurationName = configurationName;
     }
 
@@ -28,14 +28,6 @@ public String getConfigurationName() {
 
     @Override
     public String toString() {
-        return String.format("configuration '%s'", configurationName);
-    }
-
-    public String getId() {
-        return "configuration:" + configurationName;
-    }
-
-    public String getDescription() {
         return String.format("artifacts for configuration '%s'", configurationName);
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyModuleDescriptor.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyModuleDescriptor.java
new file mode 100644
index 000000000000..c4fc5402c46b
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultIvyModuleDescriptor.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice;
+
+import org.gradle.api.artifacts.IvyModuleDescriptor;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class DefaultIvyModuleDescriptor implements IvyModuleDescriptor {
+    private final Map<String, String> extraInfo;
+
+    public DefaultIvyModuleDescriptor(Map<String, String> extraInfo) {
+        this.extraInfo = Collections.unmodifiableMap(extraInfo);
+    }
+
+    public Map<String, String> getExtraInfo() {
+        return extraInfo;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyUtil.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyUtil.java
index 2e95e5089abd..d3b737513c4a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyUtil.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyUtil.java
@@ -15,6 +15,9 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice;
 
+import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.apache.ivy.core.module.id.ModuleId;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.gradle.api.artifacts.Dependency;
@@ -74,4 +77,10 @@ public static ModuleId createModuleId(String org, String name) {
             return ModuleId.newInstance(org, name);
         }
     }
+
+    public static ModuleDescriptor createModuleDescriptor(DependencyDescriptor dependencyDescriptor) {
+        DefaultModuleDescriptor moduleDescriptor = DefaultModuleDescriptor.newDefaultInstance(dependencyDescriptor.getDependencyRevisionId(), dependencyDescriptor.getAllDependencyArtifacts());
+        moduleDescriptor.setStatus("integration");
+        return moduleDescriptor;
+    }
 }
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyXmlModuleDescriptorWriter.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyXmlModuleDescriptorWriter.java
index 2a57bdb7e459..2fa0f4663bfb 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyXmlModuleDescriptorWriter.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/IvyXmlModuleDescriptorWriter.java
@@ -330,7 +330,10 @@ private static void printInfoTag(ModuleDescriptor md, SimpleXmlWriter writer) th
         writer.attribute("status", md.getStatus());
 
         SimpleDateFormat ivyDateFormat = new SimpleDateFormat(IVY_DATE_PATTERN);
-        writer.attribute("publication", ivyDateFormat.format(md.getResolvedPublicationDate()));
+        Date publicationDate = md.getResolvedPublicationDate();
+        if (publicationDate != null) {
+            writer.attribute("publication", ivyDateFormat.format(publicationDate));
+        }
         if (md.isDefault()) {
             writer.attribute("default", "true");
         }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionResolveException.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionResolveException.java
index cf7cebbf5c34..2d2f68186014 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionResolveException.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ModuleVersionResolveException.java
@@ -17,6 +17,7 @@
 
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.ModuleVersionSelector;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector;
 import org.gradle.internal.UncheckedException;
 import org.gradle.internal.exceptions.AbstractMultiCauseException;
@@ -43,6 +44,10 @@ public ModuleVersionResolveException(ModuleVersionIdentifier id, String messageF
         this(DefaultModuleVersionSelector.newSelector(id.getGroup(), id.getName(), id.getVersion()), messageFormat);
     }
 
+    public ModuleVersionResolveException(ModuleComponentIdentifier id, String messageFormat) {
+        this(DefaultModuleVersionSelector.newSelector(id.getGroup(), id.getModule(), id.getVersion()), messageFormat);
+    }
+
     public ModuleVersionResolveException(ModuleVersionSelector selector, Throwable cause) {
         this(selector, "Could not resolve %s.");
         initCause(cause);
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolver.java
index c00f1104ae97..4c22e15a371a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolver.java
@@ -16,32 +16,64 @@
 
 package org.gradle.api.internal.artifacts.ivyservice.clientmodule;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.gradle.api.Transformer;
+import org.gradle.api.artifacts.ClientModule;
+import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.internal.artifacts.ivyservice.BuildableComponentResolveResult;
 import org.gradle.api.internal.artifacts.ivyservice.DependencyToModuleVersionResolver;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
-import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.ClientModuleDependencyDescriptor;
-import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData;
+import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.DependencyDescriptorFactory;
+import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.EnhancedDependencyDescriptor;
+import org.gradle.api.internal.artifacts.metadata.*;
+import org.gradle.internal.Transformers;
+
+import java.util.List;
 
 public class ClientModuleResolver implements DependencyToModuleVersionResolver {
     private final DependencyToModuleVersionResolver resolver;
+    private final DependencyDescriptorFactory dependencyDescriptorFactory;
+    private final Transformer<MutableModuleVersionMetaData, ComponentMetaData> toModuleVersionMetaData = Transformers.cast(MutableModuleVersionMetaData.class);
 
-    public ClientModuleResolver(DependencyToModuleVersionResolver resolver) {
+    public ClientModuleResolver(DependencyToModuleVersionResolver resolver, DependencyDescriptorFactory dependencyDescriptorFactory) {
         this.resolver = resolver;
+        this.dependencyDescriptorFactory = dependencyDescriptorFactory;
     }
 
     public void resolve(DependencyMetaData dependency, BuildableComponentResolveResult result) {
         resolver.resolve(dependency, result);
 
-        DependencyDescriptor descriptor = dependency.getDescriptor();
-        if (result.getFailure() != null || !(descriptor instanceof ClientModuleDependencyDescriptor)) {
+        if (result.getFailure() != null) {
             return;
         }
+        DependencyDescriptor descriptor = dependency.getDescriptor();
+        if (descriptor instanceof EnhancedDependencyDescriptor) {
+            ModuleDependency maybeClientModule = ((EnhancedDependencyDescriptor) descriptor).getModuleDependency();
+            if (maybeClientModule instanceof ClientModule) {
+                ClientModule clientModule = (ClientModule) maybeClientModule;
+
+                MutableModuleVersionMetaData clientModuleMetaData = toModuleVersionMetaData.transform(result.getMetaData()).copy();
+                addClientModuleDependencies(clientModule, clientModuleMetaData);
+
+                setClientModuleArtifact(clientModuleMetaData);
+
+                result.setMetaData(clientModuleMetaData);
+            }
+        }
+    }
+
+    private void addClientModuleDependencies(ClientModule clientModule, MutableModuleVersionMetaData clientModuleMetaData) {
+        List<DependencyMetaData> dependencies = Lists.newArrayList();
+        for (ModuleDependency moduleDependency : clientModule.getDependencies()) {
+            DependencyDescriptor dependencyDescriptor = dependencyDescriptorFactory.createDependencyDescriptor(moduleDependency.getConfiguration(), clientModuleMetaData.getDescriptor(), moduleDependency);
+            dependencies.add(new DefaultDependencyMetaData(dependencyDescriptor));
+        }
+        clientModuleMetaData.setDependencies(dependencies);
+    }
 
-        ClientModuleDependencyDescriptor clientModuleDependencyDescriptor = (ClientModuleDependencyDescriptor) descriptor;
-        ModuleVersionMetaData clientModuleMetaData = clientModuleDependencyDescriptor.getTargetModule();
-        ModuleSource moduleSource = result.getMetaData().getSource();
-        result.setMetaData(clientModuleMetaData.withSource(moduleSource));
+    private void setClientModuleArtifact(MutableModuleVersionMetaData clientModuleMetaData) {
+        ModuleVersionArtifactMetaData artifact = clientModuleMetaData.artifact("jar", "jar", null);
+        clientModuleMetaData.setArtifacts(Sets.newHashSet(artifact));
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCache.java
index 6d0fdb666e87..d3a1f2996212 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCache.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/ModuleVersionsCache.java
@@ -16,14 +16,14 @@
 package org.gradle.api.internal.artifacts.ivyservice.dynamicversions;
 
 import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionListing;
 
 public interface ModuleVersionsCache {
 
-    void cacheModuleVersionList(ModuleVersionRepository repository, ModuleIdentifier moduleId, ModuleVersionListing listedVersions);
+    void cacheModuleVersionList(ModuleComponentRepository repository, ModuleIdentifier moduleId, ModuleVersionListing listedVersions);
 
-    CachedModuleVersionList getCachedModuleResolution(ModuleVersionRepository repository, ModuleIdentifier moduleId);
+    CachedModuleVersionList getCachedModuleResolution(ModuleComponentRepository repository, ModuleIdentifier moduleId);
 
     interface CachedModuleVersionList {
         ModuleVersionListing getModuleVersions();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/SingleFileBackedModuleVersionsCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/SingleFileBackedModuleVersionsCache.java
index bcb962893594..c3f2430b9174 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/SingleFileBackedModuleVersionsCache.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/dynamicversions/SingleFileBackedModuleVersionsCache.java
@@ -18,10 +18,7 @@
 import org.gradle.api.artifacts.ModuleIdentifier;
 import org.gradle.api.internal.artifacts.DefaultModuleIdentifier;
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.DefaultModuleVersionListing;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionListing;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.Versioned;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.*;
 import org.gradle.cache.PersistentIndexedCache;
 import org.gradle.messaging.serialize.Decoder;
 import org.gradle.messaging.serialize.Encoder;
@@ -55,12 +52,12 @@ private PersistentIndexedCache<ModuleKey, ModuleVersionsCacheEntry> initCache()
         return cacheLockingManager.createCache("module-versions", new ModuleKeySerializer(), new ModuleVersionsCacheEntrySerializer());
     }
 
-    public void cacheModuleVersionList(ModuleVersionRepository repository, ModuleIdentifier moduleId, ModuleVersionListing listedVersions) {
+    public void cacheModuleVersionList(ModuleComponentRepository repository, ModuleIdentifier moduleId, ModuleVersionListing listedVersions) {
         LOGGER.debug("Caching version list in module versions cache: Using '{}' for '{}'", listedVersions, moduleId);
         getCache().put(createKey(repository, moduleId), createEntry(listedVersions));
     }
 
-    public CachedModuleVersionList getCachedModuleResolution(ModuleVersionRepository repository, ModuleIdentifier moduleId) {
+    public CachedModuleVersionList getCachedModuleResolution(ModuleComponentRepository repository, ModuleIdentifier moduleId) {
         ModuleVersionsCacheEntry moduleVersionsCacheEntry = getCache().get(createKey(repository, moduleId));
         if (moduleVersionsCacheEntry == null) {
             return null;
@@ -68,7 +65,7 @@ public CachedModuleVersionList getCachedModuleResolution(ModuleVersionRepository
         return new DefaultCachedModuleVersionList(moduleVersionsCacheEntry, timeProvider);
     }
 
-    private ModuleKey createKey(ModuleVersionRepository repository, ModuleIdentifier moduleId) {
+    private ModuleKey createKey(ModuleComponentRepository repository, ModuleIdentifier moduleId) {
         return new ModuleKey(repository.getId(), moduleId);
     }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ArtifactResolveException.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ArtifactResolveException.java
index 336b60211515..1d700cc97206 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ArtifactResolveException.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ArtifactResolveException.java
@@ -27,6 +27,10 @@ public ArtifactResolveException(String message) {
         super(message);
     }
 
+    public ArtifactResolveException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
     public ArtifactResolveException(ComponentIdentifier component, Throwable cause) {
         super(format(component, ""), cause);
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepository.java
new file mode 100644
index 000000000000..f6c8eb8e6d37
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepository.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
+
+public class BaseModuleComponentRepository implements ModuleComponentRepository {
+    protected final ModuleComponentRepository delegate;
+    private final ModuleComponentRepositoryAccess localAccess;
+    private final ModuleComponentRepositoryAccess remoteAccess;
+
+    public BaseModuleComponentRepository(ModuleComponentRepository delegate, ModuleComponentRepositoryAccess localAccess, ModuleComponentRepositoryAccess remoteAccess) {
+        this.delegate = delegate;
+        this.localAccess = localAccess;
+        this.remoteAccess = remoteAccess;
+    }
+
+    public BaseModuleComponentRepository(ModuleComponentRepository delegate) {
+        this.delegate = delegate;
+        this.localAccess = delegate.getLocalAccess();
+        this.remoteAccess = delegate.getRemoteAccess();
+    }
+
+    public String getId() {
+        return delegate.getId();
+    }
+
+    public String getName() {
+        return delegate.getName();
+    }
+
+    public boolean canListModuleVersions() {
+        return delegate.canListModuleVersions();
+    }
+
+    public ModuleComponentRepositoryAccess getLocalAccess() {
+        return localAccess;
+    }
+
+    public ModuleComponentRepositoryAccess getRemoteAccess() {
+        return remoteAccess;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepositoryAccess.java
similarity index 53%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalModuleVersionRepository.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepositoryAccess.java
index 2ba8838cdd73..e3f961975298 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalModuleVersionRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepositoryAccess.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,57 +13,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
 
-import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.ArtifactType;
 import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
 import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ComponentUsage;
 import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
 import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
 import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
 
-public class LocalModuleVersionRepository implements LocalAwareModuleVersionRepository {
-    private final ModuleVersionRepository delegate;
-    private final ModuleMetadataProcessor processor;
+public class BaseModuleComponentRepositoryAccess implements ModuleComponentRepositoryAccess {
+    private final ModuleComponentRepositoryAccess delegate;
 
-    public LocalModuleVersionRepository(ModuleVersionRepository delegate, ModuleMetadataProcessor processor) {
+    public BaseModuleComponentRepositoryAccess(ModuleComponentRepositoryAccess delegate) {
         this.delegate = delegate;
-        this.processor = processor;
-    }
-
-    public void localListModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-        delegate.listModuleVersions(dependency, result);
     }
 
     public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+        delegate.listModuleVersions(dependency, result);
     }
 
-    public void getLocalDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        delegate.getDependency(dependency, result);
-        if (result.getState() == BuildableModuleVersionMetaDataResolveResult.State.Resolved) {
-            processor.process(result.getMetaData());
-        }
+    public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+        delegate.resolveComponentMetaData(dependency, moduleComponentIdentifier, result);
     }
 
-    public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        result.missing();
+    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+        delegate.resolveModuleArtifacts(component, artifactType, result);
     }
 
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        delegate.resolveModuleArtifacts(component, context, result);
+    public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+        delegate.resolveModuleArtifacts(component, componentUsage, result);
     }
 
     public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
         delegate.resolveArtifact(artifact, moduleSource, result);
     }
-
-    public String getId() {
-        return delegate.getId();
-    }
-
-    public String getName() {
-        return delegate.getName();
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionMetaDataResolveResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionMetaDataResolveResult.java
index ba9f13845b49..02bfed4651fb 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionMetaDataResolveResult.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionMetaDataResolveResult.java
@@ -33,6 +33,8 @@ static enum State {
      */
     State getState();
 
+    boolean hasResult();
+
     /**
      * Returns the meta-data.
      *
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionSelectionResolveResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionSelectionResolveResult.java
index a9f8b56f8022..4089c6ccb690 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionSelectionResolveResult.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BuildableModuleVersionSelectionResolveResult.java
@@ -20,7 +20,7 @@
 import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionResolveException;
 
 /**
- * The result of attempting to resolve a dependency descriptor to the meta-data for a module version.
+ * The result of attempting to resolve a dependency descriptor to a list of candidate versions that might match that descriptor.
  */
 public interface BuildableModuleVersionSelectionResolveResult {
 
@@ -33,6 +33,8 @@ static enum State {
      */
     State getState();
 
+    boolean hasResult();
+
     /**
      * Returns the versions that match the selector.
      *
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CacheLockReleasingModuleComponentsRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CacheLockReleasingModuleComponentsRepository.java
new file mode 100644
index 000000000000..3fc7e949826f
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CacheLockReleasingModuleComponentsRepository.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
+
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.*;
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
+import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+
+/**
+ * A wrapper around a {@link ModuleComponentRepository} that handles releasing the cache lock before making remote calls.
+ */
+public class CacheLockReleasingModuleComponentsRepository extends BaseModuleComponentRepository {
+    private final ModuleComponentRepositoryAccess remoteAccess;
+
+    public CacheLockReleasingModuleComponentsRepository(ModuleComponentRepository repository, CacheLockingManager cacheLockingManager) {
+        super(repository);
+        this.remoteAccess = new LockReleasingRepositoryAccess(repository.getName(), repository.getRemoteAccess(), cacheLockingManager);
+    }
+
+    @Override
+    public ModuleComponentRepositoryAccess getRemoteAccess() {
+        return remoteAccess;
+    }
+
+    private static class LockReleasingRepositoryAccess implements ModuleComponentRepositoryAccess {
+        private final String name;
+        private final ModuleComponentRepositoryAccess delegate;
+        private final CacheLockingManager cacheLockingManager;
+
+        private LockReleasingRepositoryAccess(String name, ModuleComponentRepositoryAccess delegate, CacheLockingManager cacheLockingManager) {
+            this.name = name;
+            this.delegate = delegate;
+            this.cacheLockingManager = cacheLockingManager;
+        }
+
+        public void listModuleVersions(final DependencyMetaData dependency, final BuildableModuleVersionSelectionResolveResult result) {
+            cacheLockingManager.longRunningOperation(String.format("List %s using repository %s", dependency, name), new Runnable() {
+                public void run() {
+                    delegate.listModuleVersions(dependency, result);
+                }
+            });
+        }
+
+        public void resolveComponentMetaData(final DependencyMetaData dependency, final ModuleComponentIdentifier moduleComponentIdentifier, final BuildableModuleVersionMetaDataResolveResult result) {
+            cacheLockingManager.longRunningOperation(String.format("Resolve %s using repository %s", dependency, name), new Runnable() {
+                public void run() {
+                    delegate.resolveComponentMetaData(dependency, moduleComponentIdentifier, result);
+                }
+            });
+        }
+
+        public void resolveModuleArtifacts(final ComponentMetaData component, final ArtifactType artifactType, final BuildableArtifactSetResolveResult result) {
+            cacheLockingManager.longRunningOperation(String.format("Resolve %s for %s using repository %s", artifactType, component, name), new Runnable() {
+                public void run() {
+                    delegate.resolveModuleArtifacts(component, artifactType, result);
+                }
+            });
+        }
+
+        public void resolveModuleArtifacts(final ComponentMetaData component, final ComponentUsage componentUsage, final BuildableArtifactSetResolveResult result) {
+            cacheLockingManager.longRunningOperation(String.format("Resolve %s for %s using repository %s", componentUsage, component, name), new Runnable() {
+                public void run() {
+                    delegate.resolveModuleArtifacts(component, componentUsage, result);
+                }
+            });
+        }
+
+
+        public void resolveArtifact(final ComponentArtifactMetaData artifact, final ModuleSource moduleSource, final BuildableArtifactResolveResult result) {
+            cacheLockingManager.longRunningOperation(String.format("Download %s using repository %s", artifact, name), new Runnable() {
+                public void run() {
+                    delegate.resolveArtifact(artifact, moduleSource, result);
+                }
+            });
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CacheLockingModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CacheLockingModuleVersionRepository.java
deleted file mode 100644
index 8d33912ba3b4..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CacheLockingModuleVersionRepository.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
-
-import org.gradle.api.internal.artifacts.ivyservice.*;
-import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
-import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
-import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
-
-/**
- * A wrapper around a {@link ModuleVersionRepository} that handles locking/unlocking the cache.
- */
-public class CacheLockingModuleVersionRepository implements LocalArtifactsModuleVersionRepository {
-    private final LocalArtifactsModuleVersionRepository repository;
-    private final CacheLockingManager cacheLockingManager;
-
-    public CacheLockingModuleVersionRepository(LocalArtifactsModuleVersionRepository repository, CacheLockingManager cacheLockingManager) {
-        this.repository = repository;
-        this.cacheLockingManager = cacheLockingManager;
-    }
-
-    public String getId() {
-        return repository.getId();
-    }
-
-    public String getName() {
-        return repository.getName();
-    }
-
-    public void listModuleVersions(final DependencyMetaData dependency, final BuildableModuleVersionSelectionResolveResult result) {
-        cacheLockingManager.longRunningOperation(String.format("List %s using repository %s", dependency, getId()), new Runnable() {
-            public void run() {
-                repository.listModuleVersions(dependency, result);
-            }
-        });
-    }
-
-    public void getDependency(final DependencyMetaData dependency, final BuildableModuleVersionMetaDataResolveResult result) {
-        cacheLockingManager.longRunningOperation(String.format("Resolve %s using repository %s", dependency, getId()), new Runnable() {
-            public void run() {
-                repository.getDependency(dependency, result);
-            }
-        });
-    }
-
-    public void localResolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        repository.localResolveModuleArtifacts(component, context, result);
-    }
-
-    public void resolveModuleArtifacts(final ComponentMetaData component, final ArtifactResolveContext context, final BuildableArtifactSetResolveResult result) {
-        cacheLockingManager.longRunningOperation(String.format("Resolve %s for %s using repository %s", context, component, getId()), new Runnable() {
-            public void run() {
-                repository.resolveModuleArtifacts(component, context, result);
-            }
-        });
-    }
-
-    public void resolveArtifact(final ComponentArtifactMetaData artifact, final ModuleSource moduleSource, final BuildableArtifactResolveResult result) {
-        cacheLockingManager.longRunningOperation(String.format("Download %s using repository %s", artifact, getId()), new Runnable() {
-            public void run() {
-                repository.resolveArtifact(artifact, moduleSource, result);
-            }
-        });
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleComponentRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleComponentRepository.java
new file mode 100644
index 000000000000..7e6089caf270
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleComponentRepository.java
@@ -0,0 +1,391 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
+
+import org.gradle.api.Transformer;
+import org.gradle.api.artifacts.ArtifactIdentifier;
+import org.gradle.api.artifacts.ModuleIdentifier;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
+import org.gradle.api.artifacts.ModuleVersionSelector;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.DefaultModuleIdentifier;
+import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
+import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
+import org.gradle.api.internal.artifacts.configurations.dynamicversion.CachePolicy;
+import org.gradle.api.internal.artifacts.ivyservice.*;
+import org.gradle.api.internal.artifacts.ivyservice.dynamicversions.ModuleVersionsCache;
+import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleArtifactsCache;
+import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleMetaDataCache;
+import org.gradle.api.internal.artifacts.metadata.*;
+import org.gradle.internal.resource.cached.CachedArtifact;
+import org.gradle.internal.resource.cached.CachedArtifactIndex;
+import org.gradle.internal.resource.cached.ivy.ArtifactAtRepositoryKey;
+import org.gradle.util.BuildCommencedTimeProvider;
+import org.gradle.util.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.math.BigInteger;
+import java.util.Set;
+
+public class CachingModuleComponentRepository implements ModuleComponentRepository {
+    private static final Logger LOGGER = LoggerFactory.getLogger(CachingModuleComponentRepository.class);
+
+    private final ModuleVersionsCache moduleVersionsCache;
+    private final ModuleMetaDataCache moduleMetaDataCache;
+    private final ModuleArtifactsCache moduleArtifactsCache;
+    private final CachedArtifactIndex artifactAtRepositoryCachedResolutionIndex;
+
+    private final CachePolicy cachePolicy;
+
+    private final ModuleComponentRepository delegate;
+    private final BuildCommencedTimeProvider timeProvider;
+    private final ModuleMetadataProcessor metadataProcessor;
+    private LocateInCacheRepositoryAccess locateInCacheRepositoryAccess = new LocateInCacheRepositoryAccess();
+    private ResolveAndCacheRepositoryAccess resolveAndCacheRepositoryAccess = new ResolveAndCacheRepositoryAccess();
+
+    public CachingModuleComponentRepository(ModuleComponentRepository delegate, ModuleVersionsCache moduleVersionsCache, ModuleMetaDataCache moduleMetaDataCache,
+                                            ModuleArtifactsCache moduleArtifactsCache, CachedArtifactIndex artifactAtRepositoryCachedResolutionIndex,
+                                            CachePolicy cachePolicy, BuildCommencedTimeProvider timeProvider,
+                                            ModuleMetadataProcessor metadataProcessor) {
+        this.delegate = delegate;
+        this.moduleMetaDataCache = moduleMetaDataCache;
+        this.moduleVersionsCache = moduleVersionsCache;
+        this.moduleArtifactsCache = moduleArtifactsCache;
+        this.artifactAtRepositoryCachedResolutionIndex = artifactAtRepositoryCachedResolutionIndex;
+        this.timeProvider = timeProvider;
+        this.cachePolicy = cachePolicy;
+        this.metadataProcessor = metadataProcessor;
+    }
+
+    public String getId() {
+        return delegate.getId();
+    }
+
+    public String getName() {
+        return delegate.getName();
+    }
+
+    @Override
+    public String toString() {
+        return "Caching " + delegate.toString();
+    }
+
+    public ModuleComponentRepositoryAccess getLocalAccess() {
+        return locateInCacheRepositoryAccess;
+    }
+
+    public ModuleComponentRepositoryAccess getRemoteAccess() {
+        return resolveAndCacheRepositoryAccess;
+    }
+
+    public boolean canListModuleVersions() {
+        return delegate.canListModuleVersions();
+    }
+
+    private DefaultModuleIdentifier getCacheKey(ModuleVersionSelector requested) {
+        if (canListModuleVersions()) {
+            return new DefaultModuleIdentifier(requested.getGroup(), requested.getName());
+        } else {
+            return new DefaultModuleIdentifier(requested.getGroup(), requested.getName() + ":" + requested.getVersion());
+        }
+    }
+
+    private class LocateInCacheRepositoryAccess implements ModuleComponentRepositoryAccess {
+
+        public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+            // First try to determine the artifacts in-memory (e.g using the metadata): don't use the cache in this case
+            delegate.getLocalAccess().listModuleVersions(dependency, result);
+            if (result.hasResult()) {
+                return;
+            }
+
+            listModuleVersionsFromCache(dependency, result);
+        }
+
+        private void listModuleVersionsFromCache(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+            ModuleVersionSelector requested = dependency.getRequested();
+            final ModuleIdentifier moduleId = getCacheKey(requested);
+            ModuleVersionsCache.CachedModuleVersionList cachedModuleVersionList = moduleVersionsCache.getCachedModuleResolution(delegate, moduleId);
+            if (cachedModuleVersionList != null) {
+                ModuleVersionListing versionList = cachedModuleVersionList.getModuleVersions();
+                Set<ModuleVersionIdentifier> versions = CollectionUtils.collect(versionList.getVersions(), new Transformer<ModuleVersionIdentifier, Versioned>() {
+                    public ModuleVersionIdentifier transform(Versioned original) {
+                        return new DefaultModuleVersionIdentifier(moduleId, original.getVersion());
+                    }
+                });
+                if (cachePolicy.mustRefreshVersionList(moduleId, versions, cachedModuleVersionList.getAgeMillis())) {
+                    LOGGER.debug("Version listing in dynamic revision cache is expired: will perform fresh resolve of '{}' in '{}'", requested, delegate.getName());
+                } else {
+                    if (cachedModuleVersionList.getAgeMillis() == 0) {
+                        // Verified since the start of this build, assume still missing
+                        result.listed(versionList);
+                    } else {
+                        // Was missing last time we checked
+                        result.probablyListed(versionList);
+                    }
+                }
+            }
+        }
+
+        public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+            // First try to determine the artifacts in-memory (e.g using the metadata): don't use the cache in this case
+            delegate.getLocalAccess().resolveComponentMetaData(dependency, moduleComponentIdentifier, result);
+            if (result.hasResult()) {
+                return;
+            }
+
+            resolveComponentMetaDataFromCache(dependency, moduleComponentIdentifier, result);
+        }
+
+        private void resolveComponentMetaDataFromCache(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+            ModuleMetaDataCache.CachedMetaData cachedMetaData = moduleMetaDataCache.getCachedModuleDescriptor(delegate, moduleComponentIdentifier);
+            if (cachedMetaData == null) {
+                return;
+            }
+            if (cachedMetaData.isMissing()) {
+                if (cachePolicy.mustRefreshMissingModule(moduleComponentIdentifier, cachedMetaData.getAgeMillis())) {
+                    LOGGER.debug("Cached meta-data for missing module is expired: will perform fresh resolve of '{}' in '{}'", moduleComponentIdentifier, delegate.getName());
+                    return;
+                }
+                LOGGER.debug("Detected non-existence of module '{}' in resolver cache '{}'", moduleComponentIdentifier, delegate.getName());
+                if (cachedMetaData.getAgeMillis() == 0) {
+                    // Verified since the start of this build, assume still missing
+                    result.missing();
+                } else {
+                    // Was missing last time we checked
+                    result.probablyMissing();
+                }
+                return;
+            }
+            MutableModuleVersionMetaData metaData = cachedMetaData.getMetaData();
+            metadataProcessor.process(metaData);
+            if (dependency.isChanging() || metaData.isChanging()) {
+                if (cachePolicy.mustRefreshChangingModule(moduleComponentIdentifier, cachedMetaData.getModuleVersion(), cachedMetaData.getAgeMillis())) {
+                    LOGGER.debug("Cached meta-data for changing module is expired: will perform fresh resolve of '{}' in '{}'", moduleComponentIdentifier, delegate.getName());
+                    return;
+                }
+                LOGGER.debug("Found cached version of changing module '{}' in '{}'", moduleComponentIdentifier, delegate.getName());
+            } else {
+                if (cachePolicy.mustRefreshModule(moduleComponentIdentifier, cachedMetaData.getModuleVersion(), cachedMetaData.getAgeMillis())) {
+                    LOGGER.debug("Cached meta-data for module must be refreshed: will perform fresh resolve of '{}' in '{}'", moduleComponentIdentifier, delegate.getName());
+                    return;
+                }
+            }
+
+            LOGGER.debug("Using cached module metadata for module '{}' in '{}'", moduleComponentIdentifier, delegate.getName());
+            result.resolved(metaData, new CachingModuleSource(cachedMetaData.getDescriptorHash(), metaData.isChanging(), cachedMetaData.getModuleSource()));
+        }
+
+        public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+            final CachingModuleSource cachedModuleSource = (CachingModuleSource) component.getSource();
+
+            // First try to determine the artifacts in-memory (e.g using the metadata): don't use the cache in this case
+            delegate.getLocalAccess().resolveModuleArtifacts(component.withSource(cachedModuleSource.getDelegate()), artifactType, result);
+            if (result.hasResult()) {
+                return;
+            }
+
+            resolveModuleArtifactsFromCache(cacheKey(artifactType), component, result, cachedModuleSource);
+        }
+
+        public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+            final CachingModuleSource cachedModuleSource = (CachingModuleSource) component.getSource();
+
+            // First try to determine the artifacts in-memory (e.g using the metadata): don't use the cache in this case
+            delegate.getLocalAccess().resolveModuleArtifacts(component.withSource(cachedModuleSource.getDelegate()), componentUsage, result);
+            if (result.hasResult()) {
+                return;
+            }
+
+            resolveModuleArtifactsFromCache(cacheKey(componentUsage), component, result, cachedModuleSource);
+        }
+
+        private void resolveModuleArtifactsFromCache(String contextId, ComponentMetaData component, BuildableArtifactSetResolveResult result, CachingModuleSource cachedModuleSource) {
+            ModuleArtifactsCache.CachedArtifacts cachedModuleArtifacts = moduleArtifactsCache.getCachedArtifacts(delegate, component.getId(), contextId);
+            BigInteger moduleDescriptorHash = cachedModuleSource.getDescriptorHash();
+
+            if (cachedModuleArtifacts != null) {
+                if (!cachePolicy.mustRefreshModuleArtifacts(component.getId(), null, cachedModuleArtifacts.getAgeMillis(),
+                        cachedModuleSource.isChangingModule(), moduleDescriptorHash.equals(cachedModuleArtifacts.getDescriptorHash()))) {
+                    Set<ModuleVersionArtifactMetaData> artifactMetaDataSet = CollectionUtils.collect(cachedModuleArtifacts.getArtifacts(), new ArtifactIdToMetaData());
+                    result.resolved(artifactMetaDataSet);
+                    return;
+                }
+
+                LOGGER.debug("Artifact listing has expired: will perform fresh resolve of '{}' for '{}' in '{}'", contextId, component.getId(), delegate.getName());
+            }
+        }
+
+        public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+            final CachingModuleSource cachedModuleSource = (CachingModuleSource) moduleSource;
+
+            // First try to determine the artifacts in-memory (e.g using the metadata): don't use the cache in this case
+            delegate.getLocalAccess().resolveArtifact(artifact, cachedModuleSource.getDelegate(), result);
+            if (result.hasResult()) {
+                return;
+            }
+
+            resolveArtifactFromCache(artifact, cachedModuleSource, result);
+        }
+
+        private void resolveArtifactFromCache(ComponentArtifactMetaData artifact, CachingModuleSource moduleSource, BuildableArtifactResolveResult result) {
+            CachedArtifact cached = artifactAtRepositoryCachedResolutionIndex.lookup(artifactCacheKey(artifact));
+            final BigInteger descriptorHash = moduleSource.getDescriptorHash();
+           if (cached != null) {
+               long age = timeProvider.getCurrentTime() - cached.getCachedAt();
+               final boolean isChangingModule = moduleSource.isChangingModule();
+               ArtifactIdentifier artifactIdentifier = ((ModuleVersionArtifactMetaData) artifact).toArtifactIdentifier();
+               if (cached.isMissing()) {
+                   if (!cachePolicy.mustRefreshArtifact(artifactIdentifier, null, age, isChangingModule, descriptorHash.equals(cached.getDescriptorHash()))) {
+                       LOGGER.debug("Detected non-existence of artifact '{}' in resolver cache", artifact);
+                       result.notFound(artifact.getId());
+                   }
+               } else {
+                   File cachedArtifactFile = cached.getCachedFile();
+                   if (!cachePolicy.mustRefreshArtifact(artifactIdentifier, cachedArtifactFile, age, isChangingModule, descriptorHash.equals(cached.getDescriptorHash()))) {
+                       LOGGER.debug("Found artifact '{}' in resolver cache: {}", artifact, cachedArtifactFile);
+                       result.resolved(cachedArtifactFile);
+                   }
+               }
+           }
+       }
+    }
+
+    private class ResolveAndCacheRepositoryAccess implements ModuleComponentRepositoryAccess {
+        public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+            delegate.getRemoteAccess().listModuleVersions(dependency, result);
+            switch (result.getState()) {
+                case Listed:
+                    ModuleIdentifier moduleId = getCacheKey(dependency.getRequested());
+                    ModuleVersionListing versionList = result.getVersions();
+                    moduleVersionsCache.cacheModuleVersionList(delegate, moduleId, versionList);
+                    break;
+                case Failed:
+                    break;
+                default:
+                    throw new IllegalStateException("Unexpected state on listModuleVersions: " + result.getState());
+            }
+        }
+
+        public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+            DependencyMetaData forced = dependency.withChanging();
+            delegate.getRemoteAccess().resolveComponentMetaData(forced, moduleComponentIdentifier, result);
+            switch (result.getState()) {
+                case Missing:
+                    moduleMetaDataCache.cacheMissing(delegate, moduleComponentIdentifier);
+                    break;
+                case Resolved:
+                    MutableModuleVersionMetaData metaData = result.getMetaData();
+                    ModuleSource moduleSource = result.getModuleSource();
+                    ModuleMetaDataCache.CachedMetaData cachedMetaData = moduleMetaDataCache.cacheMetaData(delegate, metaData, moduleSource);
+                    metadataProcessor.process(metaData);
+                    result.setModuleSource(new CachingModuleSource(cachedMetaData.getDescriptorHash(), dependency.isChanging() || metaData.isChanging(), moduleSource));
+                    break;
+                case Failed:
+                    break;
+                default:
+                    throw new IllegalStateException("Unexpected resolve state: " + result.getState());
+            }
+        }
+
+        public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+            final CachingModuleSource moduleSource = (CachingModuleSource) component.getSource();
+            delegate.getRemoteAccess().resolveModuleArtifacts(component.withSource(moduleSource.getDelegate()), artifactType, result);
+
+            maybeCache(component, result, moduleSource, cacheKey(artifactType));
+        }
+
+        public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+            final CachingModuleSource moduleSource = (CachingModuleSource) component.getSource();
+            delegate.getRemoteAccess().resolveModuleArtifacts(component.withSource(moduleSource.getDelegate()), componentUsage, result);
+
+            maybeCache(component, result, moduleSource, cacheKey(componentUsage));
+        }
+
+        private void maybeCache(ComponentMetaData component, BuildableArtifactSetResolveResult result, CachingModuleSource moduleSource, String contextId) {
+            if (result.getFailure() == null) {
+                Set<ModuleVersionArtifactIdentifier> artifactIdentifierSet = CollectionUtils.collect(result.getArtifacts(), new ArtifactMetaDataToId());
+                moduleArtifactsCache.cacheArtifacts(delegate, component.getId(), contextId, moduleSource.getDescriptorHash(), artifactIdentifierSet);
+            }
+        }
+
+        public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+            final CachingModuleSource cachingModuleSource = (CachingModuleSource) moduleSource;
+
+            delegate.getRemoteAccess().resolveArtifact(artifact, cachingModuleSource.getDelegate(), result);
+            LOGGER.debug("Downloaded artifact '{}' from resolver: {}", artifact, delegate.getName());
+
+            ArtifactResolveException failure = result.getFailure();
+            if (failure == null) {
+                artifactAtRepositoryCachedResolutionIndex.store(artifactCacheKey(artifact), result.getFile(), cachingModuleSource.getDescriptorHash());
+            } else if (failure instanceof ArtifactNotFoundException) {
+                artifactAtRepositoryCachedResolutionIndex.storeMissing(artifactCacheKey(artifact), cachingModuleSource.getDescriptorHash());
+            }
+        }
+    }
+
+    private String cacheKey(ArtifactType artifactType) {
+        return "artifacts:" + artifactType.getType().getName();
+    }
+
+    private String cacheKey(ComponentUsage context) {
+        return "configuration:" + context.getConfigurationName();
+    }
+
+    private ArtifactAtRepositoryKey artifactCacheKey(ComponentArtifactMetaData artifact) {
+        // TODO:ADAM - Don't assume this
+        ModuleVersionArtifactMetaData moduleVersionArtifactMetaData = (ModuleVersionArtifactMetaData) artifact;
+        return new ArtifactAtRepositoryKey(delegate.getId(), moduleVersionArtifactMetaData.getId());
+    }
+
+    static class CachingModuleSource implements ModuleSource {
+        private final BigInteger descriptorHash;
+        private final boolean changingModule;
+        private final ModuleSource delegate;
+
+        public CachingModuleSource(BigInteger descriptorHash, boolean changingModule, ModuleSource delegate) {
+            this.delegate = delegate;
+            this.descriptorHash = descriptorHash;
+            this.changingModule = changingModule;
+        }
+
+        public BigInteger getDescriptorHash() {
+            return descriptorHash;
+        }
+
+        public boolean isChangingModule() {
+            return changingModule;
+        }
+
+        public ModuleSource getDelegate() {
+            return delegate;
+        }
+    }
+
+    static class ArtifactIdToMetaData implements Transformer<ModuleVersionArtifactMetaData, ModuleVersionArtifactIdentifier> {
+        public ModuleVersionArtifactMetaData transform(ModuleVersionArtifactIdentifier original) {
+            return new DefaultModuleVersionArtifactMetaData(original);
+        }
+    }
+
+    static class ArtifactMetaDataToId implements Transformer<ModuleVersionArtifactIdentifier, ComponentArtifactMetaData> {
+        public ModuleVersionArtifactIdentifier transform(ComponentArtifactMetaData original) {
+            return ((ModuleVersionArtifactMetaData)original).getId();
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleVersionRepository.java
deleted file mode 100644
index b7023b9828f3..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleVersionRepository.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
-
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.gradle.api.Transformer;
-import org.gradle.api.artifacts.ArtifactIdentifier;
-import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.ModuleVersionSelector;
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
-import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
-import org.gradle.api.internal.artifacts.configurations.dynamicversion.CachePolicy;
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.dynamicversions.ModuleVersionsCache;
-import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleArtifactsCache;
-import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleMetaDataCache;
-import org.gradle.api.internal.artifacts.metadata.*;
-import org.gradle.api.internal.externalresource.cached.CachedArtifact;
-import org.gradle.api.internal.externalresource.cached.CachedArtifactIndex;
-import org.gradle.api.internal.externalresource.ivy.ArtifactAtRepositoryKey;
-import org.gradle.util.BuildCommencedTimeProvider;
-import org.gradle.util.CollectionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.math.BigInteger;
-import java.util.Set;
-
-import static org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier.newId;
-
-public class CachingModuleVersionRepository implements LocalAwareModuleVersionRepository {
-    private static final Logger LOGGER = LoggerFactory.getLogger(CachingModuleVersionRepository.class);
-
-    private final ModuleVersionsCache moduleVersionsCache;
-    private final ModuleMetaDataCache moduleMetaDataCache;
-    private final ModuleArtifactsCache moduleArtifactsCache;
-    private final CachedArtifactIndex artifactAtRepositoryCachedResolutionIndex;
-
-    private final CachePolicy cachePolicy;
-
-    private final LocalArtifactsModuleVersionRepository delegate;
-    private final BuildCommencedTimeProvider timeProvider;
-    private final ModuleMetadataProcessor metadataProcessor;
-    private final Transformer<ModuleIdentifier, ModuleVersionSelector> moduleExtractor;
-
-    public CachingModuleVersionRepository(LocalArtifactsModuleVersionRepository delegate, ModuleVersionsCache moduleVersionsCache, ModuleMetaDataCache moduleMetaDataCache,
-                                          ModuleArtifactsCache moduleArtifactsCache, CachedArtifactIndex artifactAtRepositoryCachedResolutionIndex,
-                                          CachePolicy cachePolicy, BuildCommencedTimeProvider timeProvider,
-                                          ModuleMetadataProcessor metadataProcessor, Transformer<ModuleIdentifier, ModuleVersionSelector> moduleExtractor) {
-        this.delegate = delegate;
-        this.moduleMetaDataCache = moduleMetaDataCache;
-        this.moduleVersionsCache = moduleVersionsCache;
-        this.moduleArtifactsCache = moduleArtifactsCache;
-        this.artifactAtRepositoryCachedResolutionIndex = artifactAtRepositoryCachedResolutionIndex;
-        this.timeProvider = timeProvider;
-        this.cachePolicy = cachePolicy;
-        this.metadataProcessor = metadataProcessor;
-        this.moduleExtractor = moduleExtractor;
-    }
-
-    public String getId() {
-        return delegate.getId();
-    }
-
-    public String getName() {
-        return delegate.getName();
-    }
-
-    @Override
-    public String toString() {
-        return "Caching " + delegate.toString();
-    }
-
-    public void localListModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-        ModuleVersionSelector requested = dependency.getRequested();
-        final ModuleIdentifier moduleId = moduleExtractor.transform(requested);
-        ModuleVersionsCache.CachedModuleVersionList cachedModuleVersionList = moduleVersionsCache.getCachedModuleResolution(delegate, moduleId);
-        if (cachedModuleVersionList != null) {
-            ModuleVersionListing versionList = cachedModuleVersionList.getModuleVersions();
-            Set<ModuleVersionIdentifier> versions = CollectionUtils.collect(versionList.getVersions(), new Transformer<ModuleVersionIdentifier, Versioned>() {
-                public ModuleVersionIdentifier transform(Versioned original) {
-                    return new DefaultModuleVersionIdentifier(moduleId, original.getVersion());
-                }
-            });
-            if (cachePolicy.mustRefreshVersionList(moduleId, versions, cachedModuleVersionList.getAgeMillis())) {
-                LOGGER.debug("Version listing in dynamic revision cache is expired: will perform fresh resolve of '{}' in '{}'", requested, delegate.getName());
-            } else {
-                if (cachedModuleVersionList.getAgeMillis() == 0) {
-                    // Verified since the start of this build, assume still missing
-                    result.listed(versionList);
-                } else {
-                    // Was missing last time we checked
-                    result.probablyListed(versionList);
-                }
-            }
-        }
-    }
-
-    public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-        delegate.listModuleVersions(dependency, result);
-        switch (result.getState()) {
-            case Listed:
-                ModuleIdentifier moduleId = moduleExtractor.transform(dependency.getRequested());
-                ModuleVersionListing versionList = result.getVersions();
-                moduleVersionsCache.cacheModuleVersionList(delegate, moduleId, versionList);
-                break;
-            case Failed:
-                break;
-            default:
-                throw new IllegalStateException("Unexpected state on listModuleVersions: " + result.getState());
-        }
-    }
-
-    public void getLocalDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        lookupModuleInCache(delegate, dependency, result);
-    }
-
-    public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        DependencyMetaData forced = dependency.withChanging();
-        delegate.getDependency(forced, result);
-        switch (result.getState()) {
-            case Missing:
-                ModuleRevisionId dependencyRevisionId = dependency.getDescriptor().getDependencyRevisionId();
-                ModuleVersionIdentifier moduleVersionIdentifier = DefaultModuleVersionIdentifier.newId(dependencyRevisionId);
-                moduleMetaDataCache.cacheMissing(delegate, moduleVersionIdentifier);
-                break;
-            case Resolved:
-                MutableModuleVersionMetaData metaData = result.getMetaData();
-                ModuleSource moduleSource = result.getModuleSource();
-                ModuleMetaDataCache.CachedMetaData cachedMetaData = moduleMetaDataCache.cacheMetaData(delegate, metaData, moduleSource);
-                metadataProcessor.process(metaData);
-                result.setModuleSource(new CachingModuleSource(cachedMetaData.getDescriptorHash(), dependency.isChanging() || metaData.isChanging(), moduleSource));
-                break;
-            case Failed:
-                break;
-            default:
-                throw new IllegalStateException("Unexpected resolve state: " + result.getState());
-        }
-    }
-
-    private void lookupModuleInCache(ModuleVersionRepository repository, DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        ModuleRevisionId resolvedModuleVersionId = dependency.getDescriptor().getDependencyRevisionId();
-        ModuleVersionIdentifier moduleVersionIdentifier = newId(resolvedModuleVersionId);
-        ModuleMetaDataCache.CachedMetaData cachedMetaData = moduleMetaDataCache.getCachedModuleDescriptor(repository, moduleVersionIdentifier);
-        if (cachedMetaData == null) {
-            return;
-        }
-        if (cachedMetaData.isMissing()) {
-            if (cachePolicy.mustRefreshModule(moduleVersionIdentifier, null, resolvedModuleVersionId, cachedMetaData.getAgeMillis())) {
-                LOGGER.debug("Cached meta-data for missing module is expired: will perform fresh resolve of '{}' in '{}'", resolvedModuleVersionId, repository.getName());
-                return;
-            }
-            LOGGER.debug("Detected non-existence of module '{}' in resolver cache '{}'", resolvedModuleVersionId, repository.getName());
-            if (cachedMetaData.getAgeMillis() == 0) {
-                // Verified since the start of this build, assume still missing
-                result.missing();
-            } else {
-                // Was missing last time we checked
-                result.probablyMissing();
-            }
-            return;
-        }
-        MutableModuleVersionMetaData metaData = cachedMetaData.getMetaData();
-        metadataProcessor.process(metaData);
-        if (dependency.isChanging() || metaData.isChanging()) {
-            if (cachePolicy.mustRefreshChangingModule(moduleVersionIdentifier, cachedMetaData.getModuleVersion(), cachedMetaData.getAgeMillis())) {
-                LOGGER.debug("Cached meta-data for changing module is expired: will perform fresh resolve of '{}' in '{}'", resolvedModuleVersionId, repository.getName());
-                return;
-            }
-            LOGGER.debug("Found cached version of changing module '{}' in '{}'", resolvedModuleVersionId, repository.getName());
-        } else {
-            if (cachePolicy.mustRefreshModule(moduleVersionIdentifier, cachedMetaData.getModuleVersion(), null, cachedMetaData.getAgeMillis())) {
-                LOGGER.debug("Cached meta-data for module must be refreshed: will perform fresh resolve of '{}' in '{}'", resolvedModuleVersionId, repository.getName());
-                return;
-            }
-        }
-
-        LOGGER.debug("Using cached module metadata for module '{}' in '{}'", resolvedModuleVersionId, repository.getName());
-        result.resolved(metaData, new CachingModuleSource(cachedMetaData.getDescriptorHash(), metaData.isChanging(), cachedMetaData.getModuleSource()));
-    }
-
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        final CachingModuleSource cachedModuleSource = (CachingModuleSource) component.getSource();
-
-        // First try to determine the artifacts locally (e.g using the metadata): don't use the cache in this case
-        delegate.localResolveModuleArtifacts(component.withSource(cachedModuleSource.getDelegate()), context, result);
-        if (result.hasResult()) {
-            return;
-        }
-
-        resolveAndCacheModuleArtifacts(component, context, result);
-    }
-
-    private void resolveAndCacheModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        final CachingModuleSource cachedModuleSource = (CachingModuleSource) component.getSource();
-        ModuleArtifactsCache.CachedArtifacts cachedModuleArtifacts = moduleArtifactsCache.getCachedArtifacts(delegate, component.getId(), context.getId());
-        BigInteger moduleDescriptorHash = cachedModuleSource.getDescriptorHash();
-
-        if (cachedModuleArtifacts != null) {
-            if (!cachePolicy.mustRefreshModuleArtifacts(component.getId(), null, cachedModuleArtifacts.getAgeMillis(),
-                    cachedModuleSource.isChangingModule(), moduleDescriptorHash.equals(cachedModuleArtifacts.getDescriptorHash()))) {
-                Set<ModuleVersionArtifactMetaData> artifactMetaDataSet = CollectionUtils.collect(cachedModuleArtifacts.getArtifacts(), new ArtifactIdToMetaData());
-                result.resolved(artifactMetaDataSet);
-                return;
-            }
-
-            LOGGER.debug("Artifact listing has expired: will perform fresh resolve of '{}' for '{}' in '{}'", context.getDescription(), component.getId(), delegate.getName());
-        }
-
-        delegate.resolveModuleArtifacts(component.withSource(cachedModuleSource.getDelegate()), context, result);
-
-        if (result.getFailure() == null) {
-            Set<ModuleVersionArtifactIdentifier> artifactIdentifierSet = CollectionUtils.collect(result.getArtifacts(), new ArtifactMetaDataToId());
-            moduleArtifactsCache.cacheArtifacts(delegate, component.getId(), context.getId(), moduleDescriptorHash, artifactIdentifierSet);
-        }
-    }
-
-    public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
-        // TODO:ADAM - Don't assume this
-        ModuleVersionArtifactMetaData moduleVersionArtifactMetaData = (ModuleVersionArtifactMetaData) artifact;
-        ArtifactAtRepositoryKey resolutionCacheIndexKey = new ArtifactAtRepositoryKey(delegate.getId(), moduleVersionArtifactMetaData.getId());
-        // Look in the cache for this resolver
-        CachedArtifact cached = artifactAtRepositoryCachedResolutionIndex.lookup(resolutionCacheIndexKey);
-        final CachingModuleSource cachedModuleSource = (CachingModuleSource) moduleSource;
-        final BigInteger descriptorHash = cachedModuleSource.getDescriptorHash();
-        if (cached != null) {
-            long age = timeProvider.getCurrentTime() - cached.getCachedAt();
-            final boolean isChangingModule = cachedModuleSource.isChangingModule();
-            ArtifactIdentifier artifactIdentifier = moduleVersionArtifactMetaData.toArtifactIdentifier();
-            if (cached.isMissing()) {
-                if (!cachePolicy.mustRefreshArtifact(artifactIdentifier, null, age, isChangingModule, descriptorHash.equals(cached.getDescriptorHash()))) {
-                    LOGGER.debug("Detected non-existence of artifact '{}' in resolver cache", artifact);
-                    result.notFound(artifact.getId());
-                    return;
-                }
-            } else {
-                File cachedArtifactFile = cached.getCachedFile();
-                if (!cachePolicy.mustRefreshArtifact(artifactIdentifier, cachedArtifactFile, age, isChangingModule, descriptorHash.equals(cached.getDescriptorHash()))) {
-                    LOGGER.debug("Found artifact '{}' in resolver cache: {}", artifact, cachedArtifactFile);
-                    result.resolved(cachedArtifactFile);
-                    return;
-                }
-            }
-        }
-
-        delegate.resolveArtifact(artifact, cachedModuleSource.getDelegate(), result);
-        LOGGER.debug("Downloaded artifact '{}' from resolver: {}", artifact, delegate.getName());
-
-        if (result.getFailure() == null) {
-            artifactAtRepositoryCachedResolutionIndex.store(resolutionCacheIndexKey, result.getFile(), descriptorHash);
-        } else if (result.getFailure() instanceof ArtifactNotFoundException) {
-            artifactAtRepositoryCachedResolutionIndex.storeMissing(resolutionCacheIndexKey, descriptorHash);
-        }
-    }
-
-    static class CachingModuleSource implements ModuleSource {
-        private final BigInteger descriptorHash;
-        private final boolean changingModule;
-        private final ModuleSource delegate;
-
-        public CachingModuleSource(BigInteger descriptorHash, boolean changingModule, ModuleSource delegate) {
-            this.delegate = delegate;
-            this.descriptorHash = descriptorHash;
-            this.changingModule = changingModule;
-        }
-
-        public BigInteger getDescriptorHash() {
-            return descriptorHash;
-        }
-
-        public boolean isChangingModule() {
-            return changingModule;
-        }
-
-        public ModuleSource getDelegate() {
-            return delegate;
-        }
-    }
-
-    static class ArtifactIdToMetaData implements Transformer<ModuleVersionArtifactMetaData, ModuleVersionArtifactIdentifier> {
-        public ModuleVersionArtifactMetaData transform(ModuleVersionArtifactIdentifier original) {
-            return new DefaultModuleVersionArtifactMetaData(original);
-        }
-    }
-
-    static class ArtifactMetaDataToId implements Transformer<ModuleVersionArtifactIdentifier, ComponentArtifactMetaData> {
-        public ModuleVersionArtifactIdentifier transform(ComponentArtifactMetaData original) {
-            return ((ModuleVersionArtifactMetaData)original).getId();
-        }
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ComponentChooser.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ComponentChooser.java
new file mode 100644
index 000000000000..352f84983dea
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ComponentChooser.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
+
+import org.gradle.api.artifacts.ModuleVersionSelector;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+
+public interface ComponentChooser {
+    boolean canSelectMultipleComponents(ModuleVersionSelector selector);
+    ComponentMetaData choose(ComponentMetaData one, ComponentMetaData two);
+    ModuleComponentIdentifier choose(ModuleVersionListing versions, DependencyMetaData dependency, ModuleComponentRepositoryAccess moduleAccess);
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleComponentRepository.java
similarity index 88%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleVersionRepository.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleComponentRepository.java
index 76383bed7ac7..f7e8024102b7 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleVersionRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ConfiguredModuleComponentRepository.java
@@ -16,7 +16,7 @@
 
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
 
-public interface ConfiguredModuleVersionRepository extends LocalArtifactsModuleVersionRepository {
+public interface ConfiguredModuleComponentRepository extends ModuleComponentRepository {
     boolean isDynamicResolveMode();
 
     boolean isLocal();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResult.java
index 5fda40292f55..1f5e7ab51bf0 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResult.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResult.java
@@ -58,6 +58,10 @@ public State getState() {
         return state;
     }
 
+    public boolean hasResult() {
+        return state != State.Unknown;
+    }
+
     public ModuleVersionResolveException getFailure() {
         assertHasResult();
         return failure;
@@ -69,7 +73,7 @@ public MutableModuleVersionMetaData getMetaData() throws ModuleVersionResolveExc
     }
 
     private void assertHasResult() {
-        if (state == State.Unknown) {
+        if (!hasResult()) {
             throw new IllegalStateException("No result has been specified.");
         }
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResult.java
index b1a788db890e..6c8cf4f89f95 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResult.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResult.java
@@ -32,11 +32,17 @@ public State getState() {
         return state;
     }
 
+    public boolean hasResult() {
+        return state != State.Unknown;
+    }
+
     public ModuleVersionListing getVersions() throws ModuleVersionResolveException {
+        assertHasResult();
         return versions;
     }
 
     public ModuleVersionResolveException getFailure() {
+        assertHasResult();
         return failure;
     }
 
@@ -55,4 +61,9 @@ public void failed(ModuleVersionResolveException failure) {
         this.failure = failure;
     }
 
+    private void assertHasResult() {
+        if (!hasResult()) {
+            throw new IllegalStateException("No result has been specified.");
+        }
+    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultModuleVersionListing.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultModuleVersionListing.java
index 8a81e7a1795e..2c1bfb74793f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultModuleVersionListing.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultModuleVersionListing.java
@@ -16,12 +16,9 @@
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
 
 import org.gradle.api.Transformer;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy;
 import org.gradle.util.CollectionUtils;
 
-import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 public class DefaultModuleVersionListing implements ModuleVersionListing {
@@ -42,16 +39,6 @@ public Set<Versioned> getVersions() {
         return versions;
     }
 
-    public boolean isEmpty() {
-        return versions.isEmpty();
-    }
-
-    public List<Versioned> sortLatestFirst(LatestStrategy latestStrategy) {
-        List<Versioned> sorted = latestStrategy.sort(versions);
-        Collections.reverse(sorted);
-        return sorted;
-    }
-
     @Override
     public String toString() {
         return CollectionUtils.collect(versions, new Transformer<String, Versioned>() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolver.java
index cdfac2cddefd..279d2a3c390a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolver.java
@@ -15,10 +15,7 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
 
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext;
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolver;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.*;
 import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
 import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
 
@@ -29,9 +26,17 @@ public ErrorHandlingArtifactResolver(ArtifactResolver resolver) {
         this.resolver = resolver;
     }
 
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
+    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
         try {
-            resolver.resolveModuleArtifacts(component, context, result);
+            resolver.resolveModuleArtifacts(component, artifactType, result);
+        } catch (Throwable t) {
+            result.failed(new ArtifactResolveException(component.getComponentId(), t));
+        }
+    }
+
+    public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage usage, BuildableArtifactSetResolveResult result) {
+        try {
+            resolver.resolveModuleArtifacts(component, usage, result);
         } catch (Throwable t) {
             result.failed(new ArtifactResolveException(component.getComponentId(), t));
         }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyAwareModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyAwareModuleComponentRepository.java
similarity index 90%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyAwareModuleVersionRepository.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyAwareModuleComponentRepository.java
index 1b66ddc92177..1acb2d47e568 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyAwareModuleVersionRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyAwareModuleComponentRepository.java
@@ -19,7 +19,7 @@
 import org.apache.ivy.core.resolve.ResolveData;
 import org.apache.ivy.core.settings.IvySettings;
 
-public interface IvyAwareModuleVersionRepository extends ModuleVersionRepository {
+public interface IvyAwareModuleComponentRepository extends ModuleComponentRepository {
     void setSettings(IvySettings settings);
 
     void setResolveData(ResolveData resolveData);
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleComponentRepositoryAccess.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleComponentRepositoryAccess.java
new file mode 100644
index 000000000000..8d78759c5bd9
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleComponentRepositoryAccess.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
+
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class IvyDynamicResolveModuleComponentRepositoryAccess extends BaseModuleComponentRepositoryAccess {
+
+    public static ModuleComponentRepository wrap(ModuleComponentRepository delegate) {
+        final ModuleComponentRepositoryAccess localAccess = new IvyDynamicResolveModuleComponentRepositoryAccess(delegate.getLocalAccess());
+        final ModuleComponentRepositoryAccess remoteAccess = new IvyDynamicResolveModuleComponentRepositoryAccess(delegate.getRemoteAccess());
+        return new BaseModuleComponentRepository(delegate) {
+            @Override
+            public ModuleComponentRepositoryAccess getLocalAccess() {
+                return localAccess;
+            }
+
+            @Override
+            public ModuleComponentRepositoryAccess getRemoteAccess() {
+                return remoteAccess;
+            }
+        };
+    }
+
+    IvyDynamicResolveModuleComponentRepositoryAccess(ModuleComponentRepositoryAccess delegate) {
+        super(delegate);
+    }
+
+    public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+        super.resolveComponentMetaData(dependency, moduleComponentIdentifier, result);
+        if (result.getState() == BuildableModuleVersionMetaDataResolveResult.State.Resolved) {
+            transformDependencies(result);
+        }
+    }
+
+    private void transformDependencies(BuildableModuleVersionMetaDataResolveResult result) {
+        MutableModuleVersionMetaData metaData = result.getMetaData();
+        List<DependencyMetaData> transformed = new ArrayList<DependencyMetaData>();
+        for (DependencyMetaData dependency : metaData.getDependencies()) {
+            transformed.add(dependency.withRequestedVersion(dependency.getDescriptor().getDynamicConstraintDependencyRevisionId().getRevision()));
+        }
+        metaData.setDependencies(transformed);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleVersionRepository.java
deleted file mode 100644
index fec7c74d83d7..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleVersionRepository.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
-
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
-import org.gradle.api.internal.artifacts.metadata.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class IvyDynamicResolveModuleVersionRepository implements LocalAwareModuleVersionRepository {
-    private final LocalAwareModuleVersionRepository repository;
-
-    public IvyDynamicResolveModuleVersionRepository(LocalAwareModuleVersionRepository repository) {
-        this.repository = repository;
-    }
-
-    public String getId() {
-        return repository.getId();
-    }
-
-    public String getName() {
-        return repository.getName();
-    }
-
-    public void localListModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-        repository.localListModuleVersions(dependency, result);
-    }
-
-    public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-        repository.listModuleVersions(dependency, result);
-    }
-
-    public void getLocalDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        repository.getLocalDependency(dependency, result);
-        if (result.getState() == BuildableModuleVersionMetaDataResolveResult.State.Resolved) {
-            transformDependencies(result);
-        }
-    }
-
-    public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        repository.getDependency(dependency, result);
-        if (result.getState() == BuildableModuleVersionMetaDataResolveResult.State.Resolved) {
-            transformDependencies(result);
-        }
-    }
-
-    private void transformDependencies(BuildableModuleVersionMetaDataResolveResult result) {
-        MutableModuleVersionMetaData metaData = result.getMetaData();
-        List<DependencyMetaData> transformed = new ArrayList<DependencyMetaData>();
-        for (DependencyMetaData dependency : metaData.getDependencies()) {
-            transformed.add(dependency.withRequestedVersion(dependency.getDescriptor().getDynamicConstraintDependencyRevisionId().getRevision()));
-        }
-        metaData.setDependencies(transformed);
-    }
-
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        repository.resolveModuleArtifacts(component, context, result);
-    }
-
-    public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
-        repository.resolveArtifact(artifact, moduleSource, result);
-    }
-
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalArtifactsModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalArtifactsModuleVersionRepository.java
deleted file mode 100644
index fe63cd988656..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalArtifactsModuleVersionRepository.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
-
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
-import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
-
-// TODO This is a bit of a hack to allow us to avoid caching on the filesystem when the set of artifacts can be calculated cheaply.
-// A better long term solution might be to push the caching down to the resource layer, so that the answer to artifactExists() could be cached.
-public interface LocalArtifactsModuleVersionRepository extends ModuleVersionRepository {
-    /**
-     * Resolves a set of artifacts belonging to the gi  ven module, without making any network requests. Any failures are packaged up in the result.
-     * If no local resolution is possible, then the result should be set via {@link #resolveModuleArtifacts}.
-     */
-    void localResolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result);
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalAwareModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalAwareModuleVersionRepository.java
deleted file mode 100644
index f91009455e72..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalAwareModuleVersionRepository.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
-
-import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
-
-public interface LocalAwareModuleVersionRepository extends ModuleVersionRepository {
-    /**
-     * Lists the available versions for a module, using only local resources.
-     */
-    void localListModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result);
-
-    /**
-     * Lists the available versions for a module, using whichever resources are appropriate.
-     * Always called after {@link #localListModuleVersions(org.gradle.api.internal.artifacts.metadata.DependencyMetaData, BuildableModuleVersionSelectionResolveResult)}.
-     */
-    void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result);
-
-    /**
-     * Locates the given dependency, using only local resources.
-     */
-    void getLocalDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result);
-
-    /**
-     * Locates the given dependency, using whichever resources are appropriate. Always called after {@link #getLocalDependency(DependencyMetaData, BuildableModuleVersionMetaDataResolveResult)}.
-     */
-    void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result);
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalModuleComponentRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalModuleComponentRepository.java
new file mode 100644
index 000000000000..21ad64dc8ed3
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LocalModuleComponentRepository.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
+
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
+import org.gradle.api.internal.artifacts.ivyservice.ArtifactType;
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ComponentUsage;
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
+import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+
+public class LocalModuleComponentRepository extends BaseModuleComponentRepository {
+    private final ModuleMetadataProcessor processor;
+    private final LocalAccess localAccess = new LocalAccess();
+    private final RemoteAccess remoteAccess = new RemoteAccess();
+
+    public LocalModuleComponentRepository(ModuleComponentRepository delegate, ModuleMetadataProcessor processor) {
+        super(delegate);
+        this.processor = processor;
+    }
+
+    public ModuleComponentRepositoryAccess getLocalAccess() {
+        return localAccess;
+    }
+
+    public ModuleComponentRepositoryAccess getRemoteAccess() {
+        return remoteAccess;
+    }
+
+    private class LocalAccess implements ModuleComponentRepositoryAccess {
+        public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+            delegate.getLocalAccess().listModuleVersions(dependency, result);
+            if (!result.hasResult()) {
+                delegate.getRemoteAccess().listModuleVersions(dependency, result);
+            }
+        }
+
+        public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+            delegate.getLocalAccess().resolveComponentMetaData(dependency, moduleComponentIdentifier, result);
+            if (!result.hasResult()) {
+                delegate.getRemoteAccess().resolveComponentMetaData(dependency, moduleComponentIdentifier, result);
+            }
+
+            if (result.getState() == BuildableModuleVersionMetaDataResolveResult.State.Resolved) {
+                processor.process(result.getMetaData());
+            }
+        }
+
+        public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+            delegate.getLocalAccess().resolveModuleArtifacts(component, artifactType, result);
+            if(!result.hasResult()) {
+                delegate.getRemoteAccess().resolveModuleArtifacts(component, artifactType, result);
+            }
+        }
+
+        public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+            delegate.getLocalAccess().resolveModuleArtifacts(component, componentUsage, result);
+            if(!result.hasResult()) {
+                delegate.getRemoteAccess().resolveModuleArtifacts(component, componentUsage, result);
+            }
+        }
+
+        public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+            delegate.getLocalAccess().resolveArtifact(artifact, moduleSource, result);
+            if(!result.hasResult()) {
+                delegate.getRemoteAccess().resolveArtifact(artifact, moduleSource, result);
+            }
+        }
+    }
+
+    private static class RemoteAccess implements ModuleComponentRepositoryAccess {
+        public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+        }
+
+        public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+        }
+
+        public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+        }
+
+        public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+        }
+
+        public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepository.java
similarity index 56%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionRepository.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepository.java
index 6ff791198062..f0c4f99e36cd 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,29 +13,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
 
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolver;
-import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
 
 /**
- * A repository of module versions.
+ * A repository of module components.
  *
  * The plan is to sync this with {@link org.gradle.api.internal.artifacts.ivyservice.DependencyToModuleVersionResolver} and rename it
  * to have 'resolver' instead of 'repository' in its name.
  */
-public interface ModuleVersionRepository extends ArtifactResolver {
+public interface ModuleComponentRepository {
     String getId();
 
     String getName();
 
     /**
-     * Resolves the given dependency to a list of module versions.
+     * @return True if the underlying repository can provide a full list of module versions for a selector.
      */
-    void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result);
+    // TODO:DAZ Remove this when we remove IvyDependencyResolverAdapater
+    boolean canListModuleVersions();
 
-    /**
-     * Resolves the given dependency to the corresponding module version meta-data.
-     */
-    void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result);
+    ModuleComponentRepositoryAccess getLocalAccess();
+
+    ModuleComponentRepositoryAccess getRemoteAccess();
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess.java
new file mode 100644
index 000000000000..dde154d2c0c7
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleComponentRepositoryAccess.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
+
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.ArtifactType;
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ComponentUsage;
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
+import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+
+/**
+ * Provides access to a repository of components that are identified by a ModuleComponentIdentifier.
+ */
+public interface ModuleComponentRepositoryAccess {
+    /**
+     * Resolves the given dependency to a list of module versions.
+     */
+    void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result);
+
+    /**
+     * Gets the metadata for a module component.
+     */
+    void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result);
+
+    /**
+     * Resolves a set of artifacts belonging to the given component, based on the supplied usage. Any failures are packaged up in the result.
+     */
+    void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result);
+
+    /**
+     * Resolves a set of artifacts belonging to the given component, with the type specified. Any failures are packaged up in the result.
+     */
+    void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result);
+
+    /**
+     * Resolves the given artifact. Any failures are packaged up in the result.
+     */
+    void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result);
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionListing.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionListing.java
index 51b33e8fa05a..28eb1b08d968 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionListing.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ModuleVersionListing.java
@@ -15,16 +15,8 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
 
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy;
-
-import java.util.List;
 import java.util.Set;
 
 public interface ModuleVersionListing {
-
     Set<Versioned> getVersions();
-
-    boolean isEmpty();
-
-    List<Versioned> sortLatestFirst(LatestStrategy latestStrategy);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NewestVersionComponentChooser.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NewestVersionComponentChooser.java
new file mode 100644
index 000000000000..6e87ce2c4bf2
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NewestVersionComponentChooser.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
+
+import org.gradle.api.artifacts.ModuleVersionSelector;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionMatcher;
+import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
+
+import java.util.Collections;
+import java.util.List;
+
+class NewestVersionComponentChooser implements ComponentChooser {
+    private final VersionMatcher versionMatcher;
+    private final LatestStrategy latestStrategy;
+
+    NewestVersionComponentChooser(LatestStrategy latestStrategy, VersionMatcher versionMatcher) {
+        this.latestStrategy = latestStrategy;
+        this.versionMatcher = versionMatcher;
+    }
+
+    public boolean canSelectMultipleComponents(ModuleVersionSelector selector) {
+        return versionMatcher.isDynamic(selector.getVersion());
+    }
+
+    public ComponentMetaData choose(ComponentMetaData one, ComponentMetaData two) {
+        if (one == null || two == null) {
+            return two == null ? one : two;
+        }
+
+        int comparison = latestStrategy.compare(new VersionInfo(one.getId().getVersion()), new VersionInfo(two.getId().getVersion()));
+
+        if (comparison == 0) {
+            if (isGeneratedModuleDescriptor(one) && !isGeneratedModuleDescriptor(two)) {
+                return two;
+            }
+            return one;
+        }
+
+        return comparison < 0 ? two : one;
+    }
+
+    private boolean isGeneratedModuleDescriptor(ComponentMetaData componentMetaData) {
+        return componentMetaData.getDescriptor().isDefault();
+    }
+
+    public ModuleComponentIdentifier choose(ModuleVersionListing versions, DependencyMetaData dependency, ModuleComponentRepositoryAccess moduleAccess) {
+        if (versionMatcher.needModuleMetadata(dependency.getRequested().getVersion())) {
+            return chooseBestMatchingDependencyWithMetaData(versions, dependency, moduleAccess);
+        } else {
+            return chooseBestMatchingDependency(versions, dependency.getRequested());
+        }
+    }
+
+    private ModuleComponentIdentifier chooseBestMatchingDependency(ModuleVersionListing versions, ModuleVersionSelector requested) {
+        for (Versioned candidate : sortLatestFirst(versions)) {
+            if (versionMatcher.accept(requested.getVersion(), candidate.getVersion())) {
+                return DefaultModuleComponentIdentifier.newId(requested.getGroup(), requested.getName(), candidate.getVersion());
+            }
+        }
+        return null;
+    }
+
+    private ModuleComponentIdentifier chooseBestMatchingDependencyWithMetaData(ModuleVersionListing versions, DependencyMetaData dependency, ModuleComponentRepositoryAccess moduleAccess) {
+        for (Versioned candidate : sortLatestFirst(versions)) {
+            MutableModuleVersionMetaData metaData = resolveComponentMetaData(dependency, candidate, moduleAccess);
+            if (versionMatcher.accept(dependency.getRequested().getVersion(), metaData)) {
+                // We already resolved the correct module.
+                return metaData.getComponentId();
+            }
+        }
+        return null;
+    }
+
+    private MutableModuleVersionMetaData resolveComponentMetaData(DependencyMetaData dependency, Versioned candidate, ModuleComponentRepositoryAccess moduleAccess) {
+        ModuleVersionSelector selector = dependency.getRequested();
+        ModuleComponentIdentifier candidateId = DefaultModuleComponentIdentifier.newId(selector.getGroup(), selector.getName(), candidate.getVersion());
+        DependencyMetaData moduleVersionDependency = dependency.withRequestedVersion(candidate.getVersion());
+        BuildableModuleVersionMetaDataResolveResult descriptorResult = new DefaultBuildableModuleVersionMetaDataResolveResult();
+        moduleAccess.resolveComponentMetaData(moduleVersionDependency, candidateId, descriptorResult);
+        return descriptorResult.getMetaData();
+    }
+
+    private List<Versioned> sortLatestFirst(ModuleVersionListing listing) {
+        List<Versioned> sorted = latestStrategy.sort(listing.getVersions());
+        Collections.reverse(sorted);
+        return sorted;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolver.java
index 063ec667a6a1..146f508c2f7a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolver.java
@@ -15,10 +15,7 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve;
 
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext;
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolver;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.*;
 import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
 import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
 import org.gradle.internal.Transformers;
@@ -26,24 +23,46 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-// TODO:DAZ Unit test
 class RepositoryChainArtifactResolver implements ArtifactResolver {
-    private final Map<String, ModuleVersionRepository> repositories = new LinkedHashMap<String, ModuleVersionRepository>();
+    private final Map<String, ModuleComponentRepository> repositories = new LinkedHashMap<String, ModuleComponentRepository>();
 
-    void add(ModuleVersionRepository repository) {
+    void add(ModuleComponentRepository repository) {
         repositories.put(repository.getId(), repository);
     }
 
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        findSourceRepository(component.getSource()).resolveModuleArtifacts(unpackSource(component), context, result);
+    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+        ModuleComponentRepository sourceRepository = findSourceRepository(component.getSource());
+        ComponentMetaData unpackedComponent = unpackSource(component);
+        // First try to determine the artifacts locally before going remote
+        sourceRepository.getLocalAccess().resolveModuleArtifacts(unpackedComponent, artifactType, result);
+        if (!result.hasResult()) {
+            sourceRepository.getRemoteAccess().resolveModuleArtifacts(unpackedComponent, artifactType, result);
+        }
+    }
+
+    public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage usage, BuildableArtifactSetResolveResult result) {
+        ModuleComponentRepository sourceRepository = findSourceRepository(component.getSource());
+        ComponentMetaData unpackedComponent = unpackSource(component);
+        // First try to determine the artifacts locally before going remote
+        sourceRepository.getLocalAccess().resolveModuleArtifacts(unpackedComponent, usage, result);
+        if (!result.hasResult()) {
+            sourceRepository.getRemoteAccess().resolveModuleArtifacts(unpackedComponent, usage, result);
+        }
     }
 
     public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource source, BuildableArtifactResolveResult result) {
-        findSourceRepository(source).resolveArtifact(artifact, unpackSource(source), result);
+        ModuleComponentRepository sourceRepository = findSourceRepository(source);
+        ModuleSource unpackedSource = unpackSource(source);
+
+        // First try to resolve the artifacts locally before going remote
+        sourceRepository.getLocalAccess().resolveArtifact(artifact, unpackedSource, result);
+        if (!result.hasResult()) {
+            sourceRepository.getRemoteAccess().resolveArtifact(artifact, unpackedSource, result);
+        }
     }
 
-    private ModuleVersionRepository findSourceRepository(ModuleSource originalSource) {
-        ModuleVersionRepository moduleVersionRepository = repositories.get(repositorySource(originalSource).getRepositoryId());
+    private ModuleComponentRepository findSourceRepository(ModuleSource originalSource) {
+        ModuleComponentRepository moduleVersionRepository = repositories.get(repositorySource(originalSource).getRepositoryId());
         if (moduleVersionRepository == null) {
             throw new IllegalStateException("Attempting to resolve artifacts from invalid repository");
         }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolver.java
index 9946d15c2094..0d58645c0b7a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolver.java
@@ -18,11 +18,11 @@
 
 import org.gradle.api.Transformer;
 import org.gradle.api.artifacts.ModuleVersionSelector;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.ivyservice.BuildableComponentResolveResult;
 import org.gradle.api.internal.artifacts.ivyservice.DependencyToModuleVersionResolver;
 import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionResolveException;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionMatcher;
 import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData;
 import org.slf4j.Logger;
@@ -33,30 +33,27 @@
 import java.util.LinkedList;
 import java.util.List;
 
-// TODO:DAZ This needs to be broken up
 public class RepositoryChainDependencyResolver implements DependencyToModuleVersionResolver {
     private static final Logger LOGGER = LoggerFactory.getLogger(RepositoryChainDependencyResolver.class);
 
-    private final List<LocalAwareModuleVersionRepository> moduleVersionRepositories = new ArrayList<LocalAwareModuleVersionRepository>();
-    private final List<String> moduleVersionRepositoryNames = new ArrayList<String>();
-    private final VersionMatcher versionMatcher;
-    private final LatestStrategy latestStrategy;
+    private final List<ModuleComponentRepository> repositories = new ArrayList<ModuleComponentRepository>();
+    private final List<String> repositoryNames = new ArrayList<String>();
+    private final ComponentChooser componentChooser;
     private final Transformer<ModuleVersionMetaData, RepositoryChainModuleResolution> metaDataFactory;
 
-    public RepositoryChainDependencyResolver(VersionMatcher versionMatcher, LatestStrategy latestStrategy, Transformer<ModuleVersionMetaData, RepositoryChainModuleResolution> metaDataFactory) {
-        this.versionMatcher = versionMatcher;
-        this.latestStrategy = latestStrategy;
+    public RepositoryChainDependencyResolver(ComponentChooser componentChooser, Transformer<ModuleVersionMetaData, RepositoryChainModuleResolution> metaDataFactory) {
+        this.componentChooser = componentChooser;
         this.metaDataFactory = metaDataFactory;
     }
 
-    public void add(LocalAwareModuleVersionRepository repository) {
-        moduleVersionRepositories.add(repository);
-        moduleVersionRepositoryNames.add(repository.getName());
+    public void add(ModuleComponentRepository repository) {
+        repositories.add(repository);
+        repositoryNames.add(repository.getName());
     }
 
     public void resolve(DependencyMetaData dependency, BuildableComponentResolveResult result) {
         ModuleVersionSelector requested = dependency.getRequested();
-        LOGGER.debug("Attempting to resolve module '{}' using repositories {}", requested, moduleVersionRepositoryNames);
+        LOGGER.debug("Attempting to resolve module '{}' using repositories {}", requested, repositoryNames);
         List<Throwable> errors = new ArrayList<Throwable>();
         final RepositoryChainModuleResolution latestResolved = findLatestModule(dependency, errors);
         if (latestResolved != null) {
@@ -76,14 +73,15 @@ public void resolve(DependencyMetaData dependency, BuildableComponentResolveResu
     }
 
     private RepositoryChainModuleResolution findLatestModule(DependencyMetaData dependency, Collection<Throwable> failures) {
+        boolean dynamicSelector = componentChooser.canSelectMultipleComponents(dependency.getRequested());
         LinkedList<RepositoryResolveState> queue = new LinkedList<RepositoryResolveState>();
-        for (LocalAwareModuleVersionRepository repository : moduleVersionRepositories) {
-            queue.add(createRepositoryResolveState(repository, dependency));
+        for (ModuleComponentRepository repository : repositories) {
+            queue.add(createRepositoryResolveState(repository, dynamicSelector));
         }
         LinkedList<RepositoryResolveState> missing = new LinkedList<RepositoryResolveState>();
 
         // A first pass to do local resolves only
-        RepositoryChainModuleResolution best = findLatestModule(dependency, queue, failures, missing);
+        RepositoryChainModuleResolution best = findLatestModule(dependency, dynamicSelector, queue, failures, missing);
         if (best != null) {
             return best;
         }
@@ -91,18 +89,18 @@ private RepositoryChainModuleResolution findLatestModule(DependencyMetaData depe
         // Nothing found - do a second pass
         queue.addAll(missing);
         missing.clear();
-        return findLatestModule(dependency, queue, failures, missing);
+        return findLatestModule(dependency, dynamicSelector, queue, failures, missing);
     }
 
-    private RepositoryResolveState createRepositoryResolveState(LocalAwareModuleVersionRepository repository, DependencyMetaData dependency) {
-        if (versionMatcher.isDynamic(dependency.getRequested().getVersion())) {
-            return new DynamicVersionRepositoryResolveState(repository);
+    private RepositoryResolveState createRepositoryResolveState(ModuleComponentRepository repository, boolean isDynamicSelector) {
+        if (isDynamicSelector) {
+            return new DynamicVersionRepositoryResolveState(repository, componentChooser);
         }
         return new StaticVersionRepositoryResolveState(repository);
     }
 
-    private RepositoryChainModuleResolution findLatestModule(DependencyMetaData dependency, LinkedList<RepositoryResolveState> queue, Collection<Throwable> failures, Collection<RepositoryResolveState> missing) {
-        boolean isStaticVersion = !versionMatcher.isDynamic(dependency.getRequested().getVersion());
+    private RepositoryChainModuleResolution findLatestModule(DependencyMetaData dependency, boolean dynamicSelector, LinkedList<RepositoryResolveState> queue, Collection<Throwable> failures, Collection<RepositoryResolveState> missing) {
+        boolean isStaticVersion = !dynamicSelector;
         RepositoryChainModuleResolution best = null;
         while (!queue.isEmpty()) {
             RepositoryResolveState request = queue.removeFirst();
@@ -146,151 +144,86 @@ private RepositoryChainModuleResolution chooseBest(RepositoryChainModuleResoluti
         if (one == null || two == null) {
             return two == null ? one : two;
         }
-        if (one.module == null || two.module == null) {
-            return two.module == null ? one : two;
-        }
-
-        int comparison = latestStrategy.compare(one, two);
-
-        if (comparison == 0) {
-            if (one.isGeneratedModuleDescriptor() && !two.isGeneratedModuleDescriptor()) {
-                return two;
-            }
-            return one;
-        }
-
-        return comparison < 0 ? two : one;
+        return componentChooser.choose(one.module, two.module) == one.module ? one : two;
     }
 
     public static abstract class RepositoryResolveState {
-        final LocalAwareModuleVersionRepository repository;
-        final DefaultBuildableModuleVersionSelectionResolveResult selectionResult = new DefaultBuildableModuleVersionSelectionResolveResult();
-        final DefaultBuildableModuleVersionMetaDataResolveResult resolveResult = new DefaultBuildableModuleVersionMetaDataResolveResult();
-        boolean searchedLocally;
+        private final BuildableModuleVersionMetaDataResolveResult resolveResult = new DefaultBuildableModuleVersionMetaDataResolveResult();
+        final ModuleComponentRepository repository;
+
+        private boolean searchedLocally;
         boolean searchedRemotely;
 
-        public RepositoryResolveState(LocalAwareModuleVersionRepository repository) {
+        public RepositoryResolveState(ModuleComponentRepository repository) {
             this.repository = repository;
         }
 
         void resolve(DependencyMetaData dependency) {
             if (!searchedLocally) {
                 searchedLocally = true;
-                process(dependency, new LocalModuleAccess());
+                process(dependency, repository.getLocalAccess(), resolveResult);
             } else {
                 searchedRemotely = true;
-                process(dependency, new RemoteModuleAccess());
+                process(dependency, repository.getRemoteAccess(), resolveResult);
             }
             if (resolveResult.getState() == BuildableModuleVersionMetaDataResolveResult.State.Failed) {
                 throw resolveResult.getFailure();
             }
         }
 
-        protected abstract void process(DependencyMetaData dependency, ModuleAccess localModuleAccess);
+        protected abstract void process(DependencyMetaData dependency, ModuleComponentRepositoryAccess localModuleAccess, BuildableModuleVersionMetaDataResolveResult resolveResult);
 
         public boolean canMakeFurtherAttempts() {
             return !searchedRemotely;
         }
-
-        protected interface ModuleAccess {
-            void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result);
-            void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result);
-        }
-
-        protected class LocalModuleAccess implements ModuleAccess {
-            public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-                repository.localListModuleVersions(dependency, result);
-            }
-
-            public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-                repository.getLocalDependency(dependency, result);
-            }
-        }
-
-        protected class RemoteModuleAccess implements ModuleAccess {
-            public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-                repository.listModuleVersions(dependency, result);
-            }
-
-            public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-                repository.getDependency(dependency, result);
-            }
-        }
     }
 
     private class StaticVersionRepositoryResolveState extends RepositoryResolveState {
 
-        public StaticVersionRepositoryResolveState(LocalAwareModuleVersionRepository repository) {
+        public StaticVersionRepositoryResolveState(ModuleComponentRepository repository) {
             super(repository);
         }
 
-        protected void process(DependencyMetaData dependency, ModuleAccess moduleAccess) {
-            moduleAccess.getDependency(dependency, resolveResult);
+        protected void process(DependencyMetaData dependency, ModuleComponentRepositoryAccess moduleAccess, BuildableModuleVersionMetaDataResolveResult resolveResult) {
+            moduleAccess.resolveComponentMetaData(dependency, DefaultModuleComponentIdentifier.newId(dependency.getRequested().getGroup(), dependency.getRequested().getName(), dependency.getRequested().getVersion()), resolveResult);
         }
     }
 
-    private class DynamicVersionRepositoryResolveState extends RepositoryResolveState {
+    private static class DynamicVersionRepositoryResolveState extends RepositoryResolveState {
+        final DefaultBuildableModuleVersionSelectionResolveResult selectionResult = new DefaultBuildableModuleVersionSelectionResolveResult();
+        private final ComponentChooser versionSelector;
 
-        public DynamicVersionRepositoryResolveState(LocalAwareModuleVersionRepository repository) {
+        public DynamicVersionRepositoryResolveState(ModuleComponentRepository repository, ComponentChooser versionSelector) {
             super(repository);
+            this.versionSelector = versionSelector;
         }
 
-        protected void process(DependencyMetaData dependency, ModuleAccess moduleAccess) {
+        protected void process(DependencyMetaData dependency, ModuleComponentRepositoryAccess moduleAccess, BuildableModuleVersionMetaDataResolveResult resolveResult) {
             moduleAccess.listModuleVersions(dependency, selectionResult);
             switch (selectionResult.getState()) {
                 case Failed:
                     resolveResult.failed(selectionResult.getFailure());
                     break;
                 case ProbablyListed:
-                    if (!resolveDependency(dependency, moduleAccess)) {
+                    if (!resolveDependency(dependency, moduleAccess, resolveResult)) {
                         resolveResult.probablyMissing();
                     }
                     break;
                 case Listed:
-                    if (!resolveDependency(dependency, moduleAccess)) {
+                    if (!resolveDependency(dependency, moduleAccess, resolveResult)) {
                         resolveResult.missing();
                     }
             }
         }
 
-        private boolean resolveDependency(DependencyMetaData dependency, ModuleAccess moduleAccess) {
-            if (versionMatcher.needModuleMetadata(dependency.getRequested().getVersion())) {
-                return getBestMatchingDependencyWithMetaData(dependency, moduleAccess);
-            } else {
-                return getBestMatchingDependency(dependency, moduleAccess);
-            }
-        }
-
-        private boolean getBestMatchingDependency(DependencyMetaData dependency, ModuleAccess moduleAccess) {
-            ModuleVersionSelector selector = dependency.getRequested();
-            for (Versioned candidate : selectionResult.getVersions().sortLatestFirst(latestStrategy)) {
-                if (versionMatcher.accept(selector.getVersion(), candidate.getVersion())) {
-                    moduleAccess.getDependency(dependency.withRequestedVersion(candidate.getVersion()), resolveResult);
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        private boolean getBestMatchingDependencyWithMetaData(DependencyMetaData dependency, ModuleAccess moduleAccess) {
-            ModuleVersionSelector selector = dependency.getRequested();
-            for (Versioned candidate : selectionResult.getVersions().sortLatestFirst(latestStrategy)) {
-                // Resolve the metadata
-                DependencyMetaData moduleVersionDependency = dependency.withRequestedVersion(candidate.getVersion());
-                moduleAccess.getDependency(moduleVersionDependency, resolveResult);
-                if (resolveResult.getState() != BuildableModuleVersionMetaDataResolveResult.State.Resolved) {
-                    // Couldn't load listed module
-                    LOGGER.warn("Could not load metadata for '{}' of listed module '{}' - ignoring.", candidate, selector);
-                    resolveResult.reset();
-                    return true;
-                }
-                if (versionMatcher.accept(selector.getVersion(), resolveResult.getMetaData())) {
-                    // We already resolved the correct module.
-                    return true;
-                }
-                resolveResult.reset();
+        private boolean resolveDependency(DependencyMetaData dependency, ModuleComponentRepositoryAccess moduleAccess, BuildableModuleVersionMetaDataResolveResult resolveResult) {
+            ModuleComponentIdentifier componentIdentifier = versionSelector.choose(selectionResult.getVersions(), dependency, moduleAccess);
+            if (componentIdentifier == null) {
+                return false;
             }
-            return false;
+            dependency = dependency.withRequestedVersion(componentIdentifier.getVersion());
+            moduleAccess.resolveComponentMetaData(dependency, componentIdentifier, resolveResult);
+            return true;
         }
     }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleResolution.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleResolution.java
index d018e2dd01c7..7d20796546ed 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleResolution.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainModuleResolution.java
@@ -18,11 +18,11 @@
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
 
 class RepositoryChainModuleResolution implements Versioned {
-    public final ModuleVersionRepository repository;
+    public final ModuleComponentRepository repository;
     public final MutableModuleVersionMetaData module;
     public final ModuleSource moduleSource;
 
-    public RepositoryChainModuleResolution(ModuleVersionRepository repository, MutableModuleVersionMetaData module, ModuleSource moduleSource) {
+    public RepositoryChainModuleResolution(ModuleComponentRepository repository, MutableModuleVersionMetaData module, ModuleSource moduleSource) {
         this.repository = repository;
         this.module = module;
         this.moduleSource = moduleSource;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ResolveIvyFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ResolveIvyFactory.java
index e87d006281b1..9b666925023a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ResolveIvyFactory.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ResolveIvyFactory.java
@@ -20,17 +20,13 @@
 import org.apache.ivy.core.resolve.ResolveData;
 import org.apache.ivy.core.resolve.ResolveOptions;
 import org.apache.ivy.core.settings.IvySettings;
-import org.gradle.api.Transformer;
-import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.artifacts.ModuleVersionSelector;
 import org.gradle.api.artifacts.cache.ResolutionRules;
-import org.gradle.api.internal.artifacts.DefaultModuleIdentifier;
 import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
 import org.gradle.api.internal.artifacts.configurations.ConfigurationInternal;
 import org.gradle.api.internal.artifacts.configurations.dynamicversion.CachePolicy;
 import org.gradle.api.internal.artifacts.ivyservice.*;
 import org.gradle.api.internal.artifacts.ivyservice.dynamicversions.ModuleVersionsCache;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache.InMemoryDependencyMetadataCache;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache.InMemoryCachedRepositoryFactory;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionMatcher;
 import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleArtifactsCache;
@@ -40,7 +36,7 @@
 import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
 import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
 import org.gradle.api.internal.artifacts.repositories.resolver.ExternalResourceResolver;
-import org.gradle.api.internal.externalresource.cached.CachedArtifactIndex;
+import org.gradle.internal.resource.cached.CachedArtifactIndex;
 import org.gradle.util.BuildCommencedTimeProvider;
 import org.gradle.util.WrapUtil;
 
@@ -52,14 +48,14 @@ public class ResolveIvyFactory {
     private final CacheLockingManager cacheLockingManager;
     private final StartParameterResolutionOverride startParameterResolutionOverride;
     private final BuildCommencedTimeProvider timeProvider;
-    private final InMemoryDependencyMetadataCache inMemoryCache;
+    private final InMemoryCachedRepositoryFactory inMemoryCache;
     private final VersionMatcher versionMatcher;
     private final LatestStrategy latestStrategy;
 
     public ResolveIvyFactory(ModuleVersionsCache moduleVersionsCache, ModuleMetaDataCache moduleMetaDataCache, ModuleArtifactsCache moduleArtifactsCache,
                              CachedArtifactIndex artifactAtRepositoryCachedResolutionIndex,
                              CacheLockingManager cacheLockingManager, StartParameterResolutionOverride startParameterResolutionOverride,
-                             BuildCommencedTimeProvider timeProvider, InMemoryDependencyMetadataCache inMemoryCache, VersionMatcher versionMatcher, LatestStrategy latestStrategy) {
+                             BuildCommencedTimeProvider timeProvider, InMemoryCachedRepositoryFactory inMemoryCache, VersionMatcher versionMatcher, LatestStrategy latestStrategy) {
         this.moduleVersionsCache = moduleVersionsCache;
         this.moduleMetaDataCache = moduleMetaDataCache;
         this.moduleArtifactsCache = moduleArtifactsCache;
@@ -84,35 +80,39 @@ public RepositoryChain create(ConfigurationInternal configuration,
         RepositoryChain parentLookupResolver = new ParentModuleLookupResolver(userResolverChain, cacheLockingManager);
 
         for (ResolutionAwareRepository repository : repositories) {
-            ConfiguredModuleVersionRepository moduleVersionRepository = repository.createResolver();
+            ConfiguredModuleComponentRepository baseRepository = repository.createResolver();
 
-            if (moduleVersionRepository instanceof IvyAwareModuleVersionRepository) {
-                ivyContextualize((IvyAwareModuleVersionRepository) moduleVersionRepository, userResolverChain, configuration.getName());
+            if (baseRepository instanceof IvyAwareModuleComponentRepository) {
+                ivyContextualize((IvyAwareModuleComponentRepository) baseRepository, userResolverChain, configuration.getName());
             }
-            if (moduleVersionRepository instanceof ExternalResourceResolver) {
-                ((ExternalResourceResolver) moduleVersionRepository).setRepositoryChain(parentLookupResolver);
+            if (baseRepository instanceof ExternalResourceResolver) {
+                ((ExternalResourceResolver) baseRepository).setRepositoryChain(parentLookupResolver);
             }
 
-            LocalAwareModuleVersionRepository localAwareRepository;
-            if (moduleVersionRepository.isLocal()) {
-                localAwareRepository = new LocalModuleVersionRepository(moduleVersionRepository, metadataProcessor);
+            // TODO:DAZ In theory we could update this so that _all_ repositories are wrapped in a cache:
+            //     - would need to add local/remote pattern to artifact download
+            //     - This might help later when we integrate in-memory caching with file-backed caching.
+            ModuleComponentRepository moduleComponentRepository = baseRepository;
+            if (baseRepository.isLocal()) {
+                moduleComponentRepository = new LocalModuleComponentRepository(baseRepository, metadataProcessor);
             } else {
-                LocalArtifactsModuleVersionRepository wrapperRepository = new CacheLockingModuleVersionRepository(moduleVersionRepository, cacheLockingManager);
-                wrapperRepository = startParameterResolutionOverride.overrideModuleVersionRepository(wrapperRepository);
-                localAwareRepository = new CachingModuleVersionRepository(wrapperRepository, moduleVersionsCache, moduleMetaDataCache, moduleArtifactsCache, artifactAtRepositoryCachedResolutionIndex,
-                        cachePolicy, timeProvider, metadataProcessor, getModuleExtractor(moduleVersionRepository));
+                moduleComponentRepository = new CacheLockReleasingModuleComponentsRepository(moduleComponentRepository, cacheLockingManager);
+                moduleComponentRepository = startParameterResolutionOverride.overrideModuleVersionRepository(moduleComponentRepository);
+                moduleComponentRepository = new CachingModuleComponentRepository(moduleComponentRepository, moduleVersionsCache, moduleMetaDataCache, moduleArtifactsCache, artifactAtRepositoryCachedResolutionIndex,
+                        cachePolicy, timeProvider, metadataProcessor);
             }
-            if (moduleVersionRepository.isDynamicResolveMode()) {
-                localAwareRepository = new IvyDynamicResolveModuleVersionRepository(localAwareRepository);
+
+            if (baseRepository.isDynamicResolveMode()) {
+                moduleComponentRepository = IvyDynamicResolveModuleComponentRepositoryAccess.wrap(moduleComponentRepository);
             }
-            localAwareRepository = inMemoryCache.cached(localAwareRepository);
-            userResolverChain.add(localAwareRepository);
+            moduleComponentRepository = inMemoryCache.cached(moduleComponentRepository);
+            userResolverChain.add(moduleComponentRepository);
         }
 
         return userResolverChain;
     }
 
-    private void ivyContextualize(IvyAwareModuleVersionRepository ivyAwareRepository, RepositoryChain userResolverChain, String configurationName) {
+    private void ivyContextualize(IvyAwareModuleComponentRepository ivyAwareRepository, RepositoryChain userResolverChain, String configurationName) {
         Ivy ivy = IvyContext.getContext().getIvy();
         IvySettings ivySettings = ivy.getSettings();
         LoopbackDependencyResolver loopbackDependencyResolver = new LoopbackDependencyResolver("main", userResolverChain, cacheLockingManager);
@@ -131,14 +131,6 @@ private ResolveData createResolveData(Ivy ivy, String configurationName) {
         return new ResolveData(ivy.getResolveEngine(), options);
     }
 
-    private Transformer<ModuleIdentifier, ModuleVersionSelector> getModuleExtractor(ConfiguredModuleVersionRepository rootRepository) {
-        // If the backing repository is a custom ivy resolver, then we don't get a full listing
-        if (rootRepository instanceof IvyAwareModuleVersionRepository) {
-            return new LegacyIvyResolverModuleIdExtractor();
-        }
-        return new DefaultModuleIdExtractor();
-    }
-
     /**
      * Provides access to the top-level resolver chain for looking up parent modules when parsing module descriptor files.
      */
@@ -169,10 +161,18 @@ public void run() {
             });
         }
 
-        public void resolveModuleArtifacts(final ComponentMetaData component, final ArtifactResolveContext context, final BuildableArtifactSetResolveResult result) {
-            cacheLockingManager.useCache(String.format("Resolve %s for %s", context.getDescription(), component), new Runnable() {
+        public void resolveModuleArtifacts(final ComponentMetaData component, final ArtifactType artifactType, final BuildableArtifactSetResolveResult result) {
+            cacheLockingManager.useCache(String.format("Resolve %s for %s", artifactType, component), new Runnable() {
                 public void run() {
-                    artifactResolver.resolveModuleArtifacts(component, context, result);
+                    artifactResolver.resolveModuleArtifacts(component, artifactType, result);
+                }
+            });
+        }
+
+        public void resolveModuleArtifacts(final ComponentMetaData component, final ComponentUsage usage, final BuildableArtifactSetResolveResult result) {
+            cacheLockingManager.useCache(String.format("Resolve %s for %s", usage, component), new Runnable() {
+                public void run() {
+                    artifactResolver.resolveModuleArtifacts(component, usage, result);
                 }
             });
         }
@@ -185,18 +185,4 @@ public void run() {
             });
         }
     }
-
-    private static class DefaultModuleIdExtractor implements Transformer<ModuleIdentifier, ModuleVersionSelector> {
-        public ModuleIdentifier transform(ModuleVersionSelector original) {
-            return new DefaultModuleIdentifier(original.getGroup(), original.getName());
-        }
-    }
-
-    // When caching module listing for ivy resolvers, we can only cache for a particular version request
-    // TODO: Remove this when we remove support for Ivy DependencyResolvers
-    private static class LegacyIvyResolverModuleIdExtractor implements Transformer<ModuleIdentifier, ModuleVersionSelector> {
-        public ModuleIdentifier transform(ModuleVersionSelector original) {
-            return new DefaultModuleIdentifier(original.getGroup(), original.getName() + ":" + original.getVersion());
-        }
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/StartParameterResolutionOverride.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/StartParameterResolutionOverride.java
index 3cf09f53e36d..6bae3e3e7234 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/StartParameterResolutionOverride.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/StartParameterResolutionOverride.java
@@ -21,10 +21,8 @@
 import org.gradle.api.artifacts.cache.DependencyResolutionControl;
 import org.gradle.api.artifacts.cache.ModuleResolutionControl;
 import org.gradle.api.artifacts.cache.ResolutionRules;
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionResolveException;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.*;
 import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
 import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
 import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
@@ -74,45 +72,41 @@ public void execute(ArtifactResolutionControl artifactResolutionControl) {
         }
     }
 
-    public LocalArtifactsModuleVersionRepository overrideModuleVersionRepository(LocalArtifactsModuleVersionRepository original) {
+    public ModuleComponentRepository overrideModuleVersionRepository(ModuleComponentRepository original) {
         if (startParameter.isOffline()) {
-            return new OfflineModuleVersionRepository(original);
+            return new OfflineModuleComponentRepository(original);
         }
         return original;
     }
 
-    private static class OfflineModuleVersionRepository implements ModuleVersionRepository, LocalArtifactsModuleVersionRepository {
-        private final LocalArtifactsModuleVersionRepository original;
+    private static class OfflineModuleComponentRepository extends BaseModuleComponentRepository {
 
-        public OfflineModuleVersionRepository(LocalArtifactsModuleVersionRepository original) {
-            this.original = original;
-        }
-
-        public String getId() {
-            return original.getId();
-        }
+        private final FailedRemoteAccess failedRemoteAccess = new FailedRemoteAccess();
 
-        public String getName() {
-            return original.getName();
+        public OfflineModuleComponentRepository(ModuleComponentRepository original) {
+            super(original);
         }
 
-        public boolean isLocal() {
-            return false;
+        @Override
+        public ModuleComponentRepositoryAccess getRemoteAccess() {
+            return failedRemoteAccess;
         }
+    }
 
+    private static class FailedRemoteAccess implements ModuleComponentRepositoryAccess {
         public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
             result.failed(new ModuleVersionResolveException(dependency.getRequested(), "No cached version listing for %s available for offline mode."));
         }
 
-        public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-            result.failed(new ModuleVersionResolveException(dependency.getRequested(), "No cached version of %s available for offline mode."));
+        public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+            result.failed(new ModuleVersionResolveException(moduleComponentIdentifier, "No cached version of %s available for offline mode."));
         }
 
-        public void localResolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-            original.localResolveModuleArtifacts(component, context, result);
+        public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+            result.failed(new ArtifactResolveException(component.getComponentId(), "No cached version available for offline mode"));
         }
 
-        public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
+        public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
             result.failed(new ArtifactResolveException(component.getComponentId(), "No cached version available for offline mode"));
         }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/UserResolverChain.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/UserResolverChain.java
index 797fd3ea4456..da2dd59ada72 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/UserResolverChain.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/UserResolverChain.java
@@ -28,7 +28,7 @@ public class UserResolverChain implements RepositoryChain {
     private final RepositoryChainArtifactResolver artifactResolver = new RepositoryChainArtifactResolver();
 
     public UserResolverChain(VersionMatcher versionMatcher, LatestStrategy latestStrategy) {
-        this.dependencyResolver = new RepositoryChainDependencyResolver(versionMatcher, latestStrategy, new ModuleTransformer());
+        this.dependencyResolver = new RepositoryChainDependencyResolver(new NewestVersionComponentChooser(latestStrategy, versionMatcher), new ModuleTransformer());
     }
 
     public DependencyToModuleVersionResolver getDependencyResolver() {
@@ -39,7 +39,7 @@ public ArtifactResolver getArtifactResolver() {
         return artifactResolver;
     }
 
-    public void add(LocalAwareModuleVersionRepository repository) {
+    public void add(ModuleComponentRepository repository) {
         dependencyResolver.add(repository);
         artifactResolver.add(repository);
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepository.java
deleted file mode 100644
index bf0c0a544c29..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepository.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache;
-
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionMetaDataResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.LocalAwareModuleVersionRepository;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
-import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
-import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
-import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
-
-// TODO:DAZ Add in-memory caching for resolveModuleArtifacts()
-// TODO:DAZ Change this so that it's a decoration over the file-system caching, rather than something completely separate.
-class CachedRepository implements LocalAwareModuleVersionRepository {
-    final DependencyMetadataCache cache;
-    final LocalAwareModuleVersionRepository delegate;
-    final DependencyMetadataCacheStats stats;
-
-    public CachedRepository(DependencyMetadataCache cache, LocalAwareModuleVersionRepository delegate, DependencyMetadataCacheStats stats) {
-        this.cache = cache;
-        this.delegate = delegate;
-        this.stats = stats;
-    }
-
-    public String getId() {
-        return delegate.getId();
-    }
-
-    public String getName() {
-        return delegate.getName();
-    }
-
-    public void localListModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-        if(!cache.supplyLocalModuleVersions(dependency.getRequested(), result)) {
-            delegate.localListModuleVersions(dependency, result);
-            cache.newLocalModuleVersions(dependency.getRequested(), result);
-        }
-    }
-
-    public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-        if(!cache.supplyModuleVersions(dependency.getRequested(), result)) {
-            delegate.listModuleVersions(dependency, result);
-            cache.newModuleVersions(dependency.getRequested(), result);
-        }
-    }
-
-    public void getLocalDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        if(!cache.supplyLocalMetaData(dependency.getRequested(), result)) {
-            delegate.getLocalDependency(dependency, result);
-            cache.newLocalDependencyResult(dependency.getRequested(), result);
-        }
-    }
-
-    public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        if(!cache.supplyMetaData(dependency.getRequested(), result)) {
-            delegate.getDependency(dependency, result);
-            cache.newDependencyResult(dependency.getRequested(), result);
-        }
-    }
-
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        delegate.resolveModuleArtifacts(component, context, result);
-    }
-
-    public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
-        if (!cache.supplyArtifact(artifact.getId(), result)) {
-            delegate.resolveArtifact(artifact, moduleSource, result);
-            cache.newArtifact(artifact.getId(), result);
-        }
-    }
-
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCache.java
deleted file mode 100644
index b2d35cad685b..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCache.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache;
-
-import org.gradle.api.artifacts.ModuleVersionSelector;
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionMetaDataResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionListing;
-import org.gradle.api.internal.artifacts.metadata.ComponentArtifactIdentifier;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult.State.*;
-
-class DependencyMetadataCache {
-    private final Map<ModuleVersionSelector, ModuleVersionListing> localModuleVersionListing = new HashMap<ModuleVersionSelector, ModuleVersionListing>();
-    private final Map<ModuleVersionSelector, ModuleVersionListing> moduleVersionListing = new HashMap<ModuleVersionSelector, ModuleVersionListing>();
-    private final Map<ModuleVersionSelector, CachedModuleVersionResult> localMetaData = new HashMap<ModuleVersionSelector, CachedModuleVersionResult>();
-    private final Map<ModuleVersionSelector, CachedModuleVersionResult> metaData = new HashMap<ModuleVersionSelector, CachedModuleVersionResult>();
-    private final Map<ComponentArtifactIdentifier, File> artifacts = new HashMap<ComponentArtifactIdentifier, File>();
-    private DependencyMetadataCacheStats stats;
-
-    DependencyMetadataCache(DependencyMetadataCacheStats stats) {
-        this.stats = stats;
-    }
-
-    public boolean supplyLocalModuleVersions(ModuleVersionSelector requested, BuildableModuleVersionSelectionResolveResult result) {
-        return supply(requested, result, localModuleVersionListing);
-    }
-
-    public void newLocalModuleVersions(ModuleVersionSelector requested, BuildableModuleVersionSelectionResolveResult result) {
-        newResult(requested, result, localModuleVersionListing);
-    }
-
-    public boolean supplyModuleVersions(ModuleVersionSelector requested, BuildableModuleVersionSelectionResolveResult result) {
-        return supply(requested, result, moduleVersionListing);
-    }
-
-    public void newModuleVersions(ModuleVersionSelector requested, BuildableModuleVersionSelectionResolveResult result) {
-        newResult(requested, result, moduleVersionListing);
-    }
-
-    private boolean supply(ModuleVersionSelector requested, BuildableModuleVersionSelectionResolveResult result, Map<ModuleVersionSelector, ModuleVersionListing> map) {
-        ModuleVersionListing moduleVersionListing = map.get(requested);
-        if (moduleVersionListing == null) {
-            return false;
-        }
-        result.listed(moduleVersionListing);
-        return true;
-    }
-
-    private void newResult(ModuleVersionSelector requested, BuildableModuleVersionSelectionResolveResult result, Map<ModuleVersionSelector, ModuleVersionListing> map) {
-        if (result.getState() == Listed || result.getState() == ProbablyListed) {
-            map.put(requested, result.getVersions());
-        }
-    }
-
-    boolean supplyLocalMetaData(ModuleVersionSelector requested, BuildableModuleVersionMetaDataResolveResult result) {
-        return supply(requested, result, localMetaData, stats);
-    }
-
-    boolean supplyMetaData(ModuleVersionSelector requested, BuildableModuleVersionMetaDataResolveResult result) {
-        return supply(requested, result, metaData, stats);
-    }
-
-    private static boolean supply(ModuleVersionSelector requested, BuildableModuleVersionMetaDataResolveResult result, Map<ModuleVersionSelector, CachedModuleVersionResult> map, DependencyMetadataCacheStats stats) {
-        CachedModuleVersionResult fromCache = map.get(requested);
-        if (fromCache == null) {
-            return false;
-        }
-        fromCache.supply(result);
-        stats.metadataServed++;
-        return true;
-    }
-
-    void newLocalDependencyResult(ModuleVersionSelector requested, BuildableModuleVersionMetaDataResolveResult result) {
-        newResult(requested, result, localMetaData);
-    }
-
-    void newDependencyResult(ModuleVersionSelector requested, BuildableModuleVersionMetaDataResolveResult result) {
-        newResult(requested, result, metaData);
-    }
-
-    private static void newResult(ModuleVersionSelector requested, BuildableModuleVersionMetaDataResolveResult result, Map<ModuleVersionSelector, CachedModuleVersionResult> map) {
-        CachedModuleVersionResult cachedResult = new CachedModuleVersionResult(result);
-        if (cachedResult.isCacheable()) {
-            map.put(requested, cachedResult);
-        }
-    }
-
-    public boolean supplyArtifact(ComponentArtifactIdentifier id, BuildableArtifactResolveResult result) {
-        File fromCache = artifacts.get(id);
-        if (fromCache != null) {
-            result.resolved(fromCache);
-            stats.artifactsServed++;
-            return true;
-        }
-        return false;
-    }
-
-    public void newArtifact(ComponentArtifactIdentifier id, BuildableArtifactResolveResult result) {
-        if (result.getFailure() == null) {
-            artifacts.put(id, result.getFile());
-        }
-    }
-}
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryArtifactsCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryArtifactsCache.java
new file mode 100644
index 000000000000..55c82e645759
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryArtifactsCache.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache;
+
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactIdentifier;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+class InMemoryArtifactsCache {
+    private final Map<ComponentArtifactIdentifier, File> artifacts = new HashMap<ComponentArtifactIdentifier, File>();
+    private InMemoryCacheStats stats;
+
+    InMemoryArtifactsCache(InMemoryCacheStats stats) {
+        this.stats = stats;
+    }
+
+    public boolean supplyArtifact(ComponentArtifactIdentifier id, BuildableArtifactResolveResult result) {
+        File fromCache = artifacts.get(id);
+        if (fromCache != null) {
+            result.resolved(fromCache);
+            stats.artifactsServed++;
+            return true;
+        }
+        return false;
+    }
+
+    public void newArtifact(ComponentArtifactIdentifier id, BuildableArtifactResolveResult result) {
+        if (result.hasResult() && result.getFailure() == null) {
+            artifacts.put(id, result.getFile());
+        }
+    }
+}
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheStats.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCacheStats.java
similarity index 96%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheStats.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCacheStats.java
index 127d5e6d2458..9521be42881f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheStats.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCacheStats.java
@@ -16,7 +16,7 @@
 
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache;
 
-class DependencyMetadataCacheStats {
+class InMemoryCacheStats {
     int cacheInstances;
     int reposWrapped;
     int metadataServed;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedModuleComponentRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedModuleComponentRepository.java
new file mode 100644
index 000000000000..249c878b8f0c
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedModuleComponentRepository.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache;
+
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.*;
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+
+// TODO:DAZ Should share local and remote caches, and use make in-memory caching a decorator over filesystem caching
+class InMemoryCachedModuleComponentRepository extends BaseModuleComponentRepository {
+    final InMemoryCacheStats stats;
+    private final ModuleComponentRepositoryAccess localAccess;
+    private final ModuleComponentRepositoryAccess remoteAccess;
+
+    public InMemoryCachedModuleComponentRepository(InMemoryModuleComponentRepositoryCaches cache, ModuleComponentRepository delegate) {
+        super(delegate);
+        this.stats = cache.stats;
+        this.localAccess = new CachedAccess(delegate.getLocalAccess(), cache.localArtifactsCache, cache.localMetaDataCache);
+        this.remoteAccess = new CachedAccess(delegate.getRemoteAccess(), cache.remoteArtifactsCache, cache.remoteMetaDataCache);
+    }
+
+    @Override
+    public ModuleComponentRepositoryAccess getLocalAccess() {
+        return localAccess;
+    }
+
+    @Override
+    public ModuleComponentRepositoryAccess getRemoteAccess() {
+        return remoteAccess;
+    }
+
+    private class CachedAccess extends BaseModuleComponentRepositoryAccess {
+        private final InMemoryMetaDataCache metaDataCache;
+        private final InMemoryArtifactsCache artifactsCache;
+
+        public CachedAccess(ModuleComponentRepositoryAccess access, InMemoryArtifactsCache artifactsCache, InMemoryMetaDataCache metaDataCache) {
+            super(access);
+            this.artifactsCache = artifactsCache;
+            this.metaDataCache = metaDataCache;
+        }
+
+        public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+            if(!metaDataCache.supplyModuleVersions(dependency.getRequested(), result)) {
+                super.listModuleVersions(dependency, result);
+                metaDataCache.newModuleVersions(dependency.getRequested(), result);
+            }
+        }
+
+        public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+            if(!metaDataCache.supplyMetaData(moduleComponentIdentifier, result)) {
+                super.resolveComponentMetaData(dependency, moduleComponentIdentifier, result);
+                metaDataCache.newDependencyResult(moduleComponentIdentifier, result);
+            }
+        }
+
+        public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+            if (!artifactsCache.supplyArtifact(artifact.getId(), result)) {
+                super.resolveArtifact(artifact, moduleSource, result);
+                artifactsCache.newArtifact(artifact.getId(), result);
+            }
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedRepositoryFactory.java
similarity index 67%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCache.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedRepositoryFactory.java
index b4b07b8f206a..5bad5e5ea561 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCache.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedRepositoryFactory.java
@@ -17,7 +17,7 @@
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache;
 
 import com.google.common.collect.MapMaker;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.LocalAwareModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 import org.gradle.internal.concurrent.Stoppable;
@@ -25,34 +25,34 @@
 import java.util.Map;
 
 /**
- * Caches the dependency metadata (descriptors, artifact files) in memory. Uses soft maps to reduce heap pressure.
+ * Caches the dependency metadata (descriptors, artifact files) in memory.
  */
-public class InMemoryDependencyMetadataCache implements Stoppable {
+public class InMemoryCachedRepositoryFactory implements Stoppable {
 
     public final static String TOGGLE_PROPERTY = "org.gradle.resolution.memorycache";
 
-    private final static Logger LOG = Logging.getLogger(InMemoryDependencyMetadataCache.class);
+    private final static Logger LOG = Logging.getLogger(InMemoryCachedRepositoryFactory.class);
 
-    Map<String, DependencyMetadataCache> cachePerRepo = new MapMaker().makeMap();
+    Map<String, InMemoryModuleComponentRepositoryCaches> cachePerRepo = new MapMaker().makeMap();
 
-    final DependencyMetadataCacheStats stats = new DependencyMetadataCacheStats();
+    final InMemoryCacheStats stats = new InMemoryCacheStats();
 
-    public LocalAwareModuleVersionRepository cached(LocalAwareModuleVersionRepository input) {
+    public ModuleComponentRepository cached(ModuleComponentRepository input) {
         if ("false".equalsIgnoreCase(System.getProperty(TOGGLE_PROPERTY))) {
             return input;
         }
 
-        DependencyMetadataCache dataCache = cachePerRepo.get(input.getId());
+        InMemoryModuleComponentRepositoryCaches caches = cachePerRepo.get(input.getId());
         stats.reposWrapped++;
-        if (dataCache == null) {
+        if (caches == null) {
             LOG.debug("Creating new in-memory cache for repo '{}' [{}].", input.getName(), input.getId());
-            dataCache = new DependencyMetadataCache(stats);
+            caches = new InMemoryModuleComponentRepositoryCaches(stats);
             stats.cacheInstances++;
-            cachePerRepo.put(input.getId(), dataCache);
+            cachePerRepo.put(input.getId(), caches);
         } else {
             LOG.debug("Reusing in-memory cache for repo '{}' [{}].", input.getName(), input.getId());
         }
-        return new CachedRepository(dataCache, input, stats);
+        return new InMemoryCachedModuleComponentRepository(caches, input);
     }
 
     public void stop() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryMetaDataCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryMetaDataCache.java
new file mode 100644
index 000000000000..bca26867ba6e
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryMetaDataCache.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache;
+
+import org.gradle.api.artifacts.ModuleVersionSelector;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionMetaDataResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionListing;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult.State.Listed;
+import static org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult.State.ProbablyListed;
+
+class InMemoryMetaDataCache {
+    private final Map<ModuleVersionSelector, ModuleVersionListing> moduleVersionListing = new HashMap<ModuleVersionSelector, ModuleVersionListing>();
+    private final Map<ModuleComponentIdentifier, CachedModuleVersionResult> metaData = new HashMap<ModuleComponentIdentifier, CachedModuleVersionResult>();
+    private InMemoryCacheStats stats;
+
+    InMemoryMetaDataCache(InMemoryCacheStats stats) {
+        this.stats = stats;
+    }
+
+    public boolean supplyModuleVersions(ModuleVersionSelector requested, BuildableModuleVersionSelectionResolveResult result) {
+        ModuleVersionListing moduleVersionListing1 = moduleVersionListing.get(requested);
+        if (moduleVersionListing1 == null) {
+            return false;
+        }
+        result.listed(moduleVersionListing1);
+        return true;
+    }
+
+    public void newModuleVersions(ModuleVersionSelector requested, BuildableModuleVersionSelectionResolveResult result) {
+        if (result.getState() == Listed || result.getState() == ProbablyListed) {
+            moduleVersionListing.put(requested, result.getVersions());
+        }
+    }
+
+    boolean supplyMetaData(ModuleComponentIdentifier requested, BuildableModuleVersionMetaDataResolveResult result) {
+        CachedModuleVersionResult fromCache = metaData.get(requested);
+        if (fromCache == null) {
+            return false;
+        }
+        fromCache.supply(result);
+        stats.metadataServed++;
+        return true;
+    }
+
+    void newDependencyResult(ModuleComponentIdentifier requested, BuildableModuleVersionMetaDataResolveResult result) {
+        CachedModuleVersionResult cachedResult = new CachedModuleVersionResult(result);
+        if (cachedResult.isCacheable()) {
+            metaData.put(requested, cachedResult);
+        }
+    }
+}
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryModuleComponentRepositoryCaches.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryModuleComponentRepositoryCaches.java
new file mode 100644
index 000000000000..65edd3c18b48
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryModuleComponentRepositoryCaches.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache;
+
+public class InMemoryModuleComponentRepositoryCaches {
+    public final InMemoryMetaDataCache localMetaDataCache;
+    public final InMemoryMetaDataCache remoteMetaDataCache;
+    public final InMemoryArtifactsCache localArtifactsCache;
+    public final InMemoryArtifactsCache remoteArtifactsCache;
+    public final InMemoryCacheStats stats;
+
+    public InMemoryModuleComponentRepositoryCaches(InMemoryCacheStats stats) {
+        this(new InMemoryArtifactsCache(stats),
+                new InMemoryArtifactsCache(stats),
+                new InMemoryMetaDataCache(stats),
+                new InMemoryMetaDataCache(stats),
+                stats);
+    }
+
+    protected InMemoryModuleComponentRepositoryCaches(InMemoryArtifactsCache localArtifactsCache, InMemoryArtifactsCache remoteArtifactsCache,
+                                                      InMemoryMetaDataCache localMetaDataCache, InMemoryMetaDataCache remoteMetaDataCache,
+                                                      InMemoryCacheStats stats) {
+        this.localArtifactsCache = localArtifactsCache;
+        this.remoteArtifactsCache = remoteArtifactsCache;
+        this.localMetaDataCache = localMetaDataCache;
+        this.remoteMetaDataCache = remoteMetaDataCache;
+        this.stats = stats;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractModuleDescriptorParser.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractModuleDescriptorParser.java
index 398a4134e231..cc3037c18446 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractModuleDescriptorParser.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractModuleDescriptorParser.java
@@ -17,8 +17,8 @@
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser;
 
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 import org.gradle.internal.resource.local.DefaultLocallyAvailableResource;
 import org.gradle.internal.resource.local.LocallyAvailableResource;
 
@@ -27,7 +27,7 @@
 public abstract class AbstractModuleDescriptorParser implements MetaDataParser {
     public MutableModuleVersionMetaData parseMetaData(DescriptorParseContext ivySettings, File descriptorFile, boolean validate) throws MetaDataParseException {
         LocallyAvailableResource localResource = new DefaultLocallyAvailableResource(descriptorFile);
-        LocallyAvailableExternalResource resource = new DefaultLocallyAvailableExternalResource(descriptorFile.toURI().toString(), localResource);
+        LocallyAvailableExternalResource resource = new DefaultLocallyAvailableExternalResource(descriptorFile.toURI(), localResource);
         return parseDescriptor(ivySettings, resource, validate);
     }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DescriptorParseContext.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DescriptorParseContext.java
index adabd7d1fe87..95cfdd694641 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DescriptorParseContext.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DescriptorParseContext.java
@@ -16,12 +16,9 @@
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser;
 
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.api.artifacts.result.Artifact;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 
 public interface DescriptorParseContext {
-    boolean artifactExists(ModuleVersionArtifactMetaData artifact);
-
-    LocallyAvailableExternalResource getMetaDataArtifact(ModuleVersionIdentifier moduleVersionIdentifier, Class<? extends SoftwareArtifact> artifactType);
+    LocallyAvailableExternalResource getMetaDataArtifact(ModuleVersionIdentifier moduleVersionIdentifier, Class<? extends Artifact> artifactType);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedDescriptorParseContext.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedDescriptorParseContext.java
index dc7dab8a1eb8..803c09abde73 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedDescriptorParseContext.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedDescriptorParseContext.java
@@ -17,20 +17,16 @@
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser;
 
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.api.artifacts.result.Artifact;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 
 /**
  * An implementation of {@link DescriptorParseContext} that is useful for parsing an ivy.xml file without attempting to download
  * other resources from a DependencyResolver.
  */
 public class DisconnectedDescriptorParseContext implements DescriptorParseContext {
-    public boolean artifactExists(ModuleVersionArtifactMetaData artifact) {
-        return false;
-    }
 
-    public LocallyAvailableExternalResource getMetaDataArtifact(ModuleVersionIdentifier moduleVersionIdentifier, Class<? extends SoftwareArtifact> artifactType) {
+    public LocallyAvailableExternalResource getMetaDataArtifact(ModuleVersionIdentifier moduleVersionIdentifier, Class<? extends Artifact> artifactType) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParser.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParser.java
index c311610ef9f4..847091942e7f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParser.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParser.java
@@ -20,8 +20,8 @@
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 import org.xml.sax.SAXException;
 
 import java.io.IOException;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorBuilder.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorBuilder.java
index 6a253cecfb31..d77a83065ccf 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorBuilder.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorBuilder.java
@@ -24,15 +24,9 @@
 import org.apache.ivy.plugins.matcher.ExactPatternMatcher;
 import org.apache.ivy.plugins.matcher.PatternMatcher;
 import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser;
-import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
-import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.ivyservice.IvyUtil;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.PomReader.PomDependencyData;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.PomDependencyMgt;
-import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactMetaData;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.util.DeprecationLogger;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -160,18 +154,16 @@ public void addMappingConfs(DefaultDependencyDescriptor dd, boolean isOptional)
 
     private ModuleRevisionId mrid;
 
-    private DescriptorParseContext parserSettings;
     private final PomReader pomReader;
 
-    public GradlePomModuleDescriptorBuilder(ExternalResource res, DescriptorParseContext ivySettings, PomReader pomReader) {
+    public GradlePomModuleDescriptorBuilder(PomReader pomReader) {
         ivyModuleDescriptor = new DefaultModuleDescriptor(XmlModuleDescriptorParser.getInstance(), null);
-        ivyModuleDescriptor.setResolvedPublicationDate(new Date(res.getLastModified()));
+        ivyModuleDescriptor.setResolvedPublicationDate(new Date());
         for (Configuration maven2Configuration : MAVEN2_CONFIGURATIONS) {
             ivyModuleDescriptor.addConfiguration(maven2Configuration);
         }
         ivyModuleDescriptor.setMappingOverride(true);
         ivyModuleDescriptor.addExtraAttributeNamespace("m", Ivy.getIvyHomeURL() + "maven");
-        parserSettings = ivySettings;
         this.pomReader = pomReader;
     }
 
@@ -212,30 +204,6 @@ public void setLicenses(Iterable<License> licenses) {
         }
     }
 
-    public void addMainArtifact(String artifactId, String packaging) {
-        if ("pom".equals(packaging)) {
-            return;
-        }
-
-        if (!isKnownJarPackaging(packaging)) {
-            ModuleComponentIdentifier componentIdentifier = DefaultModuleComponentIdentifier.newId(mrid.getOrganisation(), mrid.getName(), mrid.getRevision());
-            DefaultArtifact artifact = new DefaultArtifact(mrid, new Date(), artifactId, packaging, packaging);
-            ModuleVersionArtifactMetaData artifactMetaData = new DefaultModuleVersionArtifactMetaData(componentIdentifier, artifact);
-            if (parserSettings.artifactExists(artifactMetaData)) {
-                ivyModuleDescriptor.addArtifact("master", artifact);
-
-                DeprecationLogger.nagUserOfDeprecated("Relying on packaging to define the extension of the main artifact");
-                return;
-            }
-        }
-
-        ivyModuleDescriptor.addArtifact("master", new DefaultArtifact(mrid, new Date(), artifactId, packaging, "jar"));
-    }
-
-    private boolean isKnownJarPackaging(String packaging) {
-        return "jar".equals(packaging) || JAR_PACKAGINGS.contains(packaging);
-    }
-
     public void addDependency(PomDependencyData dep) {
         String scope = dep.getScope();
         if ((scope != null) && (scope.length() > 0) && !MAVEN2_CONF_MAPPING.containsKey(scope)) {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParser.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParser.java
index a1d0b1d4f839..e21a3a15877e 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParser.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParser.java
@@ -25,10 +25,10 @@
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.PomReader.PomDependencyData;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.MavenDependencyKey;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.PomDependencyMgt;
-import org.gradle.api.internal.artifacts.metadata.ModuleDescriptorAdapter;
+import org.gradle.api.internal.artifacts.metadata.DefaultMavenModuleVersionMetaData;
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-import org.gradle.api.internal.artifacts.resolution.MavenPomArtifact;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.api.internal.artifacts.result.metadata.MavenPomArtifact;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
@@ -58,21 +58,15 @@ public String toString() {
 
     protected MutableModuleVersionMetaData doParseDescriptor(DescriptorParseContext parserSettings, LocallyAvailableExternalResource resource, boolean validate) throws IOException, ParseException, SAXException {
         PomReader pomReader = new PomReader(resource);
-        GradlePomModuleDescriptorBuilder mdBuilder = new GradlePomModuleDescriptorBuilder(resource, parserSettings, pomReader);
+        GradlePomModuleDescriptorBuilder mdBuilder = new GradlePomModuleDescriptorBuilder(pomReader);
 
         doParsePom(parserSettings, mdBuilder, pomReader);
 
-        String artifactId = pomReader.getArtifactId();
-        if (pomReader.getRelocation() == null) {
-            mdBuilder.addMainArtifact(artifactId, pomReader.getPackaging());
-        }
-
         DefaultModuleDescriptor moduleDescriptor = mdBuilder.getModuleDescriptor();
-        ModuleDescriptorAdapter adapter = new ModuleDescriptorAdapter(moduleDescriptor);
-        if ("pom".equals(pomReader.getPackaging())) {
-            adapter.setMetaDataOnly(true);
+        if(pomReader.getRelocation() != null) {
+            return new DefaultMavenModuleVersionMetaData(moduleDescriptor, "pom", true);
         }
-        return adapter;
+        return new DefaultMavenModuleVersionMetaData(moduleDescriptor, pomReader.getPackaging(), false);
     }
 
     private void doParsePom(DescriptorParseContext parserSettings, GradlePomModuleDescriptorBuilder mdBuilder, PomReader pomReader) throws IOException, SAXException {
@@ -209,7 +203,7 @@ private PomReader parseImportedPom(DescriptorParseContext parseContext, PomDepen
     private PomReader parseOtherPom(DescriptorParseContext parseContext, ModuleVersionIdentifier parentId) throws IOException, SAXException {
         LocallyAvailableExternalResource localResource = parseContext.getMetaDataArtifact(parentId, MavenPomArtifact.class);
         PomReader pomReader = new PomReader(localResource);
-        GradlePomModuleDescriptorBuilder mdBuilder = new GradlePomModuleDescriptorBuilder(localResource, parseContext, pomReader);
+        GradlePomModuleDescriptorBuilder mdBuilder = new GradlePomModuleDescriptorBuilder(pomReader);
         doParsePom(parseContext, mdBuilder, pomReader);
         return pomReader;
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
index e44ee58b7764..296dc2f2f58c 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
@@ -35,12 +35,12 @@
 import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
 import org.gradle.api.internal.artifacts.ivyservice.IvyUtil;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
-import org.gradle.api.internal.artifacts.metadata.ModuleDescriptorAdapter;
+import org.gradle.api.internal.artifacts.metadata.DefaultIvyModuleVersionMetaData;
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-import org.gradle.api.internal.artifacts.resolution.IvyDescriptorArtifact;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.UrlExternalResource;
+import org.gradle.api.internal.artifacts.result.metadata.IvyDescriptorArtifact;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.UrlExternalResource;
 import org.gradle.util.CollectionUtils;
 import org.gradle.util.DeprecationLogger;
 import org.gradle.util.TextUtil;
@@ -65,7 +65,7 @@
 import static org.gradle.api.internal.artifacts.ivyservice.IvyUtil.createModuleRevisionId;
 
 /**
- * Copied from org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser into Gradle codebase.
+ * Copied from org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorParser into Gradle codebase, and heavily modified.
  */
 public class IvyXmlModuleDescriptorParser extends AbstractModuleDescriptorParser {
     static final String[] DEPENDENCY_REGULAR_ATTRIBUTES =
@@ -94,7 +94,8 @@ private MutableModuleVersionMetaData doParseDescriptorWithProvidedParser(Parser
         parser.parse();
         DefaultModuleDescriptor moduleDescriptor = parser.getModuleDescriptor();
         postProcess(moduleDescriptor);
-        return new ModuleDescriptorAdapter(moduleDescriptor);
+
+        return new DefaultIvyModuleVersionMetaData(moduleDescriptor);
     }
 
     protected void postProcess(DefaultModuleDescriptor moduleDescriptor) {
@@ -143,7 +144,6 @@ protected abstract static class AbstractParser extends DefaultHandler {
         protected AbstractParser(ExternalResource resource) {
             this.res = resource; // used for log and date only
             md = new DefaultModuleDescriptor(XmlModuleDescriptorParser.getInstance(), null);
-            md.setLastModified(res.getLastModified());
         }
 
         protected void checkErrors() throws ParseException {
@@ -394,10 +394,6 @@ public DefaultModuleDescriptor getModuleDescriptor() throws ParseException {
             return md;
         }
 
-        protected Date getDefaultPubDate() {
-            return new Date(md.getLastModified());
-        }
-
         private void replaceConfigurationWildcards(ModuleDescriptor md) {
             Configuration[] configs = md.getConfigurations();
             for (int i = 0; i < configs.length; i++) {
@@ -506,7 +502,6 @@ public void execute(InputStream inputStream) {
             checkErrors();
             checkConfigurations();
             replaceConfigurationWildcards();
-            getMd().setModuleArtifact(DefaultArtifact.newIvyArtifact(getMd().getResolvedModuleRevisionId(), getMd().getPublicationDate()));
             if (!artifactsDeclared) {
                 String[] configurationNames = getMd().getConfigurationsNames();
                 for (String configurationName : configurationNames) {
@@ -972,10 +967,7 @@ private void infoStarted(Attributes attributes) {
                     getMd().setPublicationDate(ivyDateFormat.parse(pubDate));
                 } catch (ParseException e) {
                     addError("invalid publication date format: " + pubDate);
-                    getMd().setPublicationDate(getDefaultPubDate());
                 }
-            } else {
-                getMd().setPublicationDate(getDefaultPubDate());
             }
         }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParseException.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParseException.java
index 4307a09fc2f2..3dbdd9812e84 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParseException.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParseException.java
@@ -18,7 +18,7 @@
 
 import org.gradle.api.GradleException;
 import org.gradle.internal.exceptions.Contextual;
-import org.gradle.api.internal.externalresource.ExternalResource;
+import org.gradle.internal.resource.ExternalResource;
 
 @Contextual
 public class MetaDataParseException extends GradleException {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParser.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParser.java
index 584e45addff2..fe26ded6156d 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParser.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/MetaDataParser.java
@@ -16,7 +16,7 @@
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser;
 
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 
 import java.io.File;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomDomParser.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomDomParser.java
new file mode 100644
index 000000000000..622b04e3fc91
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomDomParser.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.io.*;
+import java.util.LinkedList;
+import java.util.List;
+
+public final class PomDomParser {
+    private PomDomParser() {}
+
+    public static String getTextContent(Element element) {
+        StringBuilder result = new StringBuilder();
+
+        NodeList childNodes = element.getChildNodes();
+        for (int i = 0; i < childNodes.getLength(); i++) {
+            Node child = childNodes.item(i);
+
+            switch (child.getNodeType()) {
+                case Node.CDATA_SECTION_NODE:
+                case Node.TEXT_NODE:
+                    result.append(child.getNodeValue());
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        return result.toString();
+    }
+
+    public static String getFirstChildText(Element parentElem, String name) {
+        Element node = getFirstChildElement(parentElem, name);
+        if (node != null) {
+            return getTextContent(node);
+        } else {
+            return null;
+        }
+    }
+
+    public static Element getFirstChildElement(Element parentElem, String name) {
+        if (parentElem == null) {
+            return null;
+        }
+        NodeList childs = parentElem.getChildNodes();
+        for (int i = 0; i < childs.getLength(); i++) {
+            Node node = childs.item(i);
+            if (node instanceof Element && name.equals(node.getNodeName())) {
+                return (Element) node;
+            }
+        }
+        return null;
+    }
+
+    public static List<Element> getAllChilds(Element parent) {
+        List<Element> r = new LinkedList<Element>();
+        if (parent != null) {
+            NodeList childs = parent.getChildNodes();
+            for (int i = 0; i < childs.getLength(); i++) {
+                Node node = childs.item(i);
+                if (node instanceof Element) {
+                    r.add((Element) node);
+                }
+            }
+        }
+        return r;
+    }
+
+    public static final class AddDTDFilterInputStream extends FilterInputStream {
+        private static final int MARK = 10000;
+        private static final String DOCTYPE = "<!DOCTYPE project SYSTEM \"m2-entities.ent\">\n";
+
+        private int count;
+        private byte[] prefix = DOCTYPE.getBytes();
+
+        public AddDTDFilterInputStream(InputStream in) throws IOException {
+            super(new BufferedInputStream(in));
+
+            this.in.mark(MARK);
+
+            // TODO: we should really find a better solution for this...
+            // maybe we could use a FilterReader instead of a FilterInputStream?
+            int byte1 = this.in.read();
+            int byte2 = this.in.read();
+            int byte3 = this.in.read();
+
+            if (byte1 == 239 && byte2 == 187 && byte3 == 191) {
+                // skip the UTF-8 BOM
+                this.in.mark(MARK);
+            } else {
+                this.in.reset();
+            }
+
+            int bytesToSkip = 0;
+            LineNumberReader reader = new LineNumberReader(new InputStreamReader(this.in, "UTF-8"), 100);
+            String firstLine = reader.readLine();
+            if (firstLine != null) {
+                String trimmed = firstLine.trim();
+                if (trimmed.startsWith("<?xml ")) {
+                    int endIndex = trimmed.indexOf("?>");
+                    String xmlDecl = trimmed.substring(0, endIndex + 2);
+                    prefix = (xmlDecl + "\n" + DOCTYPE).getBytes();
+                    bytesToSkip = xmlDecl.getBytes().length;
+                }
+            }
+
+            this.in.reset();
+            for (int i = 0; i < bytesToSkip; i++) {
+                this.in.read();
+            }
+        }
+
+        public int read() throws IOException {
+            if (count < prefix.length) {
+                return prefix[count++];
+            }
+
+            return super.read();
+        }
+
+        public int read(byte[] b, int off, int len) throws IOException {
+            if (b == null) {
+                throw new NullPointerException();
+            } else if ((off < 0) || (off > b.length) || (len < 0)
+                    || ((off + len) > b.length) || ((off + len) < 0)) {
+                throw new IndexOutOfBoundsException();
+            } else if (len == 0) {
+                return 0;
+            }
+
+            int nbrBytesCopied = 0;
+
+            if (count < prefix.length) {
+                int nbrBytesFromPrefix = Math.min(prefix.length - count, len);
+                System.arraycopy(prefix, count, b, off, nbrBytesFromPrefix);
+                nbrBytesCopied = nbrBytesFromPrefix;
+            }
+
+            if (nbrBytesCopied < len) {
+                nbrBytesCopied += in.read(b, off + nbrBytesCopied, len - nbrBytesCopied);
+            }
+
+            count += nbrBytesCopied;
+            return nbrBytesCopied;
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReader.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReader.java
index 7ba8117e5ffb..0c91989a576b 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReader.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReader.java
@@ -25,7 +25,7 @@
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.MavenDependencyKey;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.PomDependencyMgt;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.PomProfile;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -36,9 +36,11 @@
 import org.xml.sax.SAXParseException;
 
 import javax.xml.parsers.DocumentBuilder;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.*;
 
+import static org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.PomDomParser.*;
 
 /**
  * Copied from org.apache.ivy.plugins.parser.m2.PomReader.
@@ -75,6 +77,7 @@ public class PomReader implements PomParent {
     private static final String PROFILE_ID = "id";
     private static final String PROFILE_ACTIVATION = "activation";
     private static final String PROFILE_ACTIVATION_ACTIVE_BY_DEFAULT = "activeByDefault";
+    private static final String PROFILE_ACTIVATION_PROPERTY = "property";
 
     private PomParent pomParent = new RootPomParent();
     private final Map<String, String> properties = new HashMap<String, String>();
@@ -585,7 +588,8 @@ public List<PomDependencyData> getDependencies() {
      */
     private List<PomProfile> parseActivePomProfiles() {
         if(declaredActivePomProfiles == null) {
-            List<PomProfile> activePomProfiles = new ArrayList<PomProfile>();
+            List<PomProfile> activeByDefaultPomProfiles = new ArrayList<PomProfile>();
+            List<PomProfile> activeByAbsenceOfPropertyPomProfiles = new ArrayList<PomProfile>();
             Element profilesElement = getFirstChildElement(projectElement, PROFILES);
 
             if(profilesElement != null) {
@@ -597,19 +601,51 @@ private List<PomProfile> parseActivePomProfiles() {
                             String activeByDefault = getFirstChildText(activationElement, PROFILE_ACTIVATION_ACTIVE_BY_DEFAULT);
 
                             if(activeByDefault != null && "true".equals(activeByDefault)) {
-                                activePomProfiles.add(new PomProfileElement(profileElement));
+                                activeByDefaultPomProfiles.add(new PomProfileElement(profileElement));
+                            } else {
+                                Element propertyElement = getFirstChildElement(activationElement, PROFILE_ACTIVATION_PROPERTY);
+
+                                if(propertyElement != null) {
+                                    if(isActivationPropertyActivated(propertyElement)) {
+                                        activeByAbsenceOfPropertyPomProfiles.add(new PomProfileElement(profileElement));
+                                    }
+                                }
                             }
                         }
                     }
                 }
             }
 
-            declaredActivePomProfiles = activePomProfiles;
+            declaredActivePomProfiles = determineActiveProfiles(activeByDefaultPomProfiles, activeByAbsenceOfPropertyPomProfiles);
         }
 
         return declaredActivePomProfiles;
     }
 
+    /**
+     * If a profile is identified as active through any other activation method than activeByDefault, none of the existing
+     * profiles marked as activeByDefault apply.
+     *
+     * @param activeByDefaultPomProfiles Parsed profiles that are active by default
+     * @param activeByAbsenceOfPropertyPomProfiles Parsed profiles that are activated by absence of property
+     * @return List of active profiles that are not activeByDefault
+     */
+    private List<PomProfile> determineActiveProfiles(List<PomProfile> activeByDefaultPomProfiles, List<PomProfile> activeByAbsenceOfPropertyPomProfiles) {
+        return !activeByAbsenceOfPropertyPomProfiles.isEmpty() ? activeByAbsenceOfPropertyPomProfiles : activeByDefaultPomProfiles;
+    }
+
+    /**
+     * Checks if activation property is actived through absense of system property.
+     *
+     * @param propertyElement Property element
+     * @return Activation indicator
+     * @see <a href="http://books.sonatype.com/mvnref-book/reference/profiles-sect-activation.html#profiles-sect-activation-config">Maven documentation</a>
+     */
+    private boolean isActivationPropertyActivated(Element propertyElement) {
+        String propertyName = getFirstChildText(propertyElement, "name");
+        return propertyName.startsWith("!");
+    }
+
     /**
      * @return the content of the properties tag into the pom.
      */
@@ -636,141 +672,4 @@ private String replaceProps(String val) {
             return IvyPatternHelper.substituteVariables(val, properties).trim();
         }
     }
-
-    private static String getTextContent(Element element) {
-        StringBuilder result = new StringBuilder();
-
-        NodeList childNodes = element.getChildNodes();
-        for (int i = 0; i < childNodes.getLength(); i++) {
-            Node child = childNodes.item(i);
-
-            switch (child.getNodeType()) {
-                case Node.CDATA_SECTION_NODE:
-                case Node.TEXT_NODE:
-                    result.append(child.getNodeValue());
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        return result.toString();
-    }
-
-    private static String getFirstChildText(Element parentElem, String name) {
-        Element node = getFirstChildElement(parentElem, name);
-        if (node != null) {
-            return getTextContent(node);
-        } else {
-            return null;
-        }
-    }
-
-    private static Element getFirstChildElement(Element parentElem, String name) {
-        if (parentElem == null) {
-            return null;
-        }
-        NodeList childs = parentElem.getChildNodes();
-        for (int i = 0; i < childs.getLength(); i++) {
-            Node node = childs.item(i);
-            if (node instanceof Element && name.equals(node.getNodeName())) {
-                return (Element) node;
-            }
-        }
-        return null;
-    }
-
-    private static List<Element> getAllChilds(Element parent) {
-        List<Element> r = new LinkedList<Element>();
-        if (parent != null) {
-            NodeList childs = parent.getChildNodes();
-            for (int i = 0; i < childs.getLength(); i++) {
-                Node node = childs.item(i);
-                if (node instanceof Element) {
-                    r.add((Element) node);
-                }
-            }
-        }
-        return r;
-    }
-
-    private static final class AddDTDFilterInputStream extends FilterInputStream {
-        private static final int MARK = 10000;
-        private static final String DOCTYPE = "<!DOCTYPE project SYSTEM \"m2-entities.ent\">\n";
-
-        private int count;
-        private byte[] prefix = DOCTYPE.getBytes();
-
-        private AddDTDFilterInputStream(InputStream in) throws IOException {
-            super(new BufferedInputStream(in));
-
-            this.in.mark(MARK);
-
-            // TODO: we should really find a better solution for this...
-            // maybe we could use a FilterReader instead of a FilterInputStream?
-            int byte1 = this.in.read();
-            int byte2 = this.in.read();
-            int byte3 = this.in.read();
-
-            if (byte1 == 239 && byte2 == 187 && byte3 == 191) {
-                // skip the UTF-8 BOM
-                this.in.mark(MARK);
-            } else {
-                this.in.reset();
-            }
-
-            int bytesToSkip = 0;
-            LineNumberReader reader = new LineNumberReader(new InputStreamReader(this.in, "UTF-8"), 100);
-            String firstLine = reader.readLine();
-            if (firstLine != null) {
-                String trimmed = firstLine.trim();
-                if (trimmed.startsWith("<?xml ")) {
-                    int endIndex = trimmed.indexOf("?>");
-                    String xmlDecl = trimmed.substring(0, endIndex + 2);
-                    prefix = (xmlDecl + "\n" + DOCTYPE).getBytes();
-                    bytesToSkip = xmlDecl.getBytes().length;
-                }
-            }
-
-            this.in.reset();
-            for (int i = 0; i < bytesToSkip; i++) {
-                this.in.read();
-            }
-        }
-
-        public int read() throws IOException {
-            if (count < prefix.length) {
-                return prefix[count++];
-            }
-
-            return super.read();
-        }
-
-        public int read(byte[] b, int off, int len) throws IOException {
-            if (b == null) {
-                throw new NullPointerException();
-            } else if ((off < 0) || (off > b.length) || (len < 0)
-                    || ((off + len) > b.length) || ((off + len) < 0)) {
-                throw new IndexOutOfBoundsException();
-            } else if (len == 0) {
-                return 0;
-            }
-
-            int nbrBytesCopied = 0;
-
-            if (count < prefix.length) {
-                int nbrBytesFromPrefix = Math.min(prefix.length - count, len);
-                System.arraycopy(prefix, count, b, off, nbrBytesFromPrefix);
-                nbrBytesCopied = nbrBytesFromPrefix;
-            }
-
-            if (nbrBytesCopied < len) {
-                nbrBytesCopied += in.read(b, off + nbrBytesCopied, len - nbrBytesCopied);
-            }
-
-            count += nbrBytesCopied;
-            return nbrBytesCopied;
-        }
-    }
-
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/CachedModuleDescriptorParseContext.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/CachedModuleDescriptorParseContext.java
index 3345e16c30fb..416783df1235 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/CachedModuleDescriptorParseContext.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/CachedModuleDescriptorParseContext.java
@@ -17,22 +17,16 @@
 package org.gradle.api.internal.artifacts.ivyservice.modulecache;
 
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.result.Artifact;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 
 /**
  * Context used for parsing cached module descriptor files.
  * Will only be used for parsing ivy.xml files, as pom files are converted before caching.
  */
 class CachedModuleDescriptorParseContext implements DescriptorParseContext {
-
-    public boolean artifactExists(ModuleVersionArtifactMetaData artifact) {
-        throw new UnsupportedOperationException();
-    }
-
-    public LocallyAvailableExternalResource getMetaDataArtifact(ModuleVersionIdentifier moduleVersionIdentifier, Class<? extends SoftwareArtifact> artifactType) {
+    public LocallyAvailableExternalResource getMetaDataArtifact(ModuleVersionIdentifier moduleVersionIdentifier, Class<? extends Artifact> artifactType) {
         throw new UnsupportedOperationException();
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultCachedMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultCachedMetaData.java
index 37755d9b704e..fe3d290ddeba 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultCachedMetaData.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultCachedMetaData.java
@@ -15,12 +15,10 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.modulecache;
 
-import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.gradle.api.artifacts.ResolvedModuleVersion;
 import org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-import org.gradle.api.internal.artifacts.metadata.ModuleDescriptorAdapter;
 import org.gradle.util.BuildCommencedTimeProvider;
 
 import java.math.BigInteger;
@@ -31,18 +29,11 @@ class DefaultCachedMetaData implements ModuleMetaDataCache.CachedMetaData {
     private final long ageMillis;
     private final MutableModuleVersionMetaData metaData;
 
-    public DefaultCachedMetaData(ModuleDescriptorCacheEntry entry, ModuleDescriptor moduleDescriptor, BuildCommencedTimeProvider timeProvider) {
+    public DefaultCachedMetaData(ModuleDescriptorCacheEntry entry, MutableModuleVersionMetaData metaData, BuildCommencedTimeProvider timeProvider) {
         this.moduleSource = entry.moduleSource;
         this.descriptorHash = entry.moduleDescriptorHash;
         this.ageMillis = timeProvider.getCurrentTime() - entry.createTimestamp;
-        if (moduleDescriptor == null) {
-            metaData = null;
-        } else {
-            ModuleDescriptorAdapter moduleDescriptorAdapter = new ModuleDescriptorAdapter(moduleDescriptor);
-            moduleDescriptorAdapter.setChanging(entry.isChanging);
-            moduleDescriptorAdapter.setMetaDataOnly(entry.isMetaDataOnly);
-            metaData = moduleDescriptorAdapter;
-        }
+        this.metaData = metaData;
     }
 
     public boolean isMissing() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleArtifactsCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleArtifactsCache.java
index eff486cb29b5..c4af7aecf907 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleArtifactsCache.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleArtifactsCache.java
@@ -16,11 +16,11 @@
 package org.gradle.api.internal.artifacts.ivyservice.modulecache;
 
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifierSerializer;
 import org.gradle.api.internal.artifacts.ModuleVersionIdentifierSerializer;
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier;
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifierSerializer;
 import org.gradle.cache.PersistentIndexedCache;
 import org.gradle.messaging.serialize.Decoder;
 import org.gradle.messaging.serialize.Encoder;
@@ -52,14 +52,14 @@ private PersistentIndexedCache<ModuleArtifactsKey, ModuleArtifactsCacheEntry> in
         return cacheLockingManager.createCache("module-artifacts", new ModuleArtifactsKeySerializer(), new ModuleArtifactsCacheEntrySerializer());
     }
 
-    public CachedArtifacts cacheArtifacts(ModuleVersionRepository repository, ModuleVersionIdentifier moduleMetaDataId, String context, BigInteger descriptorHash, Set<ModuleVersionArtifactIdentifier> artifacts) {
+    public CachedArtifacts cacheArtifacts(ModuleComponentRepository repository, ModuleVersionIdentifier moduleMetaDataId, String context, BigInteger descriptorHash, Set<ModuleVersionArtifactIdentifier> artifacts) {
         ModuleArtifactsKey key = new ModuleArtifactsKey(repository.getId(), moduleMetaDataId, context);
         ModuleArtifactsCacheEntry entry = new ModuleArtifactsCacheEntry(artifacts, timeProvider.getCurrentTime(), descriptorHash);
         getCache().put(key, entry);
         return createCacheArtifacts(entry);
     }
 
-    public CachedArtifacts getCachedArtifacts(ModuleVersionRepository repository, ModuleVersionIdentifier moduleMetaDataId, String context) {
+    public CachedArtifacts getCachedArtifacts(ModuleComponentRepository repository, ModuleVersionIdentifier moduleMetaDataId, String context) {
         ModuleArtifactsKey key = new ModuleArtifactsKey(repository.getId(), moduleMetaDataId, context);
         ModuleArtifactsCacheEntry entry = getCache().get(key);
         if (entry == null) {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleMetaDataCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleMetaDataCache.java
index 05d953dc33ec..d1441ce10ca2 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleMetaDataCache.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/DefaultModuleMetaDataCache.java
@@ -16,29 +16,26 @@
 package org.gradle.api.internal.artifacts.ivyservice.modulecache;
 
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.internal.artifacts.ModuleVersionIdentifierSerializer;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
 import org.gradle.api.internal.artifacts.ivyservice.IvyXmlModuleDescriptorWriter;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.IvyXmlModuleDescriptorParser;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ComponentIdentifierSerializer;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData;
-import org.gradle.api.internal.filestore.PathKeyFileStore;
+import org.gradle.internal.resource.local.PathKeyFileStore;
 import org.gradle.cache.PersistentIndexedCache;
 import org.gradle.internal.hash.HashValue;
 import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.gradle.messaging.serialize.Decoder;
-import org.gradle.messaging.serialize.DefaultSerializer;
 import org.gradle.messaging.serialize.Encoder;
 import org.gradle.messaging.serialize.Serializer;
 import org.gradle.util.BuildCommencedTimeProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
-
 public class DefaultModuleMetaDataCache implements ModuleMetaDataCache {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultModuleMetaDataCache.class);
 
@@ -66,57 +63,53 @@ private PersistentIndexedCache<RevisionKey, ModuleDescriptorCacheEntry> initCach
         return cacheLockingManager.createCache("module-metadata", new RevisionKeySerializer(), new ModuleDescriptorCacheEntrySerializer());
     }
 
-    public CachedMetaData getCachedModuleDescriptor(ModuleVersionRepository repository, ModuleVersionIdentifier moduleVersionIdentifier) {
-        ModuleDescriptorCacheEntry moduleDescriptorCacheEntry = getCache().get(createKey(repository, moduleVersionIdentifier));
-        if (moduleDescriptorCacheEntry == null) {
+    public CachedMetaData getCachedModuleDescriptor(ModuleComponentRepository repository, ModuleComponentIdentifier componentId) {
+        ModuleDescriptorCacheEntry entry = getCache().get(createKey(repository, componentId));
+        if (entry == null) {
             return null;
         }
-        if (moduleDescriptorCacheEntry.isMissing) {
-            return new DefaultCachedMetaData(moduleDescriptorCacheEntry, null, timeProvider);
+        if (entry.isMissing()) {
+            return new DefaultCachedMetaData(entry, entry.createMetaData(null), timeProvider);
         }
-        ModuleDescriptor descriptor = moduleDescriptorStore.getModuleDescriptor(repository, moduleVersionIdentifier);
+        ModuleDescriptor descriptor = moduleDescriptorStore.getModuleDescriptor(repository, componentId);
         if (descriptor == null) {
             // Descriptor file has been manually deleted - ignore the entry
             return null;
         }
-        return new DefaultCachedMetaData(moduleDescriptorCacheEntry, descriptor, timeProvider);
+        return new DefaultCachedMetaData(entry, entry.createMetaData(descriptor), timeProvider);
     }
 
-    public CachedMetaData cacheMissing(ModuleVersionRepository repository, ModuleVersionIdentifier id) {
+    public CachedMetaData cacheMissing(ModuleComponentRepository repository, ModuleComponentIdentifier id) {
         LOGGER.debug("Recording absence of module descriptor in cache: {} [changing = {}]", id, false);
-        ModuleDescriptorCacheEntry entry = createMissingEntry(false);
+        ModuleDescriptorCacheEntry entry = ModuleDescriptorCacheEntry.forMissingModule(timeProvider.getCurrentTime());
         getCache().put(createKey(repository, id), entry);
         return new DefaultCachedMetaData(entry, null, timeProvider);
     }
 
-    public CachedMetaData cacheMetaData(ModuleVersionRepository repository, ModuleVersionMetaData metaData, ModuleSource moduleSource) {
+    public CachedMetaData cacheMetaData(ModuleComponentRepository repository, ModuleVersionMetaData metaData, ModuleSource moduleSource) {
         ModuleDescriptor moduleDescriptor = metaData.getDescriptor();
         LOGGER.debug("Recording module descriptor in cache: {} [changing = {}]", moduleDescriptor.getModuleRevisionId(), metaData.isChanging());
         LocallyAvailableResource resource = moduleDescriptorStore.putModuleDescriptor(repository, moduleDescriptor);
-        ModuleDescriptorCacheEntry entry = createEntry(metaData.isChanging(), metaData.isMetaDataOnly(), resource.getSha1(), moduleSource);
-        getCache().put(createKey(repository, metaData.getId()), entry);
+        ModuleDescriptorCacheEntry entry = createEntry(metaData, resource.getSha1(), moduleSource);
+        getCache().put(createKey(repository, metaData.getComponentId()), entry);
         return new DefaultCachedMetaData(entry, null, timeProvider);
     }
 
-    private RevisionKey createKey(ModuleVersionRepository repository, ModuleVersionIdentifier moduleVersionIdentifier) {
-        return new RevisionKey(repository.getId(), moduleVersionIdentifier);
-    }
-
-    private ModuleDescriptorCacheEntry createMissingEntry(boolean changing) {
-        return new ModuleDescriptorCacheEntry(changing, false, true, timeProvider.getCurrentTime(), BigInteger.ZERO, null);
+    private RevisionKey createKey(ModuleComponentRepository repository, ModuleComponentIdentifier id) {
+        return new RevisionKey(repository.getId(), id);
     }
 
-    private ModuleDescriptorCacheEntry createEntry(boolean changing, boolean metaDataOnly, HashValue moduleDescriptorHash, ModuleSource moduleSource) {
-        return new ModuleDescriptorCacheEntry(changing, metaDataOnly, false, timeProvider.getCurrentTime(), moduleDescriptorHash.asBigInteger(), moduleSource);
+    private ModuleDescriptorCacheEntry createEntry(ModuleVersionMetaData metaData, HashValue moduleDescriptorHash, ModuleSource moduleSource) {
+        return ModuleDescriptorCacheEntry.forMetaData(metaData, timeProvider.getCurrentTime(), moduleDescriptorHash.asBigInteger(), moduleSource);
     }
 
     private static class RevisionKey {
         private final String repositoryId;
-        private final ModuleVersionIdentifier moduleVersionIdentifier;
+        private final ModuleComponentIdentifier componentId;
 
-        private RevisionKey(String repositoryId, ModuleVersionIdentifier moduleVersionIdentifier) {
+        private RevisionKey(String repositoryId, ModuleComponentIdentifier componentId) {
             this.repositoryId = repositoryId;
-            this.moduleVersionIdentifier = moduleVersionIdentifier;
+            this.componentId = componentId;
         }
 
         @Override
@@ -125,52 +118,27 @@ public boolean equals(Object o) {
                 return false;
             }
             RevisionKey other = (RevisionKey) o;
-            return repositoryId.equals(other.repositoryId) && moduleVersionIdentifier.equals(other.moduleVersionIdentifier);
+            return repositoryId.equals(other.repositoryId) && componentId.equals(other.componentId);
         }
 
         @Override
         public int hashCode() {
-            return repositoryId.hashCode() ^ moduleVersionIdentifier.hashCode();
+            return repositoryId.hashCode() ^ componentId.hashCode();
         }
     }
 
     private static class RevisionKeySerializer implements Serializer<RevisionKey> {
-        private final ModuleVersionIdentifierSerializer identifierSerializer = new ModuleVersionIdentifierSerializer();
+        private final ComponentIdentifierSerializer componentIdSerializer = new ComponentIdentifierSerializer();
 
         public void write(Encoder encoder, RevisionKey value) throws Exception {
             encoder.writeString(value.repositoryId);
-            identifierSerializer.write(encoder, value.moduleVersionIdentifier);
+            componentIdSerializer.write(encoder, value.componentId);
         }
 
         public RevisionKey read(Decoder decoder) throws Exception {
             String resolverId = decoder.readString();
-            ModuleVersionIdentifier identifier = identifierSerializer.read(decoder);
+            ModuleComponentIdentifier identifier = (ModuleComponentIdentifier) componentIdSerializer.read(decoder);
             return new RevisionKey(resolverId, identifier);
         }
     }
-
-    private static class ModuleDescriptorCacheEntrySerializer implements Serializer<ModuleDescriptorCacheEntry> {
-        private final DefaultSerializer<ModuleSource> moduleSourceSerializer = new DefaultSerializer<ModuleSource>(ModuleSource.class.getClassLoader());
-
-        public void write(Encoder encoder, ModuleDescriptorCacheEntry value) throws Exception {
-            encoder.writeBoolean(value.isMissing);
-            encoder.writeBoolean(value.isChanging);
-            encoder.writeBoolean(value.isMetaDataOnly);
-            encoder.writeLong(value.createTimestamp);
-            moduleSourceSerializer.write(encoder, value.moduleSource);
-            byte[] hash = value.moduleDescriptorHash.toByteArray();
-            encoder.writeBinary(hash);
-        }
-
-        public ModuleDescriptorCacheEntry read(Decoder decoder) throws Exception {
-            boolean isMissing = decoder.readBoolean();
-            boolean isChanging = decoder.readBoolean();
-            boolean isMetaData = decoder.readBoolean();
-            long createTimestamp = decoder.readLong();
-            ModuleSource moduleSource = moduleSourceSerializer.read(decoder);
-            byte[] encodedHash = decoder.readBinary();
-            BigInteger hash = new BigInteger(encodedHash);
-            return new ModuleDescriptorCacheEntry(isChanging, isMetaData, isMissing, createTimestamp, hash, moduleSource);
-        }
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleArtifactsCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleArtifactsCache.java
index 7ef8324d04c1..8c8463b25fbf 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleArtifactsCache.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleArtifactsCache.java
@@ -16,16 +16,16 @@
 package org.gradle.api.internal.artifacts.ivyservice.modulecache;
 
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier;
 
 import java.math.BigInteger;
 import java.util.Set;
 
 public interface ModuleArtifactsCache {
-    CachedArtifacts cacheArtifacts(ModuleVersionRepository repository, ModuleVersionIdentifier moduleMetaDataId, String context, BigInteger descriptorHash, Set<ModuleVersionArtifactIdentifier> artifacts);
+    CachedArtifacts cacheArtifacts(ModuleComponentRepository repository, ModuleVersionIdentifier moduleMetaDataId, String context, BigInteger descriptorHash, Set<ModuleVersionArtifactIdentifier> artifacts);
 
-    CachedArtifacts getCachedArtifacts(ModuleVersionRepository delegate, ModuleVersionIdentifier moduleMetaDataId, String context);
+    CachedArtifacts getCachedArtifacts(ModuleComponentRepository delegate, ModuleVersionIdentifier moduleMetaDataId, String context);
 
     interface CachedArtifacts {
         Set<ModuleVersionArtifactIdentifier> getArtifacts();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntry.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntry.java
index b75f6b5c9345..bf3e536ca24f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntry.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntry.java
@@ -15,24 +15,79 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.modulecache;
 
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
+import org.gradle.api.internal.artifacts.metadata.*;
 
 import java.math.BigInteger;
 
 class ModuleDescriptorCacheEntry {
+    private static final byte TYPE_MISSING = 0;
+    private static final byte TYPE_IVY = 1;
+    private static final byte TYPE_MAVEN = 2;
+
+    public byte type;
     public boolean isChanging;
-    public boolean isMetaDataOnly;
-    public boolean isMissing;
+    public String packaging;
     public long createTimestamp;
     public ModuleSource moduleSource;
     public BigInteger moduleDescriptorHash;
 
-    ModuleDescriptorCacheEntry(boolean isChanging, boolean isMetaDataOnly, boolean isMissing, long createTimestamp, BigInteger moduleDescriptorHash, ModuleSource moduleSource) {
+    ModuleDescriptorCacheEntry(byte type, boolean isChanging, String packaging, long createTimestamp, BigInteger moduleDescriptorHash, ModuleSource moduleSource) {
+        this.type = type;
         this.isChanging = isChanging;
-        this.isMetaDataOnly = isMetaDataOnly;
-        this.isMissing = isMissing;
+        this.packaging = packaging;
         this.createTimestamp = createTimestamp;
         this.moduleSource = moduleSource;
         this.moduleDescriptorHash = moduleDescriptorHash;
     }
+
+    public static ModuleDescriptorCacheEntry forMissingModule(long createTimestamp) {
+        return new ModuleDescriptorCacheEntry(TYPE_MISSING, false, null, createTimestamp, BigInteger.ZERO, null);
+    }
+
+    public static ModuleDescriptorCacheEntry forMetaData(ModuleVersionMetaData metaData, long createTimestamp, BigInteger moduleDescriptorHash, ModuleSource moduleSource) {
+        byte type = getType(metaData);
+        String packaging = getPackaging(metaData);
+        return new ModuleDescriptorCacheEntry(type, metaData.isChanging(), packaging, createTimestamp, moduleDescriptorHash, moduleSource);
+    }
+
+    private static String getPackaging(ModuleVersionMetaData metaData) {
+        return metaData instanceof MavenModuleVersionMetaData ? ((MavenModuleVersionMetaData) metaData).getPackaging() : null;
+    }
+
+    private static byte getType(ModuleVersionMetaData metaData) {
+        if (metaData == null) {
+            return TYPE_MISSING;
+        }
+        if (metaData instanceof IvyModuleVersionMetaData) {
+            return TYPE_IVY;
+        }
+        if (metaData instanceof MavenModuleVersionMetaData) {
+            return TYPE_MAVEN;
+        }
+        throw new IllegalArgumentException("Not a valid module version type: " + metaData);
+    }
+
+    public boolean isMissing() {
+        return type == TYPE_MISSING;
+    }
+    
+    public MutableModuleVersionMetaData createMetaData(ModuleDescriptor descriptor) {
+        switch (type) {
+            case TYPE_IVY:
+                return configure(new DefaultIvyModuleVersionMetaData(descriptor));
+            case TYPE_MAVEN:
+                // TODO Relocation is not currently cached
+                return configure(new DefaultMavenModuleVersionMetaData(descriptor, packaging, false));
+            case TYPE_MISSING:
+            default:
+                return null;
+        }
+    }
+
+    private MutableModuleVersionMetaData configure(MutableModuleVersionMetaData input) {
+        input.setChanging(isChanging);
+        return input;
+    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntrySerializer.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntrySerializer.java
new file mode 100644
index 000000000000..a4be405c659e
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorCacheEntrySerializer.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.modulecache;
+
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
+import org.gradle.messaging.serialize.Decoder;
+import org.gradle.messaging.serialize.DefaultSerializer;
+import org.gradle.messaging.serialize.Encoder;
+import org.gradle.messaging.serialize.Serializer;
+
+import java.math.BigInteger;
+
+class ModuleDescriptorCacheEntrySerializer implements Serializer<ModuleDescriptorCacheEntry> {
+    private final DefaultSerializer<ModuleSource> moduleSourceSerializer = new DefaultSerializer<ModuleSource>(ModuleSource.class.getClassLoader());
+
+    public void write(Encoder encoder, ModuleDescriptorCacheEntry value) throws Exception {
+        encoder.writeByte(value.type);
+        encoder.writeBoolean(value.isChanging);
+        encoder.writeNullableString(value.packaging);
+        encoder.writeLong(value.createTimestamp);
+        moduleSourceSerializer.write(encoder, value.moduleSource);
+        byte[] hash = value.moduleDescriptorHash.toByteArray();
+        encoder.writeBinary(hash);
+    }
+
+    public ModuleDescriptorCacheEntry read(Decoder decoder) throws Exception {
+        byte type = decoder.readByte();
+        boolean isChanging = decoder.readBoolean();
+        String packaging = decoder.readNullableString();
+        long createTimestamp = decoder.readLong();
+        ModuleSource moduleSource = moduleSourceSerializer.read(decoder);
+        byte[] encodedHash = decoder.readBinary();
+        BigInteger hash = new BigInteger(encodedHash);
+        return new ModuleDescriptorCacheEntry(type, isChanging, packaging, createTimestamp, hash, moduleSource);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStore.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStore.java
index 46dbfb36384b..08c3f95e8369 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStore.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStore.java
@@ -18,12 +18,12 @@
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.gradle.api.Action;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.ivyservice.IvyModuleDescriptorWriter;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.IvyXmlModuleDescriptorParser;
-import org.gradle.api.internal.filestore.PathKeyFileStore;
+import org.gradle.internal.resource.local.PathKeyFileStore;
 import org.gradle.internal.UncheckedException;
 import org.gradle.internal.resource.local.LocallyAvailableResource;
 
@@ -42,8 +42,8 @@ public ModuleDescriptorStore(PathKeyFileStore metaDataStore, IvyModuleDescriptor
         this.descriptorParser = ivyXmlModuleDescriptorParser;
     }
 
-    public ModuleDescriptor getModuleDescriptor(ModuleVersionRepository repository, ModuleVersionIdentifier moduleVersionIdentifier) {
-        String filePath = getFilePath(repository, moduleVersionIdentifier);
+    public ModuleDescriptor getModuleDescriptor(ModuleComponentRepository repository, ModuleComponentIdentifier moduleComponentIdentifier) {
+        String filePath = getFilePath(repository, moduleComponentIdentifier);
         final LocallyAvailableResource resource = metaDataStore.get(filePath);
         if (resource != null) {
             return parseModuleDescriptorFile(resource.getFile());
@@ -51,7 +51,7 @@ public ModuleDescriptor getModuleDescriptor(ModuleVersionRepository repository,
         return null;
     }
 
-    public LocallyAvailableResource putModuleDescriptor(ModuleVersionRepository repository, final ModuleDescriptor moduleDescriptor) {
+    public LocallyAvailableResource putModuleDescriptor(ModuleComponentRepository repository, final ModuleDescriptor moduleDescriptor) {
         String filePath = getFilePath(repository, moduleDescriptor.getModuleRevisionId());
         return metaDataStore.add(filePath, new Action<File>() {
             public void execute(File moduleDescriptorFile) {
@@ -69,11 +69,11 @@ private ModuleDescriptor parseModuleDescriptorFile(File moduleDescriptorFile) {
         return descriptorParser.parseMetaData(parserSettings, moduleDescriptorFile, false).getDescriptor();
     }
 
-    private String getFilePath(ModuleVersionRepository repository, ModuleRevisionId moduleRevisionId) {
+    private String getFilePath(ModuleComponentRepository repository, ModuleRevisionId moduleRevisionId) {
         return String.format(FILE_PATH_PATTERN, moduleRevisionId.getOrganisation(), moduleRevisionId.getName(), moduleRevisionId.getRevision(), repository.getId());
     }
 
-    private String getFilePath(ModuleVersionRepository repository, ModuleVersionIdentifier moduleVersionIdentifier) {
-        return String.format(FILE_PATH_PATTERN, moduleVersionIdentifier.getGroup(), moduleVersionIdentifier.getName(), moduleVersionIdentifier.getVersion(), repository.getId());
+    private String getFilePath(ModuleComponentRepository repository, ModuleComponentIdentifier moduleComponentIdentifier) {
+        return String.format(FILE_PATH_PATTERN, moduleComponentIdentifier.getGroup(), moduleComponentIdentifier.getModule(), moduleComponentIdentifier.getVersion(), repository.getId());
     }
 }
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetaDataCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetaDataCache.java
index 7874cf0a64ab..2262c6db1995 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetaDataCache.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleMetaDataCache.java
@@ -15,21 +15,21 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.modulecache;
 
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.ResolvedModuleVersion;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData;
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
 
 import java.math.BigInteger;
 
 public interface ModuleMetaDataCache {
-    CachedMetaData cacheMissing(ModuleVersionRepository repository, ModuleVersionIdentifier id);
+    CachedMetaData cacheMissing(ModuleComponentRepository repository, ModuleComponentIdentifier id);
 
-    CachedMetaData cacheMetaData(ModuleVersionRepository repository, ModuleVersionMetaData metaData, ModuleSource moduleSource);
+    CachedMetaData cacheMetaData(ModuleComponentRepository repository, ModuleVersionMetaData metaData, ModuleSource moduleSource);
 
-    CachedMetaData getCachedModuleDescriptor(ModuleVersionRepository repository, ModuleVersionIdentifier moduleVersionIdentifier);
+    CachedMetaData getCachedModuleDescriptor(ModuleComponentRepository repository, ModuleComponentIdentifier id);
 
     interface CachedMetaData {
         ResolvedModuleVersion getModuleVersion();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleDependencyDescriptor.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleDependencyDescriptor.java
deleted file mode 100644
index b5285ef909c5..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleDependencyDescriptor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
-
-import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.gradle.api.artifacts.ClientModule;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData;
-
-public class ClientModuleDependencyDescriptor extends EnhancedDependencyDescriptor {
-    private final ModuleVersionMetaData targetModule;
-
-    public ClientModuleDependencyDescriptor(ClientModule moduleDependency, ModuleDescriptor md, ModuleVersionMetaData targetModule, ModuleRevisionId mrid, boolean force, boolean changing, boolean transitive) {
-        super(moduleDependency, md, mrid, force, changing, transitive);
-        this.targetModule = targetModule;
-    }
-
-    public ModuleVersionMetaData getTargetModule() {
-        return targetModule;
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactory.java
deleted file mode 100644
index 2ee99074f169..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactory.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
-
-import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.gradle.api.artifacts.ClientModule;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.internal.artifacts.ivyservice.IvyUtil;
-import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.ExcludeRuleConverter;
-import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-
-public class ClientModuleIvyDependencyDescriptorFactory extends AbstractIvyDependencyDescriptorFactory {
-    private ClientModuleMetaDataFactory clientModuleMetaDataFactory;
-
-    public ClientModuleIvyDependencyDescriptorFactory(ExcludeRuleConverter excludeRuleConverter, ClientModuleMetaDataFactory clientModuleMetaDataFactory) {
-        super(excludeRuleConverter);
-        this.clientModuleMetaDataFactory = clientModuleMetaDataFactory;
-    }
-
-    private ModuleRevisionId createModuleRevisionId(ModuleDependency dependency) {
-        return IvyUtil.createModuleRevisionId(dependency);
-    }
-
-    public EnhancedDependencyDescriptor createDependencyDescriptor(String configuration, ModuleDependency dependency, ModuleDescriptor parent) {
-        ModuleRevisionId moduleRevisionId = createModuleRevisionId(dependency);
-        ClientModule clientModule = getClientModule(dependency);
-        MutableModuleVersionMetaData moduleVersionMetaData = clientModuleMetaDataFactory.createModuleDescriptor(
-                moduleRevisionId, clientModule.getDependencies());
-
-        EnhancedDependencyDescriptor dependencyDescriptor = new ClientModuleDependencyDescriptor(
-                clientModule,
-                parent,
-                moduleVersionMetaData,
-                moduleRevisionId,
-                clientModule.isForce(),
-                false,
-                clientModule.isTransitive());
-        addExcludesArtifactsAndDependencies(configuration, clientModule, dependencyDescriptor);
-        return dependencyDescriptor;
-    }
-
-    private ClientModule getClientModule(ModuleDependency dependency) {
-        return (ClientModule) dependency;
-    }
-
-    public boolean canConvert(ModuleDependency dependency) {
-        return dependency instanceof ClientModule;
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleMetaDataFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleMetaDataFactory.java
deleted file mode 100644
index 7dd76ce06e68..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleMetaDataFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2007-2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
-
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-
-import java.util.Set;
-
-public interface ClientModuleMetaDataFactory {
-    MutableModuleVersionMetaData createModuleDescriptor(ModuleRevisionId moduleRevisionId, Set<ModuleDependency> dependencies);
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactory.java
deleted file mode 100644
index 05df71ca43cf..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactory.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2007-2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
-
-import org.apache.ivy.core.module.descriptor.Configuration;
-import org.apache.ivy.core.module.descriptor.DefaultArtifact;
-import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.internal.artifacts.metadata.ModuleDescriptorAdapter;
-import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-
-import java.util.Set;
-
-public class DefaultClientModuleMetaDataFactory implements ClientModuleMetaDataFactory {
-    // Because of bidirectional dependencies we need setter injection
-    private DependencyDescriptorFactory dependencyDescriptorFactory;
-
-    public MutableModuleVersionMetaData createModuleDescriptor(ModuleRevisionId moduleRevisionId, Set<ModuleDependency> dependencies) {
-        DefaultModuleDescriptor moduleDescriptor = new DefaultModuleDescriptor(moduleRevisionId,
-                "release", null);
-        moduleDescriptor.addConfiguration(new Configuration(Dependency.DEFAULT_CONFIGURATION));
-        addDependencyDescriptors(moduleDescriptor, dependencies, dependencyDescriptorFactory);
-        moduleDescriptor.addArtifact(Dependency.DEFAULT_CONFIGURATION,
-                new DefaultArtifact(moduleRevisionId, null, moduleRevisionId.getName(), "jar", "jar"));
-        return new ModuleDescriptorAdapter(moduleDescriptor);
-    }
-
-    private void addDependencyDescriptors(DefaultModuleDescriptor moduleDescriptor, Set<ModuleDependency> dependencies,
-                                          DependencyDescriptorFactory dependencyDescriptorFactory) {
-        for (ModuleDependency dependency : dependencies) {
-            dependencyDescriptorFactory.addDependencyDescriptor(Dependency.DEFAULT_CONFIGURATION, moduleDescriptor,
-                    dependency);
-        }
-    }
-
-    public void setDependencyDescriptorFactory(DependencyDescriptorFactory dependencyDescriptorFactory) {
-        this.dependencyDescriptorFactory = dependencyDescriptorFactory;
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverter.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverter.java
index c50beff7532c..54c4e4f3f985 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverter.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverter.java
@@ -42,7 +42,7 @@ public void addDependencyDescriptors(DefaultModuleDescriptor moduleDescriptor, C
     private void addDependencies(DefaultModuleDescriptor moduleDescriptor, Collection<? extends Configuration> configurations) {
         for (Configuration configuration : configurations) {
             for (ModuleDependency dependency : configuration.getDependencies().withType(ModuleDependency.class)) {
-                dependencyDescriptorFactory.addDependencyDescriptor(configuration.getName(), moduleDescriptor, dependency);
+                moduleDescriptor.addDependency(dependencyDescriptorFactory.createDependencyDescriptor(configuration.getName(), moduleDescriptor, dependency));
             }
         }
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactory.java
index 8ac55c48cba4..8c18423a26fa 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactory.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactory.java
@@ -16,7 +16,8 @@
 
 package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
 
-import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.util.WrapUtil;
@@ -30,11 +31,9 @@ public DefaultDependencyDescriptorFactory(IvyDependencyDescriptorFactory... depe
         this.dependencyDescriptorFactories = WrapUtil.toList(dependencyDescriptorFactories);
     }
 
-    public void addDependencyDescriptor(String configuration, DefaultModuleDescriptor moduleDescriptor,
-                                        ModuleDependency dependency) {
+    public DependencyDescriptor createDependencyDescriptor(String configuration, ModuleDescriptor moduleDescriptor, ModuleDependency dependency) {
         IvyDependencyDescriptorFactory factoryInternal = findFactoryForDependency(dependency);
-        EnhancedDependencyDescriptor dependencyDescriptor = factoryInternal.createDependencyDescriptor(configuration, dependency, moduleDescriptor);
-        moduleDescriptor.addDependency(dependencyDescriptor);
+        return factoryInternal.createDependencyDescriptor(configuration, dependency, moduleDescriptor);
     }
 
     private IvyDependencyDescriptorFactory findFactoryForDependency(ModuleDependency dependency) {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DependencyDescriptorFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DependencyDescriptorFactory.java
index 50734726a282..b5915f34697f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DependencyDescriptorFactory.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DependencyDescriptorFactory.java
@@ -15,9 +15,10 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
 
-import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
 import org.gradle.api.artifacts.ModuleDependency;
 
 public interface DependencyDescriptorFactory {
-    void addDependencyDescriptor(String configuration, DefaultModuleDescriptor moduleDescriptor, ModuleDependency dependency);
+    DependencyDescriptor createDependencyDescriptor(String configuration, ModuleDescriptor moduleDescriptor, ModuleDependency dependency);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectArtifactResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectArtifactResolver.java
index e5cf9663b4ef..e1045c56f47f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectArtifactResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/projectmodule/ProjectArtifactResolver.java
@@ -32,18 +32,21 @@ public ProjectArtifactResolver(ArtifactResolver delegate) {
         this.delegate = delegate;
     }
 
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
+    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
         if (isProjectModule(component.getComponentId())) {
-            if (context instanceof ConfigurationResolveContext) {
-                String configurationName = ((ConfigurationResolveContext) context).getConfigurationName();
-                Set<ComponentArtifactMetaData> artifacts = component.getConfiguration(configurationName).getArtifacts();
-                result.resolved(artifacts);
-                return;
-            }
-            throw new UnsupportedOperationException(String.format("Resolving %s for project modules is not yet supported", context.getDescription()));
+            throw new UnsupportedOperationException("Resolving artifacts by type is not yet supported for project modules");
         }
+        delegate.resolveModuleArtifacts(component, artifactType, result);
+    }
 
-        delegate.resolveModuleArtifacts(component, context, result);
+    public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage usage, BuildableArtifactSetResolveResult result) {
+        if (isProjectModule(component.getComponentId())) {
+            String configurationName = usage.getConfigurationName();
+            Set<ComponentArtifactMetaData> artifacts = component.getConfiguration(configurationName).getArtifacts();
+            result.resolved(artifacts);
+            return;
+        }
+        delegate.resolveModuleArtifacts(component, usage, result);
     }
 
     public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicy.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicy.java
index df5082a4c5c2..01d594ecf0cc 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicy.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicy.java
@@ -15,13 +15,14 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.resolutionstrategy;
 
-import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.gradle.api.Action;
 import org.gradle.api.artifacts.ArtifactIdentifier;
 import org.gradle.api.artifacts.ModuleIdentifier;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.ResolvedModuleVersion;
 import org.gradle.api.artifacts.cache.*;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
 import org.gradle.api.internal.artifacts.configurations.dynamicversion.CachePolicy;
 import org.gradle.api.internal.artifacts.ivyservice.dynamicversions.DefaultResolvedModuleVersion;
 
@@ -121,12 +122,20 @@ public boolean mustRefreshVersionList(final ModuleIdentifier moduleIdentifier, S
         return false;
     }
 
-    public boolean mustRefreshModule(ModuleVersionIdentifier moduleVersionId, ResolvedModuleVersion resolvedModuleVersion, ModuleRevisionId moduleRevisionId, final long ageMillis) {
-        return mustRefreshModule(moduleVersionId, resolvedModuleVersion, ageMillis, false);
+    public boolean mustRefreshMissingModule(ModuleComponentIdentifier component, long ageMillis) {
+        return mustRefreshModule(component, null, ageMillis, false);
     }
 
-    public boolean mustRefreshChangingModule(ModuleVersionIdentifier moduleVersionId, ResolvedModuleVersion resolvedModuleVersion, long ageMillis) {
-        return mustRefreshModule(moduleVersionId, resolvedModuleVersion, ageMillis, true);
+    public boolean mustRefreshModule(ModuleComponentIdentifier component, ResolvedModuleVersion resolvedModuleVersion, long ageMillis) {
+        return mustRefreshModule(component, resolvedModuleVersion, ageMillis, false);
+    }
+
+    public boolean mustRefreshChangingModule(ModuleComponentIdentifier component, ResolvedModuleVersion resolvedModuleVersion, long ageMillis) {
+        return mustRefreshModule(component, resolvedModuleVersion, ageMillis, true);
+    }
+
+    private boolean mustRefreshModule(ModuleComponentIdentifier component, ResolvedModuleVersion version, long ageMillis, boolean changingModule) {
+        return mustRefreshModule(DefaultModuleVersionIdentifier.newId(component), version, ageMillis, changingModule);
     }
 
     private boolean mustRefreshModule(ModuleVersionIdentifier moduleVersionId, ResolvedModuleVersion version, long ageMillis, boolean changingModule) {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyResolver.java
index f5f1bd99b37b..12a87305c828 100755
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DefaultDependencyResolver.java
@@ -31,10 +31,12 @@
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ResolveIvyFactory;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionMatcher;
+import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.DependencyDescriptorFactory;
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.ProjectArtifactResolver;
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.ProjectComponentRegistry;
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.ProjectDependencyResolver;
 import org.gradle.api.internal.artifacts.ivyservice.resolutionstrategy.StrictConflictResolution;
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph.DependencyGraphBuilder;
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.DefaultResolvedConfigurationBuilder;
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.TransientConfigurationResults;
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.TransientConfigurationResultsBuilder;
@@ -53,6 +55,7 @@
 public class DefaultDependencyResolver implements ArtifactDependencyResolver {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultDependencyResolver.class);
     private final LocalComponentFactory localComponentFactory;
+    private final DependencyDescriptorFactory dependencyDescriptorFactory;
     private final ResolveIvyFactory ivyFactory;
     private final ProjectComponentRegistry projectComponentRegistry;
     private final CacheLockingManager cacheLockingManager;
@@ -61,11 +64,12 @@ public class DefaultDependencyResolver implements ArtifactDependencyResolver {
     private final VersionMatcher versionMatcher;
     private final LatestStrategy latestStrategy;
 
-    public DefaultDependencyResolver(ResolveIvyFactory ivyFactory, LocalComponentFactory localComponentFactory,
+    public DefaultDependencyResolver(ResolveIvyFactory ivyFactory, LocalComponentFactory localComponentFactory, DependencyDescriptorFactory dependencyDescriptorFactory,
                                      ProjectComponentRegistry projectComponentRegistry, CacheLockingManager cacheLockingManager, IvyContextManager ivyContextManager,
                                      ResolutionResultsStoreFactory storeFactory, VersionMatcher versionMatcher, LatestStrategy latestStrategy) {
         this.ivyFactory = ivyFactory;
         this.localComponentFactory = localComponentFactory;
+        this.dependencyDescriptorFactory = dependencyDescriptorFactory;
         this.projectComponentRegistry = projectComponentRegistry;
         this.cacheLockingManager = cacheLockingManager;
         this.ivyContextManager = ivyContextManager;
@@ -84,7 +88,7 @@ public void execute(Ivy ivy) {
                 RepositoryChain repositoryChain = ivyFactory.create(configuration, repositories, metadataProcessor);
 
                 DependencyToModuleVersionResolver dependencyResolver = repositoryChain.getDependencyResolver();
-                dependencyResolver = new ClientModuleResolver(dependencyResolver);
+                dependencyResolver = new ClientModuleResolver(dependencyResolver, dependencyDescriptorFactory);
                 ProjectDependencyResolver projectDependencyResolver = new ProjectDependencyResolver(projectComponentRegistry, localComponentFactory, dependencyResolver);
                 dependencyResolver = projectDependencyResolver;
                 DependencyToModuleVersionIdResolver idResolver = new LazyDependencyToModuleResolver(dependencyResolver, versionMatcher);
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleConflictResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleConflictResolver.java
index e1c6784759a4..0ff915a03dda 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleConflictResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleConflictResolver.java
@@ -17,6 +17,6 @@
 
 import java.util.Collection;
 
-interface ModuleConflictResolver {
+public interface ModuleConflictResolver {
     <T extends ModuleRevisionResolveState> T select(Collection<? extends T> candidates);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleRevisionResolveState.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleRevisionResolveState.java
index 155a4b80ff12..2f749d06cc6d 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleRevisionResolveState.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleRevisionResolveState.java
@@ -18,7 +18,7 @@
 import org.gradle.api.artifacts.result.ComponentSelectionReason;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.Versioned;
 
-interface ModuleRevisionResolveState extends Versioned {
+public interface ModuleRevisionResolveState extends Versioned {
     String getId();
 
     ComponentSelectionReason getSelectionReason();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleVersionSpec.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleVersionSpec.java
index 307b8dbfa0a1..950ded119fda 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleVersionSpec.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/ModuleVersionSpec.java
@@ -30,10 +30,10 @@
  * Manages sets of exclude rules, allowing union and intersection operations on the rules.
  *
  * <p>This class attempts to reduce execution time, by flattening union and intersection specs, at the cost of more analysis at construction time. This is taken advantage of by {@link
- * DependencyGraphBuilder}, on the assumption that there are many more edges in the dependency graph than there are exclude rules (ie we evaluate the rules much more often that we construct them).
+ * org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph.DependencyGraphBuilder}, on the assumption that there are many more edges in the dependency graph than there are exclude rules (ie we evaluate the rules much more often that we construct them).
  * </p>
  *
- * <p>Also, this class attempts to be quite accurate in determining if 2 specs will match exactly the same set of modules. {@link DependencyGraphBuilder} uses this to avoid traversing the
+ * <p>Also, this class attempts to be quite accurate in determining if 2 specs will match exactly the same set of modules. {@link org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph.DependencyGraphBuilder} uses this to avoid traversing the
  * dependency graph of a particular version that has already been traversed when a new incoming edge is added (eg a newly discovered dependency) and when an incoming edge is removed (eg a conflict
  * evicts a version that depends on the given version). </p>
  */
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/CompositeDependencyGraphVisitor.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/CompositeDependencyGraphVisitor.java
new file mode 100644
index 000000000000..851041e6028d
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/CompositeDependencyGraphVisitor.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph;
+
+import java.util.Arrays;
+import java.util.List;
+
+class CompositeDependencyGraphVisitor implements DependencyGraphVisitor {
+    private final List<DependencyGraphVisitor> visitors;
+
+    CompositeDependencyGraphVisitor(DependencyGraphVisitor... visitors) {
+        this.visitors = Arrays.asList(visitors);
+    }
+
+    public void start(DependencyGraphBuilder.ConfigurationNode root) {
+        for (DependencyGraphVisitor visitor : visitors) {
+            visitor.start(root);
+        }
+    }
+
+    public void visitNode(DependencyGraphBuilder.ConfigurationNode resolvedConfiguration) {
+        for (DependencyGraphVisitor visitor : visitors) {
+            visitor.visitNode(resolvedConfiguration);
+        }
+    }
+
+    public void visitEdge(DependencyGraphBuilder.ConfigurationNode resolvedConfiguration) {
+        for (DependencyGraphVisitor visitor : visitors) {
+            visitor.visitEdge(resolvedConfiguration);
+        }
+    }
+
+    public void finish(DependencyGraphBuilder.ConfigurationNode root) {
+        for (DependencyGraphVisitor visitor : visitors) {
+            visitor.finish(root);
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilder.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphBuilder.java
similarity index 77%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilder.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphBuilder.java
index d049cd53138a..ec32bb6d19e8 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilder.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.ivyservice.resolveengine;
+package org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph;
 
 import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
 import org.apache.ivy.core.module.id.ModuleId;
@@ -26,6 +26,10 @@
 import org.gradle.api.internal.artifacts.configurations.ConfigurationInternal;
 import org.gradle.api.internal.artifacts.ivyservice.*;
 import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.EnhancedDependencyDescriptor;
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.DependencyToConfigurationResolver;
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.ModuleConflictResolver;
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.ModuleRevisionResolveState;
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.ModuleVersionSpec;
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.ResolvedConfigurationBuilder;
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.InternalDependencyResult;
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ModuleVersionSelection;
@@ -63,13 +67,21 @@ public DependencyGraphBuilder(DependencyToModuleVersionIdResolver dependencyReso
     public void resolve(ConfigurationInternal configuration,
                         ResolutionResultBuilder newModelBuilder,
                         ResolvedConfigurationBuilder oldModelBuilder) throws ResolveException {
+        DependencyGraphVisitor oldModelVisitor = new ResolvedConfigurationDependencyGraphVisitor(oldModelBuilder, artifactResolver);
+        DependencyGraphVisitor newModelVisitor = new ResolutionResultDependencyGraphVisitor(newModelBuilder);
+        DependencyGraphVisitor modelVisitor = new CompositeDependencyGraphVisitor(oldModelVisitor, newModelVisitor);
+
+        resolveDependencyGraph(configuration, modelVisitor);
+    }
+
+    private void resolveDependencyGraph(ConfigurationInternal configuration, DependencyGraphVisitor modelVisitor) {
         DefaultBuildableComponentResolveResult rootModule = new DefaultBuildableComponentResolveResult();
         moduleResolver.resolve(configuration.getModule(), configuration.getAll(), rootModule);
 
-        ResolveState resolveState = new ResolveState(rootModule, configuration.getName(), dependencyResolver, dependencyToConfigurationResolver, artifactResolver, oldModelBuilder);
+        ResolveState resolveState = new ResolveState(rootModule, configuration.getName(), dependencyResolver, dependencyToConfigurationResolver, artifactResolver);
         traverseGraph(resolveState);
 
-        assembleResult(resolveState, oldModelBuilder, newModelBuilder);
+        assembleResult(resolveState, modelVisitor);
     }
 
     /**
@@ -147,135 +159,38 @@ private void traverseGraph(ResolveState resolveState) {
     /**
      * Populates the result from the graph traversal state.
      */
-    private void assembleResult(ResolveState resolveState, ResolvedConfigurationBuilder oldModelBuilder, ResolutionResultBuilder newModelBuilder) {
-        FailureState failureState = new FailureState(resolveState.root);
-        newModelBuilder.start(resolveState.root.moduleRevision.id, resolveState.root.metaData.getComponent().getComponentId());
+    private void assembleResult(ResolveState resolveState, DependencyGraphVisitor listener) {
+        listener.start(resolveState.root);
 
         // Visit the nodes
         for (ConfigurationNode resolvedConfiguration : resolveState.getConfigurationNodes()) {
             if (resolvedConfiguration.isSelected()) {
                 resolvedConfiguration.validate();
-                oldModelBuilder.newResolvedDependency(resolvedConfiguration.id);
-                resolvedConfiguration.collectFailures(failureState);
-                newModelBuilder.resolvedModuleVersion(resolvedConfiguration.moduleRevision);
+                listener.visitNode(resolvedConfiguration);
             }
         }
         // Visit the edges
         for (ConfigurationNode resolvedConfiguration : resolveState.getConfigurationNodes()) {
             if (resolvedConfiguration.isSelected()) {
-                resolvedConfiguration.attachToParents(oldModelBuilder);
-                newModelBuilder.resolvedConfiguration(resolvedConfiguration.toId(), resolvedConfiguration.outgoingEdges);
-            }
-        }
-        failureState.attachFailures(oldModelBuilder);
-        oldModelBuilder.done(resolveState.root.id);
-    }
-
-    private static class FailureState {
-        final Map<ModuleVersionSelector, BrokenDependency> failuresByRevisionId = new LinkedHashMap<ModuleVersionSelector, BrokenDependency>();
-        final ConfigurationNode root;
-
-        private FailureState(ConfigurationNode root) {
-            this.root = root;
-        }
-
-        public void attachFailures(ResolvedConfigurationBuilder result) {
-            for (Map.Entry<ModuleVersionSelector, BrokenDependency> entry : failuresByRevisionId.entrySet()) {
-                Collection<List<ModuleVersionIdentifier>> paths = calculatePaths(entry.getValue());
-                result.addUnresolvedDependency(new DefaultUnresolvedDependency(entry.getKey(), entry.getValue().failure.withIncomingPaths(paths)));
-            }
-        }
-
-        private Collection<List<ModuleVersionIdentifier>> calculatePaths(BrokenDependency brokenDependency) {
-            // Include the shortest path from each version that has a direct dependency on the broken dependency, back to the root
-            
-            Map<ModuleVersionResolveState, List<ModuleVersionIdentifier>> shortestPaths = new LinkedHashMap<ModuleVersionResolveState, List<ModuleVersionIdentifier>>();
-            List<ModuleVersionIdentifier> rootPath = new ArrayList<ModuleVersionIdentifier>();
-            rootPath.add(root.moduleRevision.id);
-            shortestPaths.put(root.moduleRevision, rootPath);
-
-            Set<ModuleVersionResolveState> directDependees = new LinkedHashSet<ModuleVersionResolveState>();
-            for (ConfigurationNode node : brokenDependency.requiredBy) {
-                directDependees.add(node.moduleRevision);
-            }
-
-            Set<ModuleVersionResolveState> seen = new HashSet<ModuleVersionResolveState>();
-            LinkedList<ModuleVersionResolveState> queue = new LinkedList<ModuleVersionResolveState>();
-            queue.addAll(directDependees);
-            while (!queue.isEmpty()) {
-                ModuleVersionResolveState version = queue.getFirst();
-                if (version == root.moduleRevision) {
-                    queue.removeFirst();
-                } else if (seen.add(version)) {
-                    for (ConfigurationNode configuration : version.configurations) {
-                        for (DependencyEdge dependencyEdge : configuration.incomingEdges) {
-                            queue.add(0, dependencyEdge.from.moduleRevision);
-                        }
-                    }
-                } else {
-                    queue.remove();
-                    List<ModuleVersionIdentifier> shortest = null;
-                    for (ConfigurationNode configuration : version.configurations) {
-                        for (DependencyEdge dependencyEdge : configuration.incomingEdges) {
-                            List<ModuleVersionIdentifier> candidate = shortestPaths.get(dependencyEdge.from.moduleRevision);
-                            if (candidate == null) {
-                                continue;
-                            }
-                            if (shortest == null) {
-                                shortest = candidate;
-                            } else if (shortest.size() > candidate.size()) {
-                                shortest = candidate;
-                            }
-                        }
-                    }
-                    if (shortest == null) {
-                        continue;
-                    }
-                    List<ModuleVersionIdentifier> path = new ArrayList<ModuleVersionIdentifier>();
-                    path.addAll(shortest);
-                    path.add(version.id);
-                    shortestPaths.put(version, path);
-                }
-            }
-
-            List<List<ModuleVersionIdentifier>> paths = new ArrayList<List<ModuleVersionIdentifier>>();
-            for (ModuleVersionResolveState version : directDependees) {
-                List<ModuleVersionIdentifier> path = shortestPaths.get(version);
-                paths.add(path);
-            }
-            return paths;
-        }
-
-        public void addUnresolvedDependency(DependencyEdge dependency, ModuleVersionSelector requested, ModuleVersionResolveException failure) {
-            BrokenDependency breakage = failuresByRevisionId.get(requested);
-            if (breakage == null) {
-                breakage = new BrokenDependency(failure);
-                failuresByRevisionId.put(requested, breakage);
+                listener.visitEdge(resolvedConfiguration);
             }
-            breakage.requiredBy.add(dependency.from);
         }
-        
-        private static class BrokenDependency {
-            final ModuleVersionResolveException failure;
-            final List<ConfigurationNode> requiredBy = new ArrayList<ConfigurationNode>();
 
-            private BrokenDependency(ModuleVersionResolveException failure) {
-                this.failure = failure;
-            }
-        }
+        listener.finish(resolveState.root);
     }
 
     /**
      * Represents the edges in the dependency graph.
      */
-    private static class DependencyEdge implements InternalDependencyResult {
-        private final ConfigurationNode from;
-        private final DependencyDescriptor dependencyDescriptor;
+    static class DependencyEdge implements InternalDependencyResult {
+        public final ConfigurationNode from;
+        public final ModuleVersionSelectorResolveState selector;
+
         private final DependencyMetaData dependencyMetaData;
+        private final DependencyDescriptor dependencyDescriptor;
         private final ResolveState resolveState;
         private final ModuleVersionSpec selectorSpec;
         private final Set<ConfigurationNode> targetConfigurations = new LinkedHashSet<ConfigurationNode>();
-        private final ModuleVersionSelectorResolveState selector;
         private ModuleVersionResolveState targetModuleRevision;
 
         public DependencyEdge(ConfigurationNode from, DependencyMetaData dependencyMetaData, ModuleVersionSpec selectorSpec, ResolveState resolveState) {
@@ -350,36 +265,6 @@ private void calculateTargetConfigurations() {
             }
         }
 
-        private Set<ResolvedArtifact> getArtifacts(ConfigurationNode childConfiguration) {
-            Set<ComponentArtifactMetaData> dependencyArtifacts = dependencyMetaData.getArtifacts(from.metaData, childConfiguration.metaData);
-            if (dependencyArtifacts.isEmpty()) {
-                return Collections.emptySet();
-            }
-            Set<ResolvedArtifact> artifacts = new LinkedHashSet<ResolvedArtifact>();
-            for (ComponentArtifactMetaData artifact : dependencyArtifacts) {
-                artifacts.add(resolveState.builder.newArtifact(childConfiguration.id, childConfiguration.metaData.getComponent(), artifact, resolveState.artifactResolver));
-            }
-            return artifacts;
-        }
-
-        public void attachToParents(ConfigurationNode childConfiguration, ResolvedConfigurationBuilder oldModelBuilder) {
-            ResolvedConfigurationIdentifier parent = from.id;
-            ResolvedConfigurationIdentifier child = childConfiguration.id;
-            oldModelBuilder.addChild(parent, child);
-
-            Set<ResolvedArtifact> artifacts = getArtifacts(childConfiguration);
-            if (artifacts.isEmpty()) {
-                artifacts = childConfiguration.getArtifacts();
-            }
-            //TODO SF merge with addChild
-            oldModelBuilder.addParentSpecificArtifacts(child, parent, artifacts);
-
-            if (parent == resolveState.root.id) {
-                EnhancedDependencyDescriptor enhancedDependencyDescriptor = (EnhancedDependencyDescriptor) dependencyDescriptor;
-                oldModelBuilder.addFirstLevelDependency(enhancedDependencyDescriptor.getModuleDependency(), child);
-            }
-        }
-
         public ModuleVersionSpec getSelector() {
             String[] configurations = from.metaData.getHierarchy().toArray(new String[from.metaData.getHierarchy().size()]);
             ModuleVersionSpec selector = ModuleVersionSpec.forExcludes(dependencyDescriptor.getExcludeRules(configurations));
@@ -390,6 +275,11 @@ public ComponentSelector getRequested() {
             return dependencyMetaData.getSelector();
         }
 
+        // TODO This should be replaced by getRequested()
+        public ModuleVersionSelector getRequestedModuleVersion() {
+            return dependencyMetaData.getRequested();
+        }
+
         public ModuleVersionResolveException getFailure() {
             return selector.getFailure();
         }
@@ -402,11 +292,12 @@ public ComponentSelectionReason getReason() {
             return selector.getSelectionReason();
         }
 
-        public void collectFailures(FailureState failureState) {
-            ModuleVersionResolveException failure = getFailure();
-            if (failure != null) {
-                failureState.addUnresolvedDependency(this, selector.dependencyMetaData.getRequested(), failure);
-            }
+        public ModuleDependency getModuleDependency() {
+            return ((EnhancedDependencyDescriptor) dependencyDescriptor).getModuleDependency();
+        }
+
+        public Set<ComponentArtifactMetaData> getArtifacts(ConfigurationMetaData metaData1) {
+            return dependencyMetaData.getArtifacts(from.metaData, metaData1);
         }
     }
 
@@ -421,16 +312,14 @@ private static class ResolveState {
         private final DependencyToModuleVersionIdResolver resolver;
         private final DependencyToConfigurationResolver dependencyToConfigurationResolver;
         private final ArtifactResolver artifactResolver;
-        private final ResolvedConfigurationBuilder builder;
         private final Set<ConfigurationNode> queued = new HashSet<ConfigurationNode>();
         private final LinkedList<ConfigurationNode> queue = new LinkedList<ConfigurationNode>();
 
         public ResolveState(ComponentResolveResult rootResult, String rootConfigurationName, DependencyToModuleVersionIdResolver resolver,
-                            DependencyToConfigurationResolver dependencyToConfigurationResolver, ArtifactResolver artifactResolver, ResolvedConfigurationBuilder builder) {
+                            DependencyToConfigurationResolver dependencyToConfigurationResolver, ArtifactResolver artifactResolver) {
             this.resolver = resolver;
             this.dependencyToConfigurationResolver = dependencyToConfigurationResolver;
             this.artifactResolver = artifactResolver;
-            this.builder = builder;
             ModuleVersionResolveState rootVersion = getRevision(rootResult.getId());
             rootVersion.setResolveResult(rootResult);
             root = new RootConfigurationNode(rootVersion, new ResolvedConfigurationIdentifier(rootVersion.id, rootConfigurationName), this);
@@ -582,7 +471,7 @@ public void removeUnattachedDependency(DependencyEdge edge) {
         public ModuleVersionResolveState getVersion(ModuleVersionIdentifier id) {
             ModuleVersionResolveState moduleRevision = versions.get(id);
             if (moduleRevision == null) {
-                moduleRevision = new ModuleVersionResolveState(this, id, resolveState);
+                moduleRevision = new ModuleVersionResolveState(this, id);
                 versions.put(id, moduleRevision);
             }
 
@@ -597,22 +486,21 @@ public void addSelector(ModuleVersionSelectorResolveState selector) {
     /**
      * Resolution state for a given module version.
      */
-    private static class ModuleVersionResolveState implements ModuleRevisionResolveState, ModuleVersionSelection {
-        final ModuleResolveState module;
-        final ModuleVersionIdentifier id;
-        final ResolveState resolveState;
-        final Set<ConfigurationNode> configurations = new LinkedHashSet<ConfigurationNode>();
-        ComponentMetaData metaData;
-        ModuleState state = ModuleState.New;
-        ComponentSelectionReason selectionReason = VersionSelectionReasons.REQUESTED;
-        ModuleVersionIdResolveResult idResolveResult;
-        ComponentResolveResult resolveResult;
-        ModuleVersionResolveException failure;
-
-        private ModuleVersionResolveState(ModuleResolveState module, ModuleVersionIdentifier id, ResolveState resolveState) {
+    static class ModuleVersionResolveState implements ModuleRevisionResolveState, ModuleVersionSelection {
+        public final ModuleVersionIdentifier id;
+
+        private final Set<ConfigurationNode> configurations = new LinkedHashSet<ConfigurationNode>();
+        private final ModuleResolveState module;
+        private ComponentMetaData metaData;
+        private ModuleState state = ModuleState.New;
+        private ComponentSelectionReason selectionReason = VersionSelectionReasons.REQUESTED;
+        private ModuleVersionIdResolveResult idResolveResult;
+        private ComponentResolveResult resolveResult;
+        private ModuleVersionResolveException failure;
+
+        private ModuleVersionResolveState(ModuleResolveState module, ModuleVersionIdentifier id) {
             this.module = module;
             this.id = id;
-            this.resolveState = resolveState;
         }
 
         @Override
@@ -693,20 +581,31 @@ public void setSelectionReason(ComponentSelectionReason reason) {
         public ComponentIdentifier getComponentId() {
             return getMetaData().getComponentId();
         }
+
+        public List<ModuleVersionResolveState> getIncoming() {
+            List<ModuleVersionResolveState> incoming = new ArrayList<ModuleVersionResolveState>();
+            for (DependencyGraphBuilder.ConfigurationNode configuration : configurations) {
+                for (DependencyGraphBuilder.DependencyEdge dependencyEdge : configuration.incomingEdges) {
+                    incoming.add(dependencyEdge.from.moduleRevision);
+                }
+            }
+            return incoming;
+        }
     }
 
     /**
      * Represents a node in the dependency graph.
      */
-    private static class ConfigurationNode {
-        final ModuleVersionResolveState moduleRevision;
-        final ConfigurationMetaData metaData;
-        final ResolveState resolveState;
-        final Set<DependencyEdge> incomingEdges = new LinkedHashSet<DependencyEdge>();
-        final Set<DependencyEdge> outgoingEdges = new LinkedHashSet<DependencyEdge>();
-        final ResolvedConfigurationIdentifier id;
-        ModuleVersionSpec previousTraversal;
-        Set<ResolvedArtifact> artifacts;
+    static class ConfigurationNode {
+        public final ModuleVersionResolveState moduleRevision;
+        public final ConfigurationMetaData metaData;
+        public final Set<DependencyEdge> incomingEdges = new LinkedHashSet<DependencyEdge>();
+        public final Set<DependencyEdge> outgoingEdges = new LinkedHashSet<DependencyEdge>();
+        public final ResolvedConfigurationIdentifier id;
+
+        private final ResolveState resolveState;
+        private ModuleVersionSpec previousTraversal;
+        private Set<ResolvedArtifact> artifacts;
 
         private ConfigurationNode(ModuleVersionResolveState moduleRevision, ResolvedConfigurationIdentifier id, ResolveState resolveState) {
             this.moduleRevision = moduleRevision;
@@ -716,20 +615,24 @@ private ConfigurationNode(ModuleVersionResolveState moduleRevision, ResolvedConf
             moduleRevision.addConfiguration(this);
         }
 
+        public ModuleVersionIdentifier toId() {
+            return moduleRevision.id;
+        }
+
         @Override
         public String toString() {
             return String.format("%s(%s)", moduleRevision, metaData.getName());
         }
 
-        public Set<ResolvedArtifact> getArtifacts() {
+        public Set<ResolvedArtifact> getArtifacts(ResolvedConfigurationBuilder builder) {
             if (artifacts == null) {
                 artifacts = new LinkedHashSet<ResolvedArtifact>();
 
                 BuildableArtifactSetResolveResult result = new DefaultBuildableArtifactSetResolveResult();
-                resolveState.artifactResolver.resolveModuleArtifacts(metaData.getComponent(), new ConfigurationResolveContext(metaData.getName()), result);
+                resolveState.artifactResolver.resolveModuleArtifacts(metaData.getComponent(), new DefaultComponentUsage(metaData.getName()), result);
 
                 for (ComponentArtifactMetaData artifact : result.getArtifacts()) {
-                    artifacts.add(resolveState.builder.newArtifact(id, metaData.getComponent(), artifact, resolveState.artifactResolver));
+                    artifacts.add(builder.newArtifact(id, metaData.getComponent(), artifact, resolveState.artifactResolver));
                 }
             }
             return artifacts;
@@ -808,19 +711,6 @@ public boolean isSelected() {
             return moduleRevision.state == ModuleState.Selected;
         }
 
-        public void attachToParents(ResolvedConfigurationBuilder oldModelBuilder) {
-            LOGGER.debug("Attaching {} to its parents.", this);
-            for (DependencyEdge dependency : incomingEdges) {
-                dependency.attachToParents(this, oldModelBuilder);
-            }
-        }
-
-        public void collectFailures(FailureState failureState) {
-            for (DependencyEdge dependency : outgoingEdges) {
-                dependency.collectFailures(failureState);
-            }
-        }
-
         private ModuleVersionSpec getSelector(List<DependencyEdge> transitiveEdges) {
             ModuleVersionSpec selector;
             if (transitiveEdges.isEmpty()) {
@@ -858,10 +748,6 @@ public void restart(ModuleVersionResolveState selected) {
             }
         }
 
-        private ModuleVersionIdentifier toId() {
-            return moduleRevision.id;
-        }
-
         public void validate() {
             for (DependencyEdge incomingEdge : incomingEdges) {
                 ConfigurationNode fromNode = incomingEdge.from;
@@ -895,9 +781,9 @@ public void deselect() {
      * Resolution state for a given module version selector.
      */
     private static class ModuleVersionSelectorResolveState {
+        final DependencyMetaData dependencyMetaData;
         final DependencyToModuleVersionIdResolver resolver;
         final ResolveState resolveState;
-        final DependencyMetaData dependencyMetaData;
         ModuleVersionResolveException failure;
         ModuleResolveState targetModule;
         ModuleVersionResolveState targetModuleRevision;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphVisitor.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphVisitor.java
new file mode 100644
index 000000000000..1c5e102dca5f
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/DependencyGraphVisitor.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph;
+
+interface DependencyGraphVisitor {
+    void start(DependencyGraphBuilder.ConfigurationNode root);
+    void visitNode(DependencyGraphBuilder.ConfigurationNode resolvedConfiguration);
+    void visitEdge(DependencyGraphBuilder.ConfigurationNode resolvedConfiguration);
+    void finish(DependencyGraphBuilder.ConfigurationNode root);
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolutionResultDependencyGraphVisitor.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolutionResultDependencyGraphVisitor.java
new file mode 100644
index 000000000000..f8b1e8c903e8
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolutionResultDependencyGraphVisitor.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph;
+
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ResolutionResultBuilder;
+
+class ResolutionResultDependencyGraphVisitor implements DependencyGraphVisitor {
+    private final ResolutionResultBuilder newModelBuilder;
+
+    ResolutionResultDependencyGraphVisitor(ResolutionResultBuilder newModelBuilder) {
+        this.newModelBuilder = newModelBuilder;
+    }
+
+    public void start(DependencyGraphBuilder.ConfigurationNode root) {
+        newModelBuilder.start(root.toId(), root.metaData.getComponent().getComponentId());
+    }
+
+    public void visitNode(DependencyGraphBuilder.ConfigurationNode resolvedConfiguration) {
+        newModelBuilder.resolvedModuleVersion(resolvedConfiguration.moduleRevision);
+    }
+
+    public void visitEdge(DependencyGraphBuilder.ConfigurationNode resolvedConfiguration) {
+        newModelBuilder.resolvedConfiguration(resolvedConfiguration.toId(), resolvedConfiguration.outgoingEdges);
+    }
+
+    public void finish(DependencyGraphBuilder.ConfigurationNode root) {
+
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolvedConfigurationDependencyGraphVisitor.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolvedConfigurationDependencyGraphVisitor.java
new file mode 100644
index 000000000000..65f4558f70ac
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/graph/ResolvedConfigurationDependencyGraphVisitor.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph;
+
+import org.gradle.api.artifacts.ModuleDependency;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
+import org.gradle.api.artifacts.ModuleVersionSelector;
+import org.gradle.api.artifacts.ResolvedArtifact;
+import org.gradle.api.internal.artifacts.ResolvedConfigurationIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolver;
+import org.gradle.api.internal.artifacts.ivyservice.DefaultUnresolvedDependency;
+import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionResolveException;
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.ResolvedConfigurationBuilder;
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+class ResolvedConfigurationDependencyGraphVisitor implements DependencyGraphVisitor {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ResolvedConfigurationDependencyGraphVisitor.class);
+
+    private final ResolvedConfigurationBuilder builder;
+    private final ArtifactResolver artifactResolver;
+    private final Map<ModuleVersionSelector, BrokenDependency> failuresByRevisionId = new LinkedHashMap<ModuleVersionSelector, BrokenDependency>();
+    private DependencyGraphBuilder.ConfigurationNode root;
+
+    ResolvedConfigurationDependencyGraphVisitor(ResolvedConfigurationBuilder builder, ArtifactResolver artifactResolver) {
+        this.builder = builder;
+        this.artifactResolver = artifactResolver;
+    }
+
+    public void start(DependencyGraphBuilder.ConfigurationNode root) {
+        this.root = root;
+    }
+
+    public void visitNode(DependencyGraphBuilder.ConfigurationNode resolvedConfiguration) {
+        builder.newResolvedDependency(resolvedConfiguration.id);
+        for (DependencyGraphBuilder.DependencyEdge dependency : resolvedConfiguration.outgoingEdges) {
+            ModuleVersionResolveException failure = dependency.getFailure();
+            if (failure != null) {
+                addUnresolvedDependency(dependency, dependency.getRequestedModuleVersion(), failure);
+            }
+        }
+    }
+
+    public void visitEdge(DependencyGraphBuilder.ConfigurationNode resolvedConfiguration) {
+        LOGGER.debug("Attaching {} to its parents.", resolvedConfiguration);
+        for (DependencyGraphBuilder.DependencyEdge dependency : resolvedConfiguration.incomingEdges) {
+            attachToParents(dependency, resolvedConfiguration, builder);
+        }
+    }
+
+    private void attachToParents(DependencyGraphBuilder.DependencyEdge dependency, DependencyGraphBuilder.ConfigurationNode childConfiguration, ResolvedConfigurationBuilder oldModelBuilder) {
+        ResolvedConfigurationIdentifier parent = dependency.from.id;
+        ResolvedConfigurationIdentifier child = childConfiguration.id;
+        oldModelBuilder.addChild(parent, child);
+        oldModelBuilder.addParentSpecificArtifacts(child, parent, getArtifacts(dependency, childConfiguration, oldModelBuilder));
+
+        if (parent == root.id) {
+            ModuleDependency moduleDependency = dependency.getModuleDependency();
+            oldModelBuilder.addFirstLevelDependency(moduleDependency, child);
+        }
+    }
+
+    private Set<ResolvedArtifact> getArtifacts(DependencyGraphBuilder.DependencyEdge dependency, DependencyGraphBuilder.ConfigurationNode childConfiguration, ResolvedConfigurationBuilder builder) {
+        Set<ComponentArtifactMetaData> dependencyArtifacts = dependency.getArtifacts(childConfiguration.metaData);
+        if (dependencyArtifacts.isEmpty()) {
+            return childConfiguration.getArtifacts(builder);
+        }
+        Set<ResolvedArtifact> artifacts = new LinkedHashSet<ResolvedArtifact>();
+        for (ComponentArtifactMetaData artifact : dependencyArtifacts) {
+            artifacts.add(builder.newArtifact(childConfiguration.id, childConfiguration.metaData.getComponent(), artifact, artifactResolver));
+        }
+        return artifacts;
+    }
+
+    public void finish(DependencyGraphBuilder.ConfigurationNode root) {
+        attachFailures(builder);
+        builder.done(root.id);
+    }
+
+    private void attachFailures(ResolvedConfigurationBuilder result) {
+        for (Map.Entry<ModuleVersionSelector, BrokenDependency> entry : failuresByRevisionId.entrySet()) {
+            Collection<List<ModuleVersionIdentifier>> paths = calculatePaths(entry.getValue());
+            result.addUnresolvedDependency(new DefaultUnresolvedDependency(entry.getKey(), entry.getValue().failure.withIncomingPaths(paths)));
+        }
+    }
+
+    private Collection<List<ModuleVersionIdentifier>> calculatePaths(BrokenDependency brokenDependency) {
+        // Include the shortest path from each version that has a direct dependency on the broken dependency, back to the root
+
+        Map<DependencyGraphBuilder.ModuleVersionResolveState, List<ModuleVersionIdentifier>> shortestPaths = new LinkedHashMap<DependencyGraphBuilder.ModuleVersionResolveState, List<ModuleVersionIdentifier>>();
+        List<ModuleVersionIdentifier> rootPath = new ArrayList<ModuleVersionIdentifier>();
+        rootPath.add(root.toId());
+        shortestPaths.put(root.moduleRevision, rootPath);
+
+        Set<DependencyGraphBuilder.ModuleVersionResolveState> directDependees = new LinkedHashSet<DependencyGraphBuilder.ModuleVersionResolveState>();
+        for (DependencyGraphBuilder.ConfigurationNode node : brokenDependency.requiredBy) {
+            directDependees.add(node.moduleRevision);
+        }
+
+        Set<DependencyGraphBuilder.ModuleVersionResolveState> seen = new HashSet<DependencyGraphBuilder.ModuleVersionResolveState>();
+        LinkedList<DependencyGraphBuilder.ModuleVersionResolveState> queue = new LinkedList<DependencyGraphBuilder.ModuleVersionResolveState>();
+        queue.addAll(directDependees);
+        while (!queue.isEmpty()) {
+            DependencyGraphBuilder.ModuleVersionResolveState version = queue.getFirst();
+            if (version == root.moduleRevision) {
+                queue.removeFirst();
+            } else if (seen.add(version)) {
+                for (DependencyGraphBuilder.ModuleVersionResolveState incomingVersion : version.getIncoming()) {
+                    queue.add(0, incomingVersion);
+                }
+            } else {
+                queue.remove();
+                List<ModuleVersionIdentifier> shortest = null;
+                for (DependencyGraphBuilder.ModuleVersionResolveState incomingVersion : version.getIncoming()) {
+                    List<ModuleVersionIdentifier> candidate = shortestPaths.get(incomingVersion);
+                    if (candidate == null) {
+                        continue;
+                    }
+                    if (shortest == null) {
+                        shortest = candidate;
+                    } else if (shortest.size() > candidate.size()) {
+                        shortest = candidate;
+                    }
+
+                }
+                if (shortest == null) {
+                    continue;
+                }
+                List<ModuleVersionIdentifier> path = new ArrayList<ModuleVersionIdentifier>();
+                path.addAll(shortest);
+                path.add(version.id);
+                shortestPaths.put(version, path);
+            }
+        }
+
+        List<List<ModuleVersionIdentifier>> paths = new ArrayList<List<ModuleVersionIdentifier>>();
+        for (DependencyGraphBuilder.ModuleVersionResolveState version : directDependees) {
+            List<ModuleVersionIdentifier> path = shortestPaths.get(version);
+            paths.add(path);
+        }
+        return paths;
+    }
+
+    private void addUnresolvedDependency(DependencyGraphBuilder.DependencyEdge dependency, ModuleVersionSelector requested, ModuleVersionResolveException failure) {
+        BrokenDependency breakage = failuresByRevisionId.get(requested);
+        if (breakage == null) {
+            breakage = new BrokenDependency(failure);
+            failuresByRevisionId.put(requested, breakage);
+        }
+        breakage.requiredBy.add(dependency.from);
+    }
+
+    private static class BrokenDependency {
+        final ModuleVersionResolveException failure;
+        final List<DependencyGraphBuilder.ConfigurationNode> requiredBy = new ArrayList<DependencyGraphBuilder.ConfigurationNode>();
+
+        private BrokenDependency(ModuleVersionResolveException failure) {
+            this.failure = failure;
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultResolvedConfigurationBuilder.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultResolvedConfigurationBuilder.java
index 1cc87e412e47..68f57f4eb2bb 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultResolvedConfigurationBuilder.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultResolvedConfigurationBuilder.java
@@ -18,7 +18,6 @@
 
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ResolvedArtifact;
-import org.gradle.api.artifacts.ResolvedDependency;
 import org.gradle.api.artifacts.UnresolvedDependency;
 import org.gradle.api.internal.artifacts.DefaultResolvedArtifact;
 import org.gradle.api.internal.artifacts.ResolvedConfigurationIdentifier;
@@ -78,11 +77,10 @@ public void newResolvedDependency(ResolvedConfigurationIdentifier id) {
         builder.resolvedDependency(id);
     }
 
-    public ResolvedArtifact newArtifact(ResolvedConfigurationIdentifier owner, ComponentMetaData compnent, ComponentArtifactMetaData artifact, ArtifactResolver artifactResolver) {
-        Factory<File> artifactSource = new LazyArtifactSource(artifact, compnent.getSource(), artifactResolver);
-        Factory<ResolvedDependency> dependencySource = new LazyResolvedDependencySource(owner, builder, this);
+    public ResolvedArtifact newArtifact(ResolvedConfigurationIdentifier owner, ComponentMetaData component, ComponentArtifactMetaData artifact, ArtifactResolver artifactResolver) {
+        Factory<File> artifactSource = new LazyArtifactSource(artifact, component.getSource(), artifactResolver);
         long id = idGenerator.generateId();
-        ResolvedArtifact newArtifact = new DefaultResolvedArtifact(new DefaultResolvedModuleVersion(owner.getId()), dependencySource, artifact.getName(), artifactSource, id);
+        ResolvedArtifact newArtifact = new DefaultResolvedArtifact(new DefaultResolvedModuleVersion(owner.getId()), artifact.getName(), artifactSource, id);
         artifacts.put(id, newArtifact);
         return newArtifact;
     }
@@ -132,20 +130,4 @@ public File create() {
             return result.getFile();
         }
     }
-
-    private static class LazyResolvedDependencySource implements Factory<ResolvedDependency> {
-        private final ResolvedConfigurationIdentifier owner;
-        private TransientConfigurationResultsBuilder builder;
-        private ResolvedContentsMapping mapping;
-
-        public LazyResolvedDependencySource(ResolvedConfigurationIdentifier owner, TransientConfigurationResultsBuilder builder, ResolvedContentsMapping mapping) {
-            this.owner = owner;
-            this.builder = builder;
-            this.mapping = mapping;
-        }
-
-        public ResolvedDependency create() {
-            return builder.load(mapping).getResolvedDependency(owner);
-        }
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultTransientConfigurationResults.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultTransientConfigurationResults.java
index 0c8adad06396..45f1a90403bb 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultTransientConfigurationResults.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/DefaultTransientConfigurationResults.java
@@ -18,10 +18,7 @@
 
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ResolvedDependency;
-import org.gradle.api.internal.artifacts.DefaultResolvedDependency;
-import org.gradle.api.internal.artifacts.ResolvedConfigurationIdentifier;
 
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -29,7 +26,6 @@ public class DefaultTransientConfigurationResults implements TransientConfigurat
 
     final Map<ModuleDependency, ResolvedDependency> firstLevelDependencies = new LinkedHashMap<ModuleDependency, ResolvedDependency>();
     ResolvedDependency root;
-    final Map<ResolvedConfigurationIdentifier, DefaultResolvedDependency> allDependencies = new HashMap<ResolvedConfigurationIdentifier, DefaultResolvedDependency>();
 
     public Map<ModuleDependency, ResolvedDependency> getFirstLevelDependencies() {
         return firstLevelDependencies;
@@ -39,7 +35,4 @@ public ResolvedDependency getRoot() {
         return root;
     }
 
-    public ResolvedDependency getResolvedDependency(ResolvedConfigurationIdentifier id) {
-        return allDependencies.get(id);
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResults.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResults.java
index 634f9698dd69..cee01f3735c6 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResults.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResults.java
@@ -18,7 +18,6 @@
 
 import org.gradle.api.artifacts.ModuleDependency;
 import org.gradle.api.artifacts.ResolvedDependency;
-import org.gradle.api.internal.artifacts.ResolvedConfigurationIdentifier;
 
 import java.util.Map;
 
@@ -27,6 +26,4 @@ public interface TransientConfigurationResults {
     Map<ModuleDependency, ResolvedDependency> getFirstLevelDependencies();
 
     ResolvedDependency getRoot();
-
-    ResolvedDependency getResolvedDependency(ResolvedConfigurationIdentifier id);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResultsBuilder.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResultsBuilder.java
index b1f84d0b047e..f3b6c1a0e1ad 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResultsBuilder.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/oldresult/TransientConfigurationResultsBuilder.java
@@ -30,6 +30,8 @@
 import org.gradle.util.Clock;
 
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import static com.google.common.collect.Sets.newHashSet;
 import static org.gradle.internal.UncheckedException.throwAsUncheckedException;
@@ -119,6 +121,7 @@ public TransientConfigurationResults read(Decoder decoder) throws IOException {
 
     private TransientConfigurationResults deserialize(Decoder decoder, ResolvedContentsMapping mapping) {
         Clock clock = new Clock();
+        Map<ResolvedConfigurationIdentifier, DefaultResolvedDependency> allDependencies = new HashMap<ResolvedConfigurationIdentifier, DefaultResolvedDependency>();
         DefaultTransientConfigurationResults results = new DefaultTransientConfigurationResults();
         int valuesRead = 0;
         byte type = -1;
@@ -130,48 +133,48 @@ private TransientConfigurationResults deserialize(Decoder decoder, ResolvedConte
                 switch (type) {
                     case NEW_DEP:
                         id = resolvedConfigurationIdentifierSerializer.read(decoder);
-                        results.allDependencies.put(id, new DefaultResolvedDependency(id.getId(), id.getConfiguration()));
+                        allDependencies.put(id, new DefaultResolvedDependency(id.getId(), id.getConfiguration()));
                         break;
                     case ROOT:
                         id = resolvedConfigurationIdentifierSerializer.read(decoder);
-                        results.root = results.allDependencies.get(id);
+                        results.root = allDependencies.get(id);
                         if (results.root == null) {
-                            throw new IllegalStateException(String.format("Unexpected root id %s. Seen ids: %s", id, results.allDependencies.keySet()));
+                            throw new IllegalStateException(String.format("Unexpected root id %s. Seen ids: %s", id, allDependencies.keySet()));
                         }
                         //root should be the last
                         LOG.debug("Loaded resolved configuration results ({}) from {}", clock.getTime(), binaryStore);
                         return results;
                     case FIRST_LVL:
                         id = resolvedConfigurationIdentifierSerializer.read(decoder);
-                        DefaultResolvedDependency dependency = results.allDependencies.get(id);
+                        DefaultResolvedDependency dependency = allDependencies.get(id);
                         if (dependency == null) {
-                            throw new IllegalStateException(String.format("Unexpected first level id %s. Seen ids: %s", id, results.allDependencies.keySet()));
+                            throw new IllegalStateException(String.format("Unexpected first level id %s. Seen ids: %s", id, allDependencies.keySet()));
                         }
                         results.firstLevelDependencies.put(mapping.getModuleDependency(id), dependency);
                         break;
                     case PARENT_CHILD:
                         ResolvedConfigurationIdentifier parentId = resolvedConfigurationIdentifierSerializer.read(decoder);
                         ResolvedConfigurationIdentifier childId = resolvedConfigurationIdentifierSerializer.read(decoder);
-                        DefaultResolvedDependency parent = results.allDependencies.get(parentId);
-                        DefaultResolvedDependency child = results.allDependencies.get(childId);
+                        DefaultResolvedDependency parent = allDependencies.get(parentId);
+                        DefaultResolvedDependency child = allDependencies.get(childId);
                         if (parent == null) {
-                            throw new IllegalStateException(String.format("Unexpected parent dependency id %s. Seen ids: %s", parentId, results.allDependencies.keySet()));
+                            throw new IllegalStateException(String.format("Unexpected parent dependency id %s. Seen ids: %s", parentId, allDependencies.keySet()));
                         }
                         if (child == null) {
-                            throw new IllegalStateException(String.format("Unexpected child dependency id %s. Seen ids: %s", childId, results.allDependencies.keySet()));
+                            throw new IllegalStateException(String.format("Unexpected child dependency id %s. Seen ids: %s", childId, allDependencies.keySet()));
                         }
                         parent.addChild(child);
                         break;
                     case PARENT_ARTIFACT:
                         ResolvedConfigurationIdentifier artifactParentId = resolvedConfigurationIdentifierSerializer.read(decoder);
                         ResolvedConfigurationIdentifier artifactChildId = resolvedConfigurationIdentifierSerializer.read(decoder);
-                        DefaultResolvedDependency artifactParent = results.allDependencies.get(artifactParentId);
-                        DefaultResolvedDependency artifactChild = results.allDependencies.get(artifactChildId);
+                        DefaultResolvedDependency artifactParent = allDependencies.get(artifactParentId);
+                        DefaultResolvedDependency artifactChild = allDependencies.get(artifactChildId);
                         if (artifactParent == null) {
-                            throw new IllegalStateException(String.format("Unexpected parent dependency id %s. Seen ids: %s", artifactParentId, results.allDependencies.keySet()));
+                            throw new IllegalStateException(String.format("Unexpected parent dependency id %s. Seen ids: %s", artifactParentId, allDependencies.keySet()));
                         }
                         if (artifactChild == null) {
-                            throw new IllegalStateException(String.format("Unexpected child dependency id %s. Seen ids: %s", artifactChildId, results.allDependencies.keySet()));
+                            throw new IllegalStateException(String.format("Unexpected child dependency id %s. Seen ids: %s", artifactChildId, allDependencies.keySet()));
                         }
                         artifactParent.addParentSpecificArtifacts(artifactChild, newHashSet(mapping.getArtifact(decoder.readLong())));
                         break;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleDescriptorBackedMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleDescriptorBackedMetaData.java
index b4e208fa77da..e7948cd02359 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleDescriptorBackedMetaData.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleDescriptorBackedMetaData.java
@@ -103,14 +103,18 @@ public void setStatusScheme(List<String> statusScheme) {
 
     public List<DependencyMetaData> getDependencies() {
         if (dependencies == null) {
-            dependencies = new ArrayList<DependencyMetaData>();
-            for (final DependencyDescriptor dependencyDescriptor : moduleDescriptor.getDependencies()) {
-                dependencies.add(new DefaultDependencyMetaData(dependencyDescriptor));
-            }
+            populateDependenciesFromDescriptor();
         }
         return dependencies;
     }
 
+    private void populateDependenciesFromDescriptor() {
+        dependencies = new ArrayList<DependencyMetaData>();
+        for (final DependencyDescriptor dependencyDescriptor : moduleDescriptor.getDependencies()) {
+            dependencies.add(new DefaultDependencyMetaData(dependencyDescriptor));
+        }
+    }
+
     public void setDependencies(Iterable<? extends DependencyMetaData> dependencies) {
         this.dependencies = CollectionUtils.toList(dependencies);
         for (DefaultConfigurationMetaData configuration : configurations.values()) {
@@ -121,18 +125,23 @@ public void setDependencies(Iterable<? extends DependencyMetaData> dependencies)
     public DefaultConfigurationMetaData getConfiguration(final String name) {
         DefaultConfigurationMetaData configuration = configurations.get(name);
         if (configuration == null) {
-            Configuration descriptor = moduleDescriptor.getConfiguration(name);
-            if (descriptor == null) {
-                return null;
-            }
-            Set<String> hierarchy = new LinkedHashSet<String>();
-            hierarchy.add(name);
-            for (String parent : descriptor.getExtends()) {
-                hierarchy.addAll(getConfiguration(parent).hierarchy);
-            }
-            configuration = new DefaultConfigurationMetaData(name, descriptor, hierarchy);
-            configurations.put(name, configuration);
+            configuration = populateConfigurationFromDescriptor(name);
+        }
+        return configuration;
+    }
+
+    private DefaultConfigurationMetaData populateConfigurationFromDescriptor(String name) {
+        Configuration descriptorConfiguration = moduleDescriptor.getConfiguration(name);
+        if (descriptorConfiguration == null) {
+            return null;
+        }
+        Set<String> hierarchy = new LinkedHashSet<String>();
+        hierarchy.add(name);
+        for (String parent : descriptorConfiguration.getExtends()) {
+            hierarchy.addAll(getConfiguration(parent).hierarchy);
         }
+        DefaultConfigurationMetaData configuration = new DefaultConfigurationMetaData(name, descriptorConfiguration, hierarchy);
+        configurations.put(name, configuration);
         return configuration;
     }
 
@@ -210,17 +219,21 @@ private boolean include(DependencyMetaData dependency) {
 
         public Set<ExcludeRule> getExcludeRules() {
             if (excludeRules == null) {
-                excludeRules = new LinkedHashSet<ExcludeRule>();
-                for (ExcludeRule excludeRule : moduleDescriptor.getAllExcludeRules()) {
-                    for (String config : excludeRule.getConfigurations()) {
-                        if (hierarchy.contains(config)) {
-                            excludeRules.add(excludeRule);
-                            break;
-                        }
+                populateExcludeRulesFromDescriptor();
+            }
+            return excludeRules;
+        }
+
+        private void populateExcludeRulesFromDescriptor() {
+            excludeRules = new LinkedHashSet<ExcludeRule>();
+            for (ExcludeRule excludeRule : moduleDescriptor.getAllExcludeRules()) {
+                for (String config : excludeRule.getConfigurations()) {
+                    if (hierarchy.contains(config)) {
+                        excludeRules.add(excludeRule);
+                        break;
                     }
                 }
             }
-            return excludeRules;
         }
 
         public Set<ComponentArtifactMetaData> getArtifacts() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleVersionMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleVersionMetaData.java
new file mode 100644
index 000000000000..ba29fa8105d1
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleVersionMetaData.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.metadata;
+
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Maps;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Sets;
+import org.apache.ivy.core.module.descriptor.Artifact;
+import org.apache.ivy.core.module.descriptor.DefaultArtifact;
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.gradle.api.Nullable;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
+
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+
+abstract class AbstractModuleVersionMetaData extends AbstractModuleDescriptorBackedMetaData implements MutableModuleVersionMetaData {
+    private Set<ModuleVersionArtifactMetaData> artifacts;
+    private Multimap<String, ModuleVersionArtifactMetaData> artifactsByConfig;
+
+    public AbstractModuleVersionMetaData(ModuleDescriptor moduleDescriptor) {
+        this(moduleVersionIdentifier(moduleDescriptor), moduleDescriptor, moduleComponentIdentifier(moduleDescriptor));
+    }
+    
+    private static ModuleVersionIdentifier moduleVersionIdentifier(ModuleDescriptor descriptor) {
+        return DefaultModuleVersionIdentifier.newId(descriptor.getModuleRevisionId());
+    }
+
+    private static ModuleComponentIdentifier moduleComponentIdentifier(ModuleDescriptor descriptor) {
+        return DefaultModuleComponentIdentifier.newId(moduleVersionIdentifier(descriptor));
+    }
+
+    public AbstractModuleVersionMetaData(ModuleVersionIdentifier moduleVersionIdentifier, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier) {
+        super(moduleVersionIdentifier, moduleDescriptor, componentIdentifier);
+    }
+
+    protected void copyTo(AbstractModuleVersionMetaData copy) {
+        super.copyTo(copy);
+        copy.artifacts = artifacts;
+        copy.artifactsByConfig = artifactsByConfig;
+    }
+
+    public abstract AbstractModuleVersionMetaData copy();
+
+    public ModuleVersionMetaData withSource(ModuleSource source) {
+        AbstractModuleVersionMetaData copy = copy();
+        copy.setModuleSource(source);
+        return copy;
+    }
+
+    @Override
+    public ModuleComponentIdentifier getComponentId() {
+        return (ModuleComponentIdentifier) super.getComponentId();
+    }
+
+    public ModuleVersionArtifactMetaData artifact(Artifact artifact) {
+        return new DefaultModuleVersionArtifactMetaData(getComponentId(), artifact);
+    }
+
+    public ModuleVersionArtifactMetaData artifact(String type, @Nullable String extension, @Nullable String classifier) {
+        Map extraAttributes = classifier == null ? Collections.emptyMap() : Collections.singletonMap("m:classifier", classifier);
+        Artifact artifact = new DefaultArtifact(getDescriptor().getModuleRevisionId(), null, getId().getName(), type, extension, extraAttributes);
+        return new DefaultModuleVersionArtifactMetaData(getComponentId(), artifact);
+    }
+
+    public Set<ModuleVersionArtifactMetaData> getArtifacts() {
+        if (artifacts == null) {
+            populateArtifactsFromDescriptor();
+        }
+        return artifacts;
+    }
+
+    public void setArtifacts(Iterable<? extends ModuleVersionArtifactMetaData> artifacts) {
+        this.artifacts = Sets.newLinkedHashSet(artifacts);
+        this.artifactsByConfig = LinkedHashMultimap.create();
+        for (String config : getDescriptor().getConfigurationsNames()) {
+            artifactsByConfig.putAll(config, artifacts);
+        }
+    }
+
+    protected Set<ComponentArtifactMetaData> getArtifactsForConfiguration(ConfigurationMetaData configurationMetaData) {
+        if (artifactsByConfig == null) {
+            populateArtifactsFromDescriptor();
+        }
+        Set<ComponentArtifactMetaData> artifactMetaData = new LinkedHashSet<ComponentArtifactMetaData>();
+        for (String ancestor : configurationMetaData.getHierarchy()) {
+            artifactMetaData.addAll(artifactsByConfig.get(ancestor));
+        }
+        return artifactMetaData;
+    }
+
+    private void populateArtifactsFromDescriptor() {
+        Map<Artifact, ModuleVersionArtifactMetaData> artifactToMetaData = Maps.newLinkedHashMap();
+        for (Artifact descriptorArtifact : getDescriptor().getAllArtifacts()) {
+            ModuleVersionArtifactMetaData artifact = artifact(descriptorArtifact);
+            artifactToMetaData.put(descriptorArtifact, artifact);
+        }
+
+        artifacts = Sets.newLinkedHashSet(artifactToMetaData.values());
+
+        this.artifactsByConfig = LinkedHashMultimap.create();
+        for (String configuration : getDescriptor().getConfigurationsNames()) {
+            Artifact[] configArtifacts = getDescriptor().getArtifacts(configuration);
+            for (Artifact configArtifact : configArtifacts) {
+                artifactsByConfig.put(configuration, artifactToMetaData.get(configArtifact));
+            }
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaData.java
index c665773d64e1..133a02c19b28 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaData.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaData.java
@@ -18,8 +18,10 @@
 
 import org.apache.ivy.core.module.descriptor.*;
 import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.ModuleVersionSelector;
 import org.gradle.api.artifacts.component.ComponentSelector;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector;
 import org.gradle.api.internal.artifacts.component.DefaultModuleComponentSelector;
 import org.gradle.api.internal.artifacts.component.DefaultProjectComponentSelector;
@@ -43,6 +45,16 @@ public DefaultDependencyMetaData(DependencyDescriptor dependencyDescriptor) {
         requested = new DefaultModuleVersionSelector(dependencyRevisionId.getOrganisation(), dependencyRevisionId.getName(), dependencyRevisionId.getRevision());
     }
 
+    public DefaultDependencyMetaData(ModuleVersionIdentifier moduleVersionIdentifier, boolean force) {
+        dependencyDescriptor = new DefaultDependencyDescriptor(IvyUtil.createModuleRevisionId(moduleVersionIdentifier), force);
+        requested = new DefaultModuleVersionSelector(moduleVersionIdentifier.getGroup(), moduleVersionIdentifier.getName(), moduleVersionIdentifier.getVersion());
+    }
+
+    public DefaultDependencyMetaData(ModuleComponentIdentifier componentIdentifier, boolean force) {
+        dependencyDescriptor = new DefaultDependencyDescriptor(IvyUtil.createModuleRevisionId(componentIdentifier), force);
+        requested = new DefaultModuleVersionSelector(componentIdentifier.getGroup(), componentIdentifier.getModule(), componentIdentifier.getVersion());
+    }
+
     @Override
     public String toString() {
         return dependencyDescriptor.toString();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyArtifactName.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyArtifactName.java
index 37628ac6e7ab..ac75cd736cf0 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyArtifactName.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyArtifactName.java
@@ -38,6 +38,13 @@ public DefaultIvyArtifactName(String name, String type, @Nullable String extensi
         this.attributes = attributes.isEmpty() ? Collections.<String, String>emptyMap() : new HashMap<String, String>(attributes);
     }
 
+    public DefaultIvyArtifactName(String name, String type, @Nullable String extension) {
+        this.name = name;
+        this.type = type;
+        this.extension = extension;
+        this.attributes = Collections.emptyMap();
+    }
+
     @Override
     public String toString() {
         StringBuilder result = new StringBuilder();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyModuleVersionMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyModuleVersionMetaData.java
new file mode 100644
index 000000000000..1268f16cf2ba
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyModuleVersionMetaData.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.metadata;
+
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.IvyUtil;
+
+import java.util.Map;
+
+public class DefaultIvyModuleVersionMetaData extends AbstractModuleVersionMetaData implements IvyModuleVersionMetaData {
+    private final Map<String, String> extraInfo;
+
+    public DefaultIvyModuleVersionMetaData(ModuleDescriptor moduleDescriptor) {
+        super(moduleDescriptor);
+        this.extraInfo = moduleDescriptor.getExtraInfo();
+    }
+
+    public DefaultIvyModuleVersionMetaData(ModuleVersionIdentifier identifier, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier) {
+        super(identifier, moduleDescriptor, componentIdentifier);
+        this.extraInfo = moduleDescriptor.getExtraInfo();
+    }
+
+    public DefaultIvyModuleVersionMetaData(DependencyMetaData dependencyMetaData) {
+        this(IvyUtil.createModuleDescriptor(dependencyMetaData.getDescriptor()));
+    }
+
+    @Override
+    public DefaultIvyModuleVersionMetaData copy() {
+        // TODO:ADAM - need to make a copy of the descriptor (it's effectively immutable at this point so it's not a problem yet)
+        DefaultIvyModuleVersionMetaData copy = new DefaultIvyModuleVersionMetaData(getId(), getDescriptor(), getComponentId());
+        copyTo(copy);
+        return copy;
+    }
+
+    public Map<String, String> getExtraInfo() {
+        return extraInfo;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultMavenModuleVersionMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultMavenModuleVersionMetaData.java
new file mode 100644
index 000000000000..2e02b0c35299
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultMavenModuleVersionMetaData.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.metadata;
+
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.ivyservice.IvyUtil;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+public class DefaultMavenModuleVersionMetaData extends AbstractModuleVersionMetaData implements MavenModuleVersionMetaData {
+    private static final String POM_PACKAGING = "pom";
+    private static final Collection<String> JAR_PACKAGINGS = Arrays.asList("ejb", "bundle", "maven-plugin", "eclipse-plugin");
+    private final String packaging;
+    private final boolean relocated;
+
+    public DefaultMavenModuleVersionMetaData(ModuleDescriptor moduleDescriptor, String packaging, boolean relocated) {
+        super(moduleDescriptor);
+        this.packaging = packaging;
+        this.relocated = relocated;
+    }
+
+    public DefaultMavenModuleVersionMetaData(ModuleVersionIdentifier id, ModuleDescriptor descriptor, ModuleComponentIdentifier componentId, String packaging, boolean relocated) {
+        super(id, descriptor, componentId);
+        this.packaging = packaging;
+        this.relocated = relocated;
+    }
+
+    public DefaultMavenModuleVersionMetaData(DependencyMetaData dependencyMetaData) {
+        this(IvyUtil.createModuleDescriptor(dependencyMetaData.getDescriptor()), "jar", false);
+    }
+
+    @Override
+    public DefaultMavenModuleVersionMetaData copy() {
+        // TODO:ADAM - need to make a copy of the descriptor (it's effectively immutable at this point so it's not a problem yet)
+        DefaultMavenModuleVersionMetaData copy = new DefaultMavenModuleVersionMetaData(getId(), getDescriptor(), getComponentId(), packaging, relocated);
+        copyTo(copy);
+        return copy;
+    }
+
+    public String getPackaging() {
+        return packaging;
+    }
+
+    public boolean isRelocated() {
+        return relocated;
+    }
+
+    public boolean isPomPackaging() {
+        return POM_PACKAGING.equals(packaging);
+    }
+
+    public boolean isKnownJarPackaging() {
+        return "jar".equals(packaging) || JAR_PACKAGINGS.contains(packaging);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactIdentifier.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactIdentifier.java
index 83107336b619..9bd72b94e145 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactIdentifier.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactIdentifier.java
@@ -18,9 +18,7 @@
 
 import org.apache.ivy.core.module.descriptor.Artifact;
 import org.gradle.api.Nullable;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
-import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier;
 
 import java.util.Collections;
 import java.util.Map;
@@ -33,13 +31,17 @@ public DefaultModuleVersionArtifactIdentifier(ModuleComponentIdentifier componen
         this(componentIdentifier, artifact.getName(), artifact.getType(), artifact.getExt(), artifact.getExtraAttributes());
     }
 
-    public DefaultModuleVersionArtifactIdentifier(ModuleVersionIdentifier moduleVersionIdentifier, String name, String type, @Nullable String extension) {
-        this(DefaultModuleComponentIdentifier.newId(moduleVersionIdentifier), name, type, extension, Collections.<String, String>emptyMap());
+    public DefaultModuleVersionArtifactIdentifier(ModuleComponentIdentifier componentIdentifier, String name, String type, @Nullable String extension) {
+        this(componentIdentifier, name, type, extension, Collections.<String, String>emptyMap());
     }
 
     public DefaultModuleVersionArtifactIdentifier(ModuleComponentIdentifier componentIdentifier, String name, String type, @Nullable String extension, Map<String, String> attributes) {
+        this(componentIdentifier, new DefaultIvyArtifactName(name, type, extension, attributes));
+    }
+
+    public DefaultModuleVersionArtifactIdentifier(ModuleComponentIdentifier componentIdentifier, IvyArtifactName artifact) {
         this.componentIdentifier = componentIdentifier;
-        this.name = new DefaultIvyArtifactName(name, type, extension, attributes);
+        this.name = artifact;
     }
 
     public String getDisplayName() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactMetaData.java
index 5324c51e8d49..1b2189c24830 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactMetaData.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/DefaultModuleVersionArtifactMetaData.java
@@ -31,6 +31,10 @@ public DefaultModuleVersionArtifactMetaData(ModuleComponentIdentifier componentI
         this(new DefaultModuleVersionArtifactIdentifier(componentIdentifier, artifact));
     }
 
+    public DefaultModuleVersionArtifactMetaData(ModuleComponentIdentifier componentIdentifier, IvyArtifactName artifact) {
+        this(new DefaultModuleVersionArtifactIdentifier(componentIdentifier, artifact));
+    }
+
     public DefaultModuleVersionArtifactMetaData(ModuleVersionArtifactIdentifier moduleVersionArtifactIdentifier) {
         this.id = (DefaultModuleVersionArtifactIdentifier) moduleVersionArtifactIdentifier;
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/IvyModuleVersionMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/IvyModuleVersionMetaData.java
new file mode 100644
index 000000000000..9cf35665a552
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/IvyModuleVersionMetaData.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.metadata;
+
+import java.util.Map;
+
+/**
+ * Meta-data for a module version resolved from an Ivy repository.
+ */
+public interface IvyModuleVersionMetaData extends ModuleVersionMetaData {
+    /**
+     * Returns the extra info for the module.
+     *
+     * @return the extra info for the module
+     */
+    Map<String, String> getExtraInfo();
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MavenModuleVersionMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MavenModuleVersionMetaData.java
new file mode 100644
index 000000000000..822668c33a10
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MavenModuleVersionMetaData.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.metadata;
+
+/**
+ * Meta-data for a module version resolved from a Maven repository.
+ */
+public interface MavenModuleVersionMetaData extends ModuleVersionMetaData {
+    String getPackaging();
+    boolean isRelocated();
+    boolean isPomPackaging();
+    boolean isKnownJarPackaging();
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapter.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapter.java
deleted file mode 100644
index 747f8ca7d943..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapter.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.metadata;
-
-import org.apache.ivy.core.module.descriptor.*;
-import org.gradle.api.Nullable;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
-import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
-
-import java.util.*;
-
-public class ModuleDescriptorAdapter extends AbstractModuleDescriptorBackedMetaData implements MutableModuleVersionMetaData {
-    private boolean metaDataOnly;
-    private Set<ModuleVersionArtifactMetaData> artifacts;
-
-    public static ModuleDescriptorAdapter defaultForDependency(DependencyMetaData dependencyMetaData) {
-        DependencyDescriptor dependencyDescriptor = dependencyMetaData.getDescriptor();
-        DefaultModuleDescriptor moduleDescriptor = DefaultModuleDescriptor.newDefaultInstance(dependencyDescriptor.getDependencyRevisionId(), dependencyDescriptor.getAllDependencyArtifacts());
-        moduleDescriptor.setStatus("integration");
-        return new ModuleDescriptorAdapter(moduleDescriptor);
-    }
-
-    public ModuleDescriptorAdapter(ModuleDescriptor moduleDescriptor) {
-        this(DefaultModuleVersionIdentifier.newId(moduleDescriptor.getModuleRevisionId()), moduleDescriptor);
-    }
-
-    public ModuleDescriptorAdapter(ModuleVersionIdentifier identifier, ModuleDescriptor moduleDescriptor) {
-        this(identifier, moduleDescriptor, DefaultModuleComponentIdentifier.newId(identifier));
-    }
-
-    public ModuleDescriptorAdapter(ModuleVersionIdentifier moduleVersionIdentifier, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier) {
-        super(moduleVersionIdentifier, moduleDescriptor, componentIdentifier);
-    }
-
-    public ModuleDescriptorAdapter copy() {
-        // TODO:ADAM - need to make a copy of the descriptor (it's effectively immutable at this point so it's not a problem yet)
-        ModuleDescriptorAdapter copy = new ModuleDescriptorAdapter(getId(), getDescriptor(), getComponentId());
-        copyTo(copy);
-        copy.metaDataOnly = metaDataOnly;
-        return copy;
-    }
-
-    public ModuleVersionMetaData withSource(ModuleSource source) {
-        ModuleDescriptorAdapter copy = copy();
-        copy.setModuleSource(source);
-        return copy;
-    }
-
-    @Override
-    public ModuleComponentIdentifier getComponentId() {
-        return (ModuleComponentIdentifier) super.getComponentId();
-    }
-
-    public boolean isMetaDataOnly() {
-        return metaDataOnly;
-    }
-
-    public void setMetaDataOnly(boolean metaDataOnly) {
-        this.metaDataOnly = metaDataOnly;
-    }
-
-    public ModuleVersionArtifactMetaData artifact(Artifact artifact) {
-        return new DefaultModuleVersionArtifactMetaData(getComponentId(), artifact);
-    }
-
-    public ModuleVersionArtifactMetaData artifact(String type, @Nullable String extension, @Nullable String classifier) {
-        Map extraAttributes = classifier == null ? Collections.emptyMap() : Collections.singletonMap("m:classifier", classifier);
-        Artifact artifact = new DefaultArtifact(getDescriptor().getModuleRevisionId(), null, getId().getName(), type, "jar", extraAttributes);
-        return new DefaultModuleVersionArtifactMetaData(getComponentId(), artifact);
-    }
-
-    public Set<ModuleVersionArtifactMetaData> getArtifacts() {
-        if (artifacts == null) {
-            artifacts = new LinkedHashSet<ModuleVersionArtifactMetaData>();
-            for (Artifact artifact : getDescriptor().getAllArtifacts()) {
-                artifacts.add(artifact(artifact));
-            }
-        }
-        return artifacts;
-    }
-
-    protected Set<ComponentArtifactMetaData> getArtifactsForConfiguration(ConfigurationMetaData configurationMetaData) {
-        Set<Artifact> artifacts = new HashSet<Artifact>();
-        Set<ComponentArtifactMetaData> artifactMetaData = new LinkedHashSet<ComponentArtifactMetaData>();
-        for (String ancestor : configurationMetaData.getHierarchy()) {
-            for (Artifact artifact : getDescriptor().getArtifacts(ancestor)) {
-                if (artifacts.add(artifact)) {
-                    artifactMetaData.add(new DefaultModuleVersionArtifactMetaData(getComponentId(), artifact));
-                }
-            }
-        }
-        return artifactMetaData;
-    }
-
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionMetaData.java
index 9f244723d391..da5fdc3d98cf 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionMetaData.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/ModuleVersionMetaData.java
@@ -36,6 +36,4 @@ public interface ModuleVersionMetaData extends ComponentMetaData {
 
     ModuleVersionArtifactMetaData artifact(String type, @Nullable String extension, @Nullable String classifier);
 
-    // TODO:DAZ This is not set correctly when read from cache
-    boolean isMetaDataOnly();
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MutableModuleVersionMetaData.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MutableModuleVersionMetaData.java
index 2b6910d362c1..f620568fd7b8 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MutableModuleVersionMetaData.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/metadata/MutableModuleVersionMetaData.java
@@ -31,4 +31,9 @@ public interface MutableModuleVersionMetaData extends ModuleVersionMetaData {
      * Replaces the dependencies of this module version.
      */
     void setDependencies(Iterable<? extends DependencyMetaData> dependencies);
+
+    /**
+     * Replaces the artifacts of this module version.
+     */
+    void setArtifacts(Iterable<? extends ModuleVersionArtifactMetaData> artifacts);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQuery.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQuery.java
similarity index 56%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQuery.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQuery.java
index dba4a2af03d5..4a21fcc4c74c 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQuery.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQuery.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.resolution;
+package org.gradle.api.internal.artifacts.query;
 
 import com.google.common.collect.Sets;
-import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.gradle.api.artifacts.component.ComponentIdentifier;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.artifacts.dsl.ArtifactResolutionQuery;
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
-import org.gradle.api.artifacts.resolution.*;
+import org.gradle.api.artifacts.result.*;
 import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
 import org.gradle.api.internal.artifacts.configurations.ConfigurationContainerInternal;
 import org.gradle.api.internal.artifacts.configurations.ConfigurationInternal;
@@ -33,10 +32,9 @@
 import org.gradle.api.internal.artifacts.metadata.ComponentMetaData;
 import org.gradle.api.internal.artifacts.metadata.DefaultDependencyMetaData;
 import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
+import org.gradle.api.internal.artifacts.result.*;
 import org.gradle.internal.Factory;
 import org.gradle.internal.Transformers;
-import org.gradle.internal.reflect.DirectInstantiator;
-import org.gradle.internal.reflect.Instantiator;
 import org.gradle.util.CollectionUtils;
 
 import java.util.Arrays;
@@ -51,8 +49,8 @@ public class DefaultArtifactResolutionQuery implements ArtifactResolutionQuery {
     private final CacheLockingManager lockingManager;
 
     private Set<ComponentIdentifier> componentIds = Sets.newLinkedHashSet();
-    private Class<? extends SoftwareComponent> componentType;
-    private Set<Class<? extends SoftwareArtifact>> artifactTypes = Sets.newLinkedHashSet();
+    private Class<? extends Component> componentType;
+    private Set<Class<? extends Artifact>> artifactTypes = Sets.newLinkedHashSet();
 
     public DefaultArtifactResolutionQuery(ConfigurationContainerInternal configurationContainer, RepositoryHandler repositoryHandler,
                                           ResolveIvyFactory ivyFactory, ModuleMetadataProcessor metadataProcessor, CacheLockingManager lockingManager) {
@@ -73,84 +71,63 @@ public ArtifactResolutionQuery forComponents(ComponentIdentifier... componentIds
         return this;
     }
 
-    @SuppressWarnings("unchecked")
-    public <T extends SoftwareComponent, U extends SoftwareArtifact> ArtifactResolutionQuery withArtifacts(Class<T> componentType, Class<U>... artifactTypes) {
+    public ArtifactResolutionQuery withArtifacts(Class<? extends Component> componentType, Class<? extends Artifact>... artifactTypes) {
         this.componentType = componentType;
-        if (artifactTypes.length == 0) {
-            this.artifactTypes = (Set) Sets.newHashSet(JvmLibrarySourcesArtifact.class, JvmLibraryJavadocArtifact.class);
-        } else {
-            this.artifactTypes.addAll(Arrays.asList(artifactTypes));
-        }
+        this.artifactTypes.addAll(Arrays.asList(artifactTypes));
         return this;
     }
 
     // TODO:DAZ This is ugly and needs a major cleanup and unit tests
-    // TODO:DAZ Also need to add a 'result' layer to the api
-    public ArtifactResolutionQueryResult execute() {
+    public ArtifactResolutionResult execute() {
         List<ResolutionAwareRepository> repositories = CollectionUtils.collect(repositoryHandler, Transformers.cast(ResolutionAwareRepository.class));
         ConfigurationInternal configuration = configurationContainer.detachedConfiguration();
         final RepositoryChain repositoryChain = ivyFactory.create(configuration, repositories, metadataProcessor);
         final ArtifactResolver artifactResolver = new ErrorHandlingArtifactResolver(repositoryChain.getArtifactResolver());
 
-        return lockingManager.useCache("resolve artifacts", new Factory<ArtifactResolutionQueryResult>() {
-            public ArtifactResolutionQueryResult create() {
-                Set<JvmLibrary> jvmLibraries = Sets.newHashSet();
-                Set<UnresolvedSoftwareComponent> unresolvedComponents = Sets.newHashSet();
+        return lockingManager.useCache("resolve artifacts", new Factory<ArtifactResolutionResult>() {
+            public ArtifactResolutionResult create() {
+                Set<ComponentResult> componentResults = Sets.newHashSet();
 
                 for (ComponentIdentifier componentId : componentIds) {
                     if (!(componentId instanceof ModuleComponentIdentifier)) {
                         throw new IllegalArgumentException(String.format("Cannot resolve the artifacts for component %s with unsupported type %s.", componentId.getDisplayName(), componentId.getClass().getName()));
                     }
                     ModuleComponentIdentifier moduleComponentId = (ModuleComponentIdentifier) componentId;
-                    BuildableComponentResolveResult moduleResolveResult = new DefaultBuildableComponentResolveResult();
-                    repositoryChain.getDependencyResolver().resolve(new DefaultDependencyMetaData(new DefaultDependencyDescriptor(toModuleRevisionId(moduleComponentId), true)), moduleResolveResult);
-
                     try {
-                        DefaultJvmLibrary jvmLibrary = buildJvmLibrary(moduleResolveResult.getMetaData(), artifactResolver);
-                        jvmLibraries.add(jvmLibrary);
+                        componentResults.add(buildComponentResult(moduleComponentId, repositoryChain, artifactResolver));
                     } catch (Throwable t) {
-                        unresolvedComponents.add(new DefaultUnresolvedSoftwareComponent(moduleComponentId, t));
+                        componentResults.add(new DefaultUnresolvedComponentResult(moduleComponentId, t));
                     }
                 }
 
-                return new DefaultArtifactResolutionQueryResult(jvmLibraries, unresolvedComponents);
+                return new DefaultArtifactResolutionResult(componentResults);
             }
         });
     }
 
-    private DefaultJvmLibrary buildJvmLibrary(ComponentMetaData component, ArtifactResolver artifactResolver) {
-        Set<JvmLibraryJavadocArtifact> javadocs = Sets.newLinkedHashSet();
-        Set<JvmLibrarySourcesArtifact> sources = Sets.newLinkedHashSet();
-        for (Class<? extends SoftwareArtifact> artifactType : artifactTypes) {
-            if (artifactType == JvmLibraryJavadocArtifact.class) {
-                addJvmLibraryArtifacts(javadocs, JvmLibraryJavadocArtifact.class, DefaultJvmLibraryJavadocArtifact.class, component, artifactResolver);
-            } else if (artifactType == JvmLibrarySourcesArtifact.class) {
-                addJvmLibraryArtifacts(sources, JvmLibrarySourcesArtifact.class, DefaultJvmLibrarySourcesArtifact.class, component, artifactResolver);
-            } else {
-                throw new IllegalArgumentException(String.format("Cannot resolve artifacts with unsupported type %s.", artifactType.getName()));
-            }
+    private ResolvedComponentArtifactsResult buildComponentResult(ModuleComponentIdentifier moduleComponentId, RepositoryChain repositoryChain, ArtifactResolver artifactResolver) {
+        BuildableComponentResolveResult moduleResolveResult = new DefaultBuildableComponentResolveResult();
+        repositoryChain.getDependencyResolver().resolve(new DefaultDependencyMetaData(moduleComponentId, true), moduleResolveResult);
+        ComponentMetaData component = moduleResolveResult.getMetaData();
+        DefaultResolvedComponentArtifactsResult componentResult = new DefaultResolvedComponentArtifactsResult(component.getComponentId());
+        for (Class<? extends Artifact> artifactType : artifactTypes) {
+            addArtifacts(componentResult, artifactType, component, artifactResolver);
         }
-        return new DefaultJvmLibrary(component.getComponentId(), sources, javadocs);
+        return componentResult;
     }
 
-    private <T extends JvmLibraryArtifact> void addJvmLibraryArtifacts(Set<T> artifacts, Class<T> type, Class<? extends T> implType, ComponentMetaData component, ArtifactResolver artifactResolver) {
-        ArtifactResolveContext context = new ArtifactTypeResolveContext(type);
+    private <T extends Artifact> void addArtifacts(DefaultResolvedComponentArtifactsResult artifacts, Class<T> type, ComponentMetaData component, ArtifactResolver artifactResolver) {
         BuildableArtifactSetResolveResult artifactSetResolveResult = new DefaultBuildableArtifactSetResolveResult();
-        artifactResolver.resolveModuleArtifacts(component, context, artifactSetResolveResult);
+        artifactResolver.resolveModuleArtifacts(component, new DefaultArtifactType(type), artifactSetResolveResult);
 
-        Instantiator instantiator = new DirectInstantiator();
         for (ComponentArtifactMetaData artifactMetaData : artifactSetResolveResult.getArtifacts()) {
             BuildableArtifactResolveResult resolveResult = new DefaultBuildableArtifactResolveResult();
             artifactResolver.resolveArtifact(artifactMetaData, component.getSource(), resolveResult);
             if (resolveResult.getFailure() != null) {
-                artifacts.add(instantiator.newInstance(implType, resolveResult.getFailure()));
+                artifacts.addArtifact(new DefaultUnresolvedArtifactResult(type, resolveResult.getFailure()));
             } else {
-                artifacts.add(instantiator.newInstance(implType, resolveResult.getFile()));
+                artifacts.addArtifact(new DefaultResolvedArtifactResult(type, resolveResult.getFile()));
             }
         }
     }
-
-    private ModuleRevisionId toModuleRevisionId(ModuleComponentIdentifier componentId) {
-        return ModuleRevisionId.newInstance(componentId.getGroup(), componentId.getModule(), componentId.getVersion());
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQueryFactory.java
similarity index 94%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryFactory.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQueryFactory.java
index ec9844a2c488..23f4702c88a0 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryFactory.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/query/DefaultArtifactResolutionQueryFactory.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.resolution;
+package org.gradle.api.internal.artifacts.query;
 
 import org.gradle.api.artifacts.dsl.RepositoryHandler;
-import org.gradle.api.artifacts.resolution.ArtifactResolutionQuery;
+import org.gradle.api.artifacts.dsl.ArtifactResolutionQuery;
 import org.gradle.api.internal.artifacts.ModuleMetadataProcessor;
 import org.gradle.api.internal.artifacts.configurations.ConfigurationContainerInternal;
 import org.gradle.api.internal.artifacts.dsl.dependencies.ArtifactResolutionQueryFactory;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java
index c2a0e75f91e3..9477d525d7ae 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactory.java
@@ -28,8 +28,9 @@
 import org.gradle.api.internal.artifacts.repositories.legacy.FixedResolverArtifactRepository;
 import org.gradle.api.internal.artifacts.repositories.legacy.LegacyDependencyResolverRepositoryFactory;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.internal.resource.local.FileStore;
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.util.ConfigureUtil;
 
@@ -44,6 +45,7 @@ public class DefaultBaseRepositoryFactory implements BaseRepositoryFactory {
     private final LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder;
     private final LegacyDependencyResolverRepositoryFactory legacyDependencyResolverRepositoryFactory;
     private final ResolverStrategy resolverStrategy;
+    private final FileStore<ModuleVersionArtifactMetaData> artifactFileStore;
 
     public DefaultBaseRepositoryFactory(LocalMavenRepositoryLocator localMavenRepositoryLocator,
                                         FileResolver fileResolver,
@@ -51,7 +53,8 @@ public DefaultBaseRepositoryFactory(LocalMavenRepositoryLocator localMavenReposi
                                         RepositoryTransportFactory transportFactory,
                                         LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
                                         LegacyDependencyResolverRepositoryFactory legacyDependencyResolverRepositoryFactory,
-                                        ResolverStrategy resolverStrategy) {
+                                        ResolverStrategy resolverStrategy,
+                                        FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
         this.localMavenRepositoryLocator = localMavenRepositoryLocator;
         this.fileResolver = fileResolver;
         this.instantiator = instantiator;
@@ -59,6 +62,7 @@ public DefaultBaseRepositoryFactory(LocalMavenRepositoryLocator localMavenReposi
         this.locallyAvailableResourceFinder = locallyAvailableResourceFinder;
         this.legacyDependencyResolverRepositoryFactory = legacyDependencyResolverRepositoryFactory;
         this.resolverStrategy = resolverStrategy;
+        this.artifactFileStore = artifactFileStore;
     }
 
     public ArtifactRepository createRepository(Object userDescription) {
@@ -85,12 +89,12 @@ public ArtifactRepository createRepository(Object userDescription) {
 
     public FlatDirectoryArtifactRepository createFlatDirRepository() {
         return instantiator.newInstance(DefaultFlatDirArtifactRepository.class, fileResolver, transportFactory,
-                locallyAvailableResourceFinder, resolverStrategy);
+                locallyAvailableResourceFinder, resolverStrategy, artifactFileStore);
     }
 
     public MavenArtifactRepository createMavenLocalRepository() {
         MavenArtifactRepository mavenRepository = instantiator.newInstance(DefaultMavenLocalArtifactRepository.class, fileResolver, createPasswordCredentials(), transportFactory,
-                locallyAvailableResourceFinder, resolverStrategy);
+                locallyAvailableResourceFinder, resolverStrategy, artifactFileStore);
         final File localMavenRepository = localMavenRepositoryLocator.getLocalMavenRepository();
         mavenRepository.setUrl(localMavenRepository);
         return mavenRepository;
@@ -98,8 +102,7 @@ public MavenArtifactRepository createMavenLocalRepository() {
 
     public MavenArtifactRepository createJCenterRepository() {
         MavenArtifactRepository mavenRepository = createMavenRepository();
-        String url = System.getProperty(JCENTER_REPO_OVERRIDE_URL_PROPERTY, DefaultRepositoryHandler.BINTRAY_JCENTER_URL);
-        mavenRepository.setUrl(url);
+        mavenRepository.setUrl(DefaultRepositoryHandler.BINTRAY_JCENTER_URL);
         return mavenRepository;
     }
 
@@ -111,12 +114,12 @@ public MavenArtifactRepository createMavenCentralRepository() {
 
     public IvyArtifactRepository createIvyRepository() {
         return instantiator.newInstance(DefaultIvyArtifactRepository.class, fileResolver, createPasswordCredentials(), transportFactory,
-                locallyAvailableResourceFinder, instantiator, resolverStrategy);
+                locallyAvailableResourceFinder, instantiator, resolverStrategy, artifactFileStore);
     }
 
     public MavenArtifactRepository createMavenRepository() {
         return instantiator.newInstance(DefaultMavenArtifactRepository.class, fileResolver, createPasswordCredentials(), transportFactory,
-                locallyAvailableResourceFinder, resolverStrategy
+                locallyAvailableResourceFinder, resolverStrategy, artifactFileStore
         );
     }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepository.java
index 34e413898572..4ad761e53aa6 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepository.java
@@ -20,13 +20,14 @@
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.artifacts.repositories.FlatDirectoryArtifactRepository;
 import org.gradle.api.internal.artifacts.ModuleVersionPublisher;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
 import org.gradle.api.internal.artifacts.repositories.resolver.IvyResolver;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.internal.resource.local.FileStore;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -40,15 +41,18 @@ public class DefaultFlatDirArtifactRepository extends AbstractArtifactRepository
     private final RepositoryTransportFactory transportFactory;
     private final LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder;
     private final ResolverStrategy resolverStrategy;
+    private final FileStore<ModuleVersionArtifactMetaData> artifactFileStore;
 
     public DefaultFlatDirArtifactRepository(FileResolver fileResolver,
                                             RepositoryTransportFactory transportFactory,
                                             LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
-                                            ResolverStrategy resolverStrategy) {
+                                            ResolverStrategy resolverStrategy,
+                                            FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
         this.fileResolver = fileResolver;
         this.transportFactory = transportFactory;
         this.locallyAvailableResourceFinder = locallyAvailableResourceFinder;
         this.resolverStrategy = resolverStrategy;
+        this.artifactFileStore = artifactFileStore;
     }
 
     public Set<File> getDirs() {
@@ -71,7 +75,7 @@ public ModuleVersionPublisher createPublisher() {
         return createRealResolver();
     }
 
-    public ConfiguredModuleVersionRepository createResolver() {
+    public ConfiguredModuleComponentRepository createResolver() {
         return createRealResolver();
     }
 
@@ -86,11 +90,10 @@ private IvyResolver createRealResolver() {
             throw new InvalidUserDataException("You must specify at least one directory for a flat directory repository.");
         }
 
-        IvyResolver resolver = new IvyResolver(getName(), transportFactory.createFileTransport(getName()),
-                locallyAvailableResourceFinder, false, resolverStrategy);
+        IvyResolver resolver = new IvyResolver(getName(), transportFactory.createTransport("file", getName(), null), locallyAvailableResourceFinder, false, resolverStrategy, artifactFileStore);
         for (File root : dirs) {
-            resolver.addArtifactPattern(root.getAbsolutePath() + "/[artifact]-[revision](-[classifier]).[ext]");
-            resolver.addArtifactPattern(root.getAbsolutePath() + "/[artifact](-[classifier]).[ext]");
+            resolver.addArtifactLocation(root.toURI(), "/[artifact]-[revision](-[classifier]).[ext]");
+            resolver.addArtifactLocation(root.toURI(), "/[artifact](-[classifier]).[ext]");
         }
         return resolver;
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepository.java
index 7e928ead7888..bafcd52d1686 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepository.java
@@ -22,7 +22,7 @@
 import org.gradle.api.artifacts.repositories.IvyArtifactRepositoryMetaDataProvider;
 import org.gradle.api.artifacts.repositories.PasswordCredentials;
 import org.gradle.api.internal.artifacts.ModuleVersionPublisher;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
 import org.gradle.api.internal.artifacts.repositories.layout.*;
@@ -30,11 +30,11 @@
 import org.gradle.api.internal.artifacts.repositories.resolver.PatternBasedResolver;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.internal.resource.local.FileStore;
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.util.ConfigureUtil;
-import org.gradle.util.WrapUtil;
 
 import java.net.URI;
 import java.util.LinkedHashSet;
@@ -50,15 +50,17 @@ public class DefaultIvyArtifactRepository extends AbstractAuthenticationSupporte
     private final MetaDataProvider metaDataProvider;
     private final Instantiator instantiator;
     private final ResolverStrategy resolverStrategy;
+    private final FileStore<ModuleVersionArtifactMetaData> artifactFileStore;
 
     public DefaultIvyArtifactRepository(FileResolver fileResolver, PasswordCredentials credentials, RepositoryTransportFactory transportFactory,
                                         LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder, Instantiator instantiator,
-                                        ResolverStrategy resolverStrategy) {
+                                        ResolverStrategy resolverStrategy, FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
         super(credentials);
         this.fileResolver = fileResolver;
         this.transportFactory = transportFactory;
         this.locallyAvailableResourceFinder = locallyAvailableResourceFinder;
         this.resolverStrategy = resolverStrategy;
+        this.artifactFileStore = artifactFileStore;
         this.additionalPatternsLayout = new AdditionalPatternsRepositoryLayout(fileResolver);
         this.layout = new GradleRepositoryLayout();
         this.metaDataProvider = new MetaDataProvider();
@@ -74,7 +76,7 @@ public ModuleVersionPublisher createPublisher() {
         return createRealResolver();
     }
 
-    public ConfiguredModuleVersionRepository createResolver() {
+    public ConfiguredModuleComponentRepository createResolver() {
         return createRealResolver();
     }
 
@@ -97,23 +99,14 @@ private IvyResolver createResolver(Set<String> schemes) {
         if (schemes.isEmpty()) {
             throw new InvalidUserDataException("You must specify a base url or at least one artifact pattern for an Ivy repository.");
         }
-        if (!WrapUtil.toSet("http", "https", "file").containsAll(schemes)) {
-            throw new InvalidUserDataException("You may only specify 'file', 'http' and 'https' urls for an Ivy repository.");
-        }
-        if (WrapUtil.toSet("http", "https").containsAll(schemes)) {
-            return createResolver(transportFactory.createHttpTransport(getName(), getCredentials()));
-        }
-        if (WrapUtil.toSet("file").containsAll(schemes)) {
-            return createResolver(transportFactory.createFileTransport(getName()));
-        }
-        throw new InvalidUserDataException("You cannot mix file and http(s) urls for a single Ivy repository. Please declare 2 separate repositories.");
+        return createResolver(transportFactory.createTransport(schemes, getName(), getCredentials()));
     }
 
-    private IvyResolver createResolver(RepositoryTransport httpTransport) {
+    private IvyResolver createResolver(RepositoryTransport transport) {
         return new IvyResolver(
-                getName(), httpTransport,
+                getName(), transport,
                 locallyAvailableResourceFinder,
-                metaDataProvider.dynamicResolve, resolverStrategy);
+                metaDataProvider.dynamicResolve, resolverStrategy, artifactFileStore);
     }
 
     public URI getUrl() {
@@ -133,7 +126,9 @@ public void ivyPattern(String pattern) {
     }
 
     public void layout(String layoutName) {
-        if ("maven".equals(layoutName)) {
+        if ("ivy".equals(layoutName)) {
+            layout = instantiator.newInstance(IvyRepositoryLayout.class);
+        } else if ("maven".equals(layoutName)) {
             layout = instantiator.newInstance(MavenRepositoryLayout.class);
         } else if ("pattern".equals(layoutName)) {
             layout = instantiator.newInstance(PatternRepositoryLayout.class);
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepository.java
index 44e930fc25fa..7340db2833e2 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepository.java
@@ -21,14 +21,15 @@
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 import org.gradle.api.artifacts.repositories.PasswordCredentials;
 import org.gradle.api.internal.artifacts.ModuleVersionPublisher;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
 import org.gradle.api.internal.artifacts.repositories.resolver.MavenResolver;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.internal.resource.local.FileStore;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -43,15 +44,17 @@ public class DefaultMavenArtifactRepository extends AbstractAuthenticationSuppor
     private List<Object> additionalUrls = new ArrayList<Object>();
     private final LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder;
     private final ResolverStrategy resolverStrategy;
+    private final FileStore<ModuleVersionArtifactMetaData> artifactFileStore;
 
     public DefaultMavenArtifactRepository(FileResolver fileResolver, PasswordCredentials credentials, RepositoryTransportFactory transportFactory,
                                           LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
-                                          ResolverStrategy resolverStrategy) {
+                                          ResolverStrategy resolverStrategy, FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
         super(credentials);
         this.fileResolver = fileResolver;
         this.transportFactory = transportFactory;
         this.locallyAvailableResourceFinder = locallyAvailableResourceFinder;
         this.resolverStrategy = resolverStrategy;
+        this.artifactFileStore = artifactFileStore;
     }
 
     public URI getUrl() {
@@ -87,7 +90,7 @@ public DependencyResolver createLegacyDslObject() {
         return new LegacyMavenResolver(resolver);
     }
 
-    public ConfiguredModuleVersionRepository createResolver() {
+    public ConfiguredModuleComponentRepository createResolver() {
         return createRealResolver();
     }
 
@@ -97,20 +100,25 @@ protected MavenResolver createRealResolver() {
             throw new InvalidUserDataException("You must specify a URL for a Maven repository.");
         }
 
-        MavenResolver resolver = new MavenResolver(getName(), rootUri, getTransport(rootUri.getScheme()),
-                locallyAvailableResourceFinder, resolverStrategy);
+        MavenResolver resolver = createResolver(rootUri);
+
         for (URI repoUrl : getArtifactUrls()) {
-            resolver.addArtifactLocation(repoUrl, null);
+            resolver.addArtifactLocation(repoUrl);
         }
         return resolver;
     }
 
+    private MavenResolver createResolver(URI rootUri) {
+        RepositoryTransport transport = getTransport(rootUri.getScheme());
+        return new MavenResolver(getName(), rootUri, transport, locallyAvailableResourceFinder, resolverStrategy, artifactFileStore);
+    }
+
+    protected FileStore<ModuleVersionArtifactMetaData> getArtifactFileStore() {
+        return artifactFileStore;
+    }
+
     protected RepositoryTransport getTransport(String scheme) {
-        if (scheme.equalsIgnoreCase("file")) {
-            return transportFactory.createFileTransport(getName());
-        } else {
-            return transportFactory.createHttpTransport(getName(), getCredentials());
-        }
+        return transportFactory.createTransport(scheme, getName(), getCredentials());
     }
 
     protected LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> getLocallyAvailableResourceFinder() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalArtifactRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalArtifactRepository.java
index bfcd2544d557..dc24d77e98d3 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalArtifactRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalArtifactRepository.java
@@ -23,16 +23,17 @@
 import org.gradle.api.internal.artifacts.repositories.resolver.MavenLocalResolver;
 import org.gradle.api.internal.artifacts.repositories.resolver.MavenResolver;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.internal.resource.local.FileStore;
 
 import java.net.URI;
 
 public class DefaultMavenLocalArtifactRepository extends DefaultMavenArtifactRepository implements MavenArtifactRepository {
     public DefaultMavenLocalArtifactRepository(FileResolver fileResolver, PasswordCredentials credentials, RepositoryTransportFactory transportFactory,
                                         LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
-                                        ResolverStrategy resolverStrategy) {
-        super(fileResolver, credentials, transportFactory, locallyAvailableResourceFinder, resolverStrategy);
+                                        ResolverStrategy resolverStrategy, FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
+        super(fileResolver, credentials, transportFactory, locallyAvailableResourceFinder, resolverStrategy, artifactFileStore);
     }
 
     protected MavenResolver createRealResolver() {
@@ -41,9 +42,9 @@ protected MavenResolver createRealResolver() {
             throw new InvalidUserDataException("You must specify a URL for a Maven repository.");
         }
 
-        MavenResolver resolver = new MavenLocalResolver(getName(), rootUri, getTransport(rootUri.getScheme()), getLocallyAvailableResourceFinder(), getResolverStrategy());
+        MavenResolver resolver = new MavenLocalResolver(getName(), rootUri, getTransport(rootUri.getScheme()), getLocallyAvailableResourceFinder(), getResolverStrategy(), getArtifactFileStore());
         for (URI repoUrl : getArtifactUrls()) {
-            resolver.addArtifactLocation(repoUrl, null);
+            resolver.addArtifactLocation(repoUrl);
         }
         return resolver;
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyDependencyResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyDependencyResolver.java
index 3bfa9a004f8c..5d1eee032762 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyDependencyResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyDependencyResolver.java
@@ -35,14 +35,13 @@
 import org.apache.ivy.plugins.resolver.DependencyResolver;
 import org.apache.ivy.plugins.resolver.ResolverSettings;
 import org.apache.ivy.plugins.resolver.util.ResolvedResource;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.repositories.resolver.ExternalResourceResolver;
 
 import java.io.File;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -69,7 +68,7 @@ public String toString() {
         return resolver.toString();
     }
 
-    public ConfiguredModuleVersionRepository createResolver() {
+    public ConfiguredModuleComponentRepository createResolver() {
         return resolver;
     }
 
@@ -171,35 +170,11 @@ public void publish(Artifact artifact, File src, boolean overwrite) throws IOExc
         throw new UnsupportedOperationException();
     }
 
-    public void addIvyPattern(String pattern) {
-        resolver.addIvyPattern(pattern);
-    }
-
-    public void addArtifactPattern(String pattern) {
-        resolver.addArtifactPattern(pattern);
-    }
-
-    public List<String> getIvyPatterns() {
-        return resolver.getIvyPatterns();
-    }
-
-    public List<String> getArtifactPatterns() {
-        return resolver.getArtifactPatterns();
-    }
-
     public void dumpSettings() {
         // this is not used
         throw new UnsupportedOperationException();
     }
 
-    public boolean isM2compatible() {
-        return resolver.isM2compatible();
-    }
-
-    public void setM2compatible(boolean compatible) {
-        resolver.setM2compatible(compatible);
-    }
-
     public boolean isCheckconsistency() {
         return resolver.isCheckconsistency();
     }
@@ -243,14 +218,6 @@ public void setDescriptor(String descriptorRule) {
         }
     }
 
-    public String[] getChecksumAlgorithms() {
-        return resolver.getChecksumAlgorithms();
-    }
-
-    public void setChecksums(String checksums) {
-        resolver.setChecksums(checksums);
-    }
-
     public LatestStrategy getLatestStrategy() {
         throw new UnsupportedOperationException("getLatestStrategy");
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyMavenResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyMavenResolver.java
index 0810786071c2..30dd7cab0f9a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyMavenResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/LegacyMavenResolver.java
@@ -42,20 +42,4 @@ public boolean isUseMavenMetadata() {
     public void setUseMavenMetadata(boolean useMavenMetadata) {
         resolver.setUseMavenMetadata(useMavenMetadata);
     }
-
-    public String getPattern() {
-        return resolver.getPattern();
-    }
-
-    public void setPattern(String pattern) {
-        resolver.setPattern(pattern);
-    }
-
-    public String getRoot() {
-        return resolver.getRoot();
-    }
-
-    public void setRoot(String root) {
-        resolver.setRoot(root);
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/ResolutionAwareRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/ResolutionAwareRepository.java
index f901ab828557..60076a2d3f40 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/ResolutionAwareRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/ResolutionAwareRepository.java
@@ -16,11 +16,11 @@
 
 package org.gradle.api.internal.artifacts.repositories;
 
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 
 public interface ResolutionAwareRepository {
     /**
-     * Creates a resolver for this repository. Result may also implement {@link org.gradle.api.internal.artifacts.ivyservice.ivyresolve.IvyAwareModuleVersionRepository}.
+     * Creates a resolver for this repository. Result may also implement {@link org.gradle.api.internal.artifacts.ivyservice.ivyresolve.IvyAwareModuleComponentRepository}.
      */
-    ConfiguredModuleVersionRepository createResolver();
+    ConfiguredModuleComponentRepository createResolver();
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryArtifactCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryArtifactCache.java
deleted file mode 100644
index bc8d22f04720..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/DownloadingRepositoryArtifactCache.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.repositories.cachemanager;
-
-import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.cached.CachedExternalResourceIndex;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-import org.gradle.api.internal.file.TemporaryFileProvider;
-import org.gradle.internal.Factory;
-import org.gradle.internal.filestore.FileStore;
-import org.gradle.internal.resource.local.LocallyAvailableResource;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * A cache manager for remote repositories, that downloads files and stores them in the FileStore provided.
- */
-public class DownloadingRepositoryArtifactCache implements RepositoryArtifactCache {
-
-    private final FileStore<ModuleVersionArtifactMetaData> fileStore;
-    private final CachedExternalResourceIndex<String> artifactUrlCachedResolutionIndex;
-    private final TemporaryFileProvider temporaryFileProvider;
-    private final CacheLockingManager cacheLockingManager;
-
-    public DownloadingRepositoryArtifactCache(FileStore<ModuleVersionArtifactMetaData> fileStore, CachedExternalResourceIndex<String> artifactUrlCachedResolutionIndex,
-                                              TemporaryFileProvider temporaryFileProvider, CacheLockingManager cacheLockingManager) {
-        this.fileStore = fileStore;
-        this.artifactUrlCachedResolutionIndex = artifactUrlCachedResolutionIndex;
-        this.temporaryFileProvider = temporaryFileProvider;
-        this.cacheLockingManager = cacheLockingManager;
-    }
-
-    public boolean isLocal() {
-        return false;
-    }
-
-    public LocallyAvailableExternalResource downloadAndCacheArtifactFile(final ModuleVersionArtifactMetaData artifact, ExternalResourceDownloader resourceDownloader, final ExternalResource resource) throws IOException {
-        final File tmpFile = temporaryFileProvider.createTemporaryFile("gradle_download", "bin");
-        try {
-            resourceDownloader.download(resource, tmpFile);
-            return cacheLockingManager.useCache(String.format("Store %s", artifact), new Factory<LocallyAvailableExternalResource>() {
-                public LocallyAvailableExternalResource create() {
-                    LocallyAvailableResource cachedResource = fileStore.move(artifact, tmpFile);
-                    File fileInFileStore = cachedResource.getFile();
-                    ExternalResourceMetaData metaData = resource.getMetaData();
-                    artifactUrlCachedResolutionIndex.store(metaData.getLocation(), fileInFileStore, metaData);
-                    return new DefaultLocallyAvailableExternalResource(resource.getName(), cachedResource, metaData);
-                }
-            });
-        } finally {
-            tmpFile.delete();
-        }
-    }
-
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryArtifactCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryArtifactCache.java
deleted file mode 100644
index 07d923d81c67..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/LocalFileRepositoryArtifactCache.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.repositories.cachemanager;
-
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
-import org.gradle.internal.resource.local.DefaultLocallyAvailableResource;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * A cache manager for local repositories. Doesn't cache anything, and uses artifacts from their origin.
- */
-public class LocalFileRepositoryArtifactCache implements RepositoryArtifactCache {
-
-    public boolean isLocal() {
-        return true;
-    }
-
-    public LocallyAvailableExternalResource downloadAndCacheArtifactFile(ModuleVersionArtifactMetaData artifactId, ExternalResourceDownloader resourceDownloader, ExternalResource resource) throws IOException {
-        // Does not download, copy or cache local files.
-        assert resource.isLocal();
-        File file = new File(resource.getName());
-        assert file.isFile();
-        return new DefaultLocallyAvailableExternalResource(resource.getName(), new DefaultLocallyAvailableResource(file));
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/RepositoryArtifactCache.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/RepositoryArtifactCache.java
deleted file mode 100644
index 0a2357999112..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/cachemanager/RepositoryArtifactCache.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.repositories.cachemanager;
-
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * This is a transitional interface for moving away from the Ivy RepositoryCacheManager.
- */
-public interface RepositoryArtifactCache {
-    boolean isLocal();
-
-    /**
-     * Downloads the artifact file, moving it into the correct location in the cache.
-     *
-     * @param artifact The id of the artifact this resource represents
-     * @param resourceDownloader An action to use for downloading the resource
-     * @param resource The artifact resource
-     * @return The cached resource
-     */
-    LocallyAvailableExternalResource downloadAndCacheArtifactFile(ModuleVersionArtifactMetaData artifact, ExternalResourceDownloader resourceDownloader, ExternalResource resource) throws IOException;
-
-    interface ExternalResourceDownloader {
-        public void download(ExternalResource resource, File dest) throws IOException;
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/IvyRepositoryLayout.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/IvyRepositoryLayout.java
new file mode 100644
index 000000000000..fb35f6088092
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/IvyRepositoryLayout.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.repositories.layout;
+
+import org.gradle.api.artifacts.repositories.IvyArtifactRepository;
+import org.gradle.api.internal.artifacts.repositories.resolver.PatternBasedResolver;
+
+import java.net.URI;
+
+/**
+ * A Repository Layout that applies the following patterns:
+ * <ul>
+ *     <li>Artifacts: $baseUri/{@value IvyArtifactRepository#IVY_ARTIFACT_PATTERN}</li>
+ *     <li>Ivy: $baseUri/{@value IvyArtifactRepository#IVY_ARTIFACT_PATTERN}</li>
+ * </ul>
+ */
+public class IvyRepositoryLayout extends RepositoryLayout {
+
+    public void apply(URI baseUri, PatternBasedResolver resolver) {
+        if (baseUri == null) {
+            return;
+        }
+
+        resolver.addArtifactLocation(baseUri, IvyArtifactRepository.IVY_ARTIFACT_PATTERN);
+        resolver.addDescriptorLocation(baseUri, IvyArtifactRepository.IVY_ARTIFACT_PATTERN);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/PatternRepositoryLayout.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/PatternRepositoryLayout.java
index 52cc63ae8a46..d8324111c65b 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/PatternRepositoryLayout.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/layout/PatternRepositoryLayout.java
@@ -71,6 +71,8 @@ public void apply(URI baseUri, PatternBasedResolver resolver) {
             return;
         }
 
+        resolver.setM2compatible(m2compatible);
+
         for (String artifactPattern : artifactPatterns) {
             resolver.addArtifactLocation(baseUri, artifactPattern);
         }
@@ -79,7 +81,5 @@ public void apply(URI baseUri, PatternBasedResolver resolver) {
         for (String ivyPattern : usedIvyPatterns) {
             resolver.addDescriptorLocation(baseUri, ivyPattern);
         }
-
-        resolver.setM2compatible(m2compatible);
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java
index 9d880926e2e2..7d5290b687b4 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManager.java
@@ -39,7 +39,7 @@
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
 import org.gradle.api.internal.file.TemporaryFileProvider;
 import org.gradle.internal.Factory;
-import org.gradle.internal.filestore.FileStore;
+import org.gradle.internal.resource.local.FileStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/FixedResolverArtifactRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/FixedResolverArtifactRepository.java
index e714d32e3794..2368b10861c9 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/FixedResolverArtifactRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/FixedResolverArtifactRepository.java
@@ -18,7 +18,7 @@
 import org.apache.ivy.plugins.resolver.DependencyResolver;
 import org.gradle.api.internal.artifacts.ModuleVersionPublisher;
 import org.gradle.api.internal.artifacts.ivyservice.IvyResolverBackedModuleVersionPublisher;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.repositories.AbstractArtifactRepository;
 import org.gradle.api.internal.artifacts.repositories.ResolutionAwareRepository;
 
@@ -45,7 +45,7 @@ public ModuleVersionPublisher createPublisher() {
         return new IvyResolverBackedModuleVersionPublisher(resolver);
     }
 
-    public ConfiguredModuleVersionRepository createResolver() {
+    public ConfiguredModuleComponentRepository createResolver() {
         // Handle a repository wrapped in a resolver for backwards compatibility
         if (resolver instanceof ResolutionAwareRepository) {
             ResolutionAwareRepository resolutionAwareRepository = (ResolutionAwareRepository) resolver;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/IvyDependencyResolverAdapter.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/IvyDependencyResolverAdapter.java
index 968db049e58c..c6e0cd753689 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/IvyDependencyResolverAdapter.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/legacy/IvyDependencyResolverAdapter.java
@@ -17,7 +17,6 @@
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.ivy.core.IvyContext;
-import org.apache.ivy.core.module.descriptor.Artifact;
 import org.apache.ivy.core.report.ArtifactDownloadReport;
 import org.apache.ivy.core.report.DownloadStatus;
 import org.apache.ivy.core.resolve.DownloadOptions;
@@ -25,13 +24,14 @@
 import org.apache.ivy.core.resolve.ResolvedModuleRevision;
 import org.apache.ivy.core.settings.IvySettings;
 import org.apache.ivy.plugins.resolver.DependencyResolver;
-import org.gradle.api.artifacts.resolution.JvmLibraryJavadocArtifact;
-import org.gradle.api.artifacts.resolution.JvmLibrarySourcesArtifact;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact;
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact;
+import org.gradle.api.artifacts.result.Artifact;
 import org.gradle.api.internal.artifacts.ivyservice.*;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.*;
 import org.gradle.api.internal.artifacts.metadata.*;
-import org.gradle.api.internal.artifacts.resolution.IvyDescriptorArtifact;
+import org.gradle.api.internal.artifacts.result.metadata.IvyDescriptorArtifact;
 import org.gradle.internal.UncheckedException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,9 +42,9 @@
 import java.util.Set;
 
 /**
- * A {@link org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository} wrapper around an Ivy {@link DependencyResolver}.
+ * A {@link org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository} wrapper around an Ivy {@link DependencyResolver}.
  */
-public class IvyDependencyResolverAdapter implements ConfiguredModuleVersionRepository, IvyAwareModuleVersionRepository, LocalArtifactsModuleVersionRepository {
+public class IvyDependencyResolverAdapter implements ConfiguredModuleComponentRepository, IvyAwareModuleComponentRepository {
     private static final Logger LOGGER = LoggerFactory.getLogger(IvyDependencyResolverAdapter.class);
     private final DownloadOptions downloadOptions = new DownloadOptions();
     private final String identifier;
@@ -64,6 +64,10 @@ public String getName() {
         return resolver.getName();
     }
 
+    public boolean canListModuleVersions() {
+        return false;
+    }
+
     @Override
     public String toString() {
         return String.format("Repository '%s'", resolver.getName());
@@ -85,97 +89,110 @@ public boolean isDynamicResolveMode() {
         return false;
     }
 
-    public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
-        IvyContext.getContext().setResolveData(resolveData);
-        try {
-            ResolvedModuleRevision revision = resolver.getDependency(dependency.getDescriptor(), resolveData);
-            if (revision == null) {
-                result.listed(new DefaultModuleVersionListing());
-            } else {
-                result.listed(new DefaultModuleVersionListing(revision.getId().getRevision()));
+    public ModuleComponentRepositoryAccess getLocalAccess() {
+        return new ModuleComponentRepositoryAccess() {
+            public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
             }
-        } catch (ParseException e) {
-            throw UncheckedException.throwAsUncheckedException(e);
-        }
-    }
 
-    public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        IvyContext.getContext().setResolveData(resolveData);
-        try {
-            ResolvedModuleRevision revision = resolver.getDependency(dependency.getDescriptor(), resolveData);
-            if (revision == null) {
-                LOGGER.debug("Performed resolved of module '{}' in repository '{}': not found", dependency.getRequested(), getName());
-                result.missing();
-            } else {
-                LOGGER.debug("Performed resolved of module '{}' in repository '{}': found", dependency.getRequested(), getName());
-                ModuleDescriptorAdapter metaData = new ModuleDescriptorAdapter(revision.getDescriptor());
-                metaData.setChanging(isChanging(revision));
-                result.resolved(metaData, null);
+            public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
             }
-        } catch (ParseException e) {
-            throw UncheckedException.throwAsUncheckedException(e);
-        }
-    }
 
-    public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
-        Artifact ivyArtifact = ((ModuleVersionArtifactMetaData) artifact).toIvyArtifact();
-        ArtifactDownloadReport artifactDownloadReport = resolver.download(new Artifact[]{ivyArtifact}, downloadOptions).getArtifactReport(ivyArtifact);
-        if (downloadFailed(artifactDownloadReport)) {
-            if (artifactDownloadReport instanceof EnhancedArtifactDownloadReport) {
-                EnhancedArtifactDownloadReport enhancedReport = (EnhancedArtifactDownloadReport) artifactDownloadReport;
-                result.failed(new ArtifactResolveException(artifact.getId(), enhancedReport.getFailure()));
-            } else {
-                result.failed(new ArtifactResolveException(artifact.getId(), artifactDownloadReport.getDownloadDetails()));
+            public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
             }
-            return;
-        }
 
-        File localFile = artifactDownloadReport.getLocalFile();
-        if (localFile != null) {
-            result.resolved(localFile);
-        } else {
-            result.notFound(artifact.getId());
-        }
-    }
+            public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+                String configurationName = componentUsage.getConfigurationName();
+                result.resolved(component.getConfiguration(configurationName).getArtifacts());
+            }
 
-    public void localResolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        doResolveModuleArtifacts(component, context, result, true);
-    }
+            public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+            }
+        };
+    }
+
+    public ModuleComponentRepositoryAccess getRemoteAccess() {
+        return new ModuleComponentRepositoryAccess() {
+            public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+                IvyContext.getContext().setResolveData(resolveData);
+                try {
+                    ResolvedModuleRevision revision = resolver.getDependency(dependency.getDescriptor(), resolveData);
+                    if (revision == null) {
+                        result.listed(new DefaultModuleVersionListing());
+                    } else {
+                        result.listed(new DefaultModuleVersionListing(revision.getId().getRevision()));
+                    }
+                } catch (ParseException e) {
+                    throw UncheckedException.throwAsUncheckedException(e);
+                }
+            }
 
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        doResolveModuleArtifacts(component, context, result, false);
-    }
+            public void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponent, BuildableModuleVersionMetaDataResolveResult result) {
+                IvyContext.getContext().setResolveData(resolveData);
+                try {
+                    ResolvedModuleRevision revision = resolver.getDependency(dependency.getDescriptor(), resolveData);
+                    if (revision == null) {
+                        LOGGER.debug("Performed resolved of module '{}' in repository '{}': not found", moduleComponent, getName());
+                        result.missing();
+                    } else {
+                        LOGGER.debug("Performed resolved of module '{}' in repository '{}': found", moduleComponent, getName());
+                        MutableModuleVersionMetaData metaData = new DefaultIvyModuleVersionMetaData(revision.getDescriptor());
+                        metaData.setChanging(isChanging(revision));
+                        result.resolved(metaData, null);
+                    }
+                } catch (ParseException e) {
+                    throw UncheckedException.throwAsUncheckedException(e);
+                }
+            }
 
-    // TODO:DAZ This "local-only" pattern is quite ugly: improve it.
-    private void doResolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result, boolean localOnly) {
-        ModuleVersionMetaData moduleVersion = (ModuleVersionMetaData) component;
-        if (context instanceof ConfigurationResolveContext) {
-            String configurationName = ((ConfigurationResolveContext) context).getConfigurationName();
-            result.resolved(component.getConfiguration(configurationName).getArtifacts());
-            return;
-        }
+            public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+                try {
+                    result.resolved(getCandidateArtifacts((ModuleVersionMetaData) component, artifactType.getType()));
+                } catch (Exception e) {
+                    result.failed(new ArtifactResolveException(component.getComponentId(), e));
+                }
+            }
 
-        if (!localOnly && context instanceof ArtifactTypeResolveContext) {
-            Class<? extends SoftwareArtifact> artifactType = ((ArtifactTypeResolveContext) context).getArtifactType();
-            try {
-                result.resolved(doGetCandidateArtifacts(moduleVersion, artifactType));
-            } catch (Exception e) {
-                result.failed(new ArtifactResolveException(component.getComponentId(), e));
+            public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+                String configurationName = componentUsage.getConfigurationName();
+                result.resolved(component.getConfiguration(configurationName).getArtifacts());
             }
-        }
+
+            public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+                org.apache.ivy.core.module.descriptor.Artifact ivyArtifact = ((ModuleVersionArtifactMetaData) artifact).toIvyArtifact();
+                ArtifactDownloadReport artifactDownloadReport = resolver.download(new org.apache.ivy.core.module.descriptor.Artifact[]{ivyArtifact}, downloadOptions).getArtifactReport(ivyArtifact);
+                if (downloadFailed(artifactDownloadReport)) {
+                    if (artifactDownloadReport instanceof EnhancedArtifactDownloadReport) {
+                        EnhancedArtifactDownloadReport enhancedReport = (EnhancedArtifactDownloadReport) artifactDownloadReport;
+                        result.failed(new ArtifactResolveException(artifact.getId(), enhancedReport.getFailure()));
+                    } else {
+                        result.failed(new ArtifactResolveException(artifact.getId(), artifactDownloadReport.getDownloadDetails()));
+                    }
+                    return;
+                }
+
+                File localFile = artifactDownloadReport.getLocalFile();
+                if (localFile != null) {
+                    result.resolved(localFile);
+                } else {
+                    result.notFound(artifact.getId());
+                }
+            }
+        };
     }
 
-    private Set<ModuleVersionArtifactMetaData> doGetCandidateArtifacts(ModuleVersionMetaData module, Class<? extends SoftwareArtifact> artifactType) {
+
+
+    private Set<ModuleVersionArtifactMetaData> getCandidateArtifacts(ModuleVersionMetaData module, Class<? extends Artifact> artifactType) {
         if (artifactType == IvyDescriptorArtifact.class) {
-            Artifact metadataArtifact = module.getDescriptor().getMetadataArtifact();
+            org.apache.ivy.core.module.descriptor.Artifact metadataArtifact = module.getDescriptor().getMetadataArtifact();
             return ImmutableSet.of(module.artifact(metadataArtifact));
         }
 
-        if (artifactType == JvmLibraryJavadocArtifact.class) {
+        if (artifactType == JavadocArtifact.class) {
             return createArtifactMetaData(module, "javadoc", "javadoc");
         }
 
-        if (artifactType == JvmLibrarySourcesArtifact.class) {
+        if (artifactType == SourcesArtifact.class) {
             return createArtifactMetaData(module, "source", "sources");
         }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/AbstractResourcePattern.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/AbstractResourcePattern.java
new file mode 100644
index 000000000000..69eb4dffc086
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/AbstractResourcePattern.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.repositories.resolver;
+
+import org.apache.ivy.core.IvyPatternHelper;
+import org.gradle.api.artifacts.ModuleIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
+import org.gradle.internal.resource.ExternalResourceName;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+abstract class AbstractResourcePattern implements ResourcePattern {
+    private final ExternalResourceName pattern;
+
+    public AbstractResourcePattern(String pattern) {
+        this.pattern = new ExternalResourceName(pattern);
+    }
+
+    public AbstractResourcePattern(URI baseUri, String pattern) {
+        this.pattern = new ExternalResourceName(baseUri, pattern);
+    }
+
+    public String getPattern() {
+        return pattern.getDecoded();
+    }
+
+    protected ExternalResourceName getBase() {
+        return pattern;
+    }
+
+    protected String substituteTokens(String pattern, Map<String, String> attributes) {
+        return IvyPatternHelper.substituteTokens(pattern, attributes);
+    }
+
+    protected Map<String, String> toAttributes(ModuleVersionArtifactMetaData artifact) {
+        Map<String, String> attributes = toAttributes(artifact.getId().getComponentIdentifier());
+        attributes.putAll(toAttributes(artifact.getName()));
+        return attributes;
+    }
+
+    protected Map<String, String> toAttributes(ModuleIdentifier module, IvyArtifactName ivyArtifactName) {
+        Map<String, String> attributes = toAttributes(module);
+        attributes.putAll(toAttributes(ivyArtifactName));
+        return attributes;
+    }
+
+    protected Map<String, String> toAttributes(IvyArtifactName ivyArtifact) {
+        HashMap<String, String> attributes = new HashMap<String, String>();
+        attributes.put(IvyPatternHelper.ARTIFACT_KEY, ivyArtifact.getName());
+        attributes.put(IvyPatternHelper.TYPE_KEY, ivyArtifact.getType());
+        attributes.put(IvyPatternHelper.EXT_KEY, ivyArtifact.getExtension());
+        attributes.put("classifier", ivyArtifact.getClassifier());
+        return attributes;
+    }
+
+    protected Map<String, String> toAttributes(ModuleIdentifier module) {
+        HashMap<String, String> attributes = new HashMap<String, String>();
+        attributes.put(IvyPatternHelper.ORGANISATION_KEY, module.getGroup());
+        attributes.put(IvyPatternHelper.MODULE_KEY, module.getName());
+        return attributes;
+    }
+
+    protected Map<String, String> toAttributes(ModuleComponentIdentifier componentIdentifier) {
+        HashMap<String, String> attributes = new HashMap<String, String>();
+        attributes.put(IvyPatternHelper.ORGANISATION_KEY, componentIdentifier.getGroup());
+        attributes.put(IvyPatternHelper.MODULE_KEY, componentIdentifier.getModule());
+        attributes.put(IvyPatternHelper.REVISION_KEY, componentIdentifier.getVersion());
+        return attributes;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionLister.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionLister.java
index 45f6af0cd243..fd4ef3541b7c 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionLister.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionLister.java
@@ -17,9 +17,9 @@
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
 import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.resource.ResourceException;
-import org.gradle.api.internal.resource.ResourceNotFoundException;
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
+import org.gradle.internal.resource.ResourceException;
+import org.gradle.internal.resource.ResourceNotFoundException;
 import org.gradle.util.DeprecationLogger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ public VersionList getVersionList(final ModuleIdentifier module)  {
             versionLists.add(lister.getVersionList(module));
         }
         return new AbstractVersionList() {
-            public void visit(ResourcePattern pattern, ModuleVersionArtifactMetaData artifact) throws ResourceException {
+            public void visit(ResourcePattern pattern, IvyArtifactName artifact) throws ResourceException {
                 final Iterator<VersionList> versionListIterator = versionLists.iterator();
                 while (versionListIterator.hasNext()) {
                     VersionList list = versionListIterator.next();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/DefaultExternalResourceArtifactResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/DefaultExternalResourceArtifactResolver.java
new file mode 100644
index 000000000000..7a068f8b614c
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/DefaultExternalResourceArtifactResolver.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.repositories.resolver;
+
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
+import org.gradle.internal.resource.ExternalResourceName;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.local.LocallyAvailableResourceCandidates;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.transfer.CacheAwareExternalResourceAccessor;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
+import org.gradle.internal.resource.ResourceException;
+import org.gradle.internal.resource.local.FileStore;
+import org.gradle.internal.resource.local.LocallyAvailableResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+
+class DefaultExternalResourceArtifactResolver implements ExternalResourceArtifactResolver {
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultExternalResourceArtifactResolver.class);
+
+    private final ExternalResourceRepository repository;
+    private final LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder;
+    private final List<ResourcePattern> ivyPatterns;
+    private final List<ResourcePattern> artifactPatterns;
+    private final FileStore<ModuleVersionArtifactMetaData> fileStore;
+    private final CacheAwareExternalResourceAccessor resourceAccessor;
+
+    public DefaultExternalResourceArtifactResolver(ExternalResourceRepository repository, LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
+                                                   List<ResourcePattern> ivyPatterns, List<ResourcePattern> artifactPatterns, FileStore<ModuleVersionArtifactMetaData> fileStore, CacheAwareExternalResourceAccessor resourceAccessor) {
+        this.repository = repository;
+        this.locallyAvailableResourceFinder = locallyAvailableResourceFinder;
+        this.ivyPatterns = ivyPatterns;
+        this.artifactPatterns = artifactPatterns;
+        this.fileStore = fileStore;
+        this.resourceAccessor = resourceAccessor;
+    }
+
+    public LocallyAvailableExternalResource resolveMetaDataArtifact(ModuleVersionArtifactMetaData artifact) {
+        return downloadStaticResource(ivyPatterns, artifact);
+    }
+
+    public LocallyAvailableExternalResource resolveArtifact(ModuleVersionArtifactMetaData artifact) {
+        return downloadStaticResource(artifactPatterns, artifact);
+    }
+
+    public boolean artifactExists(ModuleVersionArtifactMetaData artifact) {
+        return staticResourceExists(artifactPatterns, artifact);
+    }
+
+    private boolean staticResourceExists(List<ResourcePattern> patternList, ModuleVersionArtifactMetaData artifact) {
+        for (ResourcePattern resourcePattern : patternList) {
+            ExternalResourceName location = resourcePattern.getLocation(artifact);
+            LOGGER.debug("Loading {}", location);
+            try {
+                if (repository.getResourceMetaData(location.getUri()) != null) {
+                    return true;
+                }
+            } catch (IOException e) {
+                throw new ResourceException(String.format("Could not get resource '%s'.", location), e);
+            }
+        }
+        return false;
+    }
+
+    private LocallyAvailableExternalResource downloadStaticResource(List<ResourcePattern> patternList, final ModuleVersionArtifactMetaData artifact) {
+        for (ResourcePattern resourcePattern : patternList) {
+            ExternalResourceName location = resourcePattern.getLocation(artifact);
+            LOGGER.debug("Loading {}", location);
+            LocallyAvailableResourceCandidates localCandidates = locallyAvailableResourceFinder.findCandidates(artifact);
+            try {
+                LocallyAvailableExternalResource resource = resourceAccessor.getResource(location.getUri(), new CacheAwareExternalResourceAccessor.ResourceFileStore() {
+                    public LocallyAvailableResource moveIntoCache(File downloadedResource) {
+                        return fileStore.move(artifact, downloadedResource);
+                    }
+                }, localCandidates);
+                if (resource != null) {
+                    return resource;
+                }
+            } catch (IOException e) {
+                throw new ResourceException(String.format("Could not get resource '%s'.", location), e);
+            }
+        }
+        return null;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceArtifactResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceArtifactResolver.java
new file mode 100644
index 000000000000..969162f79d65
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceArtifactResolver.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.repositories.resolver;
+
+import org.gradle.api.Nullable;
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+
+public interface ExternalResourceArtifactResolver {
+    @Nullable
+    LocallyAvailableExternalResource resolveMetaDataArtifact(ModuleVersionArtifactMetaData artifact);
+
+    @Nullable
+    LocallyAvailableExternalResource resolveArtifact(ModuleVersionArtifactMetaData artifact);
+
+    boolean artifactExists(ModuleVersionArtifactMetaData artifact);
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolver.java
index fd094f903f05..19fc0b528b6c 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolver.java
@@ -18,84 +18,85 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
+import org.apache.ivy.core.module.descriptor.DependencyArtifactDescriptor;
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
 import org.apache.ivy.core.settings.IvySettings;
 import org.apache.ivy.plugins.matcher.PatternMatcher;
 import org.gradle.api.Nullable;
-import org.gradle.api.UncheckedIOException;
+import org.gradle.api.Transformer;
 import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.ModuleVersionSelector;
-import org.gradle.api.artifacts.resolution.JvmLibraryJavadocArtifact;
-import org.gradle.api.artifacts.resolution.JvmLibrarySourcesArtifact;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.artifacts.result.Artifact;
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact;
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact;
 import org.gradle.api.internal.artifacts.DefaultModuleIdentifier;
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
 import org.gradle.api.internal.artifacts.ModuleVersionPublisher;
-import org.gradle.api.internal.artifacts.ivyservice.*;
+import org.gradle.api.internal.artifacts.ivyservice.ArtifactType;
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ComponentUsage;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.*;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParseException;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
 import org.gradle.api.internal.artifacts.metadata.*;
-import org.gradle.api.internal.artifacts.repositories.cachemanager.RepositoryArtifactCache;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.MetaDataOnlyExternalResource;
-import org.gradle.api.internal.externalresource.MissingExternalResource;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceCandidates;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.transfer.CacheAwareExternalResourceAccessor;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
 import org.gradle.internal.SystemProperties;
+import org.gradle.internal.resource.local.FileStore;
+import org.gradle.util.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import static org.gradle.api.internal.artifacts.repositories.cachemanager.RepositoryArtifactCache.ExternalResourceDownloader;
-
-public abstract class ExternalResourceResolver implements ModuleVersionPublisher, ConfiguredModuleVersionRepository, LocalArtifactsModuleVersionRepository {
+public abstract class ExternalResourceResolver implements ModuleVersionPublisher, ConfiguredModuleComponentRepository {
     private static final Logger LOGGER = LoggerFactory.getLogger(ExternalResourceResolver.class);
 
-    private final MetaDataParser metaDataParser;
-
-    private List<String> ivyPatterns = new ArrayList<String>();
-    private List<String> artifactPatterns = new ArrayList<String>();
-    private boolean m2Compatible;
+    private List<ResourcePattern> ivyPatterns = new ArrayList<ResourcePattern>();
+    private List<ResourcePattern> artifactPatterns = new ArrayList<ResourcePattern>();
     private boolean checkConsistency = true;
     private boolean allowMissingDescriptor = true;
     private boolean force;
-    private String checksums;
     private String name;
-    private RepositoryArtifactCache repositoryCacheManager;
     private String changingMatcherName;
     private String changingPattern;
     private RepositoryChain repositoryChain;
 
     private final ExternalResourceRepository repository;
+    private final boolean local;
+    private final CacheAwareExternalResourceAccessor cachingResourceAccessor;
     private final LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder;
     private final ResolverStrategy resolverStrategy;
+    private final FileStore<ModuleVersionArtifactMetaData> artifactFileStore;
 
     protected VersionLister versionLister;
 
-
     public ExternalResourceResolver(String name,
+                                    boolean local,
                                     ExternalResourceRepository repository,
+                                    CacheAwareExternalResourceAccessor cachingResourceAccessor,
                                     VersionLister versionLister,
                                     LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
-                                    MetaDataParser metaDataParser,
-                                    ResolverStrategy resolverStrategy) {
+                                    ResolverStrategy resolverStrategy,
+                                    FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
         this.name = name;
+        this.local = local;
+        this.cachingResourceAccessor = cachingResourceAccessor;
         this.versionLister = versionLister;
         this.repository = repository;
         this.locallyAvailableResourceFinder = locallyAvailableResourceFinder;
-        this.metaDataParser = metaDataParser;
         this.resolverStrategy = resolverStrategy;
+        this.artifactFileStore = artifactFileStore;
     }
 
     public String getId() {
@@ -106,6 +107,10 @@ public String getName() {
         return name;
     }
 
+    public boolean canListModuleVersions() {
+        return true;
+    }
+
     public void setName(String name) {
         this.name = name;
     }
@@ -127,20 +132,23 @@ protected ExternalResourceRepository getRepository() {
     }
 
     public boolean isLocal() {
-        return repositoryCacheManager.isLocal();
+        return local;
     }
 
-    public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+    private void doListModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
         ModuleIdentifier module  = new DefaultModuleIdentifier(dependency.getRequested().getGroup(), dependency.getRequested().getName());
         VersionList versionList = versionLister.getVersionList(module);
-        // List modules based on metadata files
-        ModuleVersionArtifactMetaData metaDataArtifact = getMetaDataArtifactFor(dependency);
-        listVersionsForAllPatterns(getIvyPatterns(), metaDataArtifact, versionList);
+
+        // List modules based on metadata files (artifact version is not considered in listVersionsForAllPatterns())
+        IvyArtifactName metaDataArtifact = getMetaDataArtifactName(dependency.getRequested().getName());
+        if (metaDataArtifact != null) {
+            listVersionsForAllPatterns(ivyPatterns, metaDataArtifact, versionList);
+        }
 
         // List modules with missing metadata files
         if (isAllownomd()) {
-            for (ModuleVersionArtifactMetaData otherArtifact : getDefaultMetaData(dependency).getArtifacts()) {
-                listVersionsForAllPatterns(getArtifactPatterns(), otherArtifact, versionList);
+            for (IvyArtifactName otherArtifact : getDependencyArtifactNames(dependency)) {
+                listVersionsForAllPatterns(artifactPatterns, otherArtifact, versionList);
             }
         }
         DefaultModuleVersionListing moduleVersions = new DefaultModuleVersionListing();
@@ -150,85 +158,84 @@ public void listModuleVersions(DependencyMetaData dependency, BuildableModuleVer
         result.listed(moduleVersions);
     }
 
-    private void listVersionsForAllPatterns(List<String> patternList, ModuleVersionArtifactMetaData artifact, VersionList versionList) {
-        for (String pattern : patternList) {
-            ResourcePattern resourcePattern = toResourcePattern(pattern);
-            versionList.visit(resourcePattern, artifact);
+    private void listVersionsForAllPatterns(List<ResourcePattern> patternList, IvyArtifactName ivyArtifactName, VersionList versionList) {
+        for (ResourcePattern resourcePattern : patternList) {
+            versionList.visit(resourcePattern, ivyArtifactName);
         }
     }
 
-    public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        resolveStaticDependency(dependency, result, createArtifactResolver());
+    protected void doResolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+        resolveStaticDependency(dependency, moduleComponentIdentifier, result, createArtifactResolver());
     }
 
-    protected final void resolveStaticDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result, ArtifactResolver artifactResolver) {
-        MutableModuleVersionMetaData metaDataArtifactMetaData = findMetaDataArtifact(dependency, artifactResolver);
-
+    protected final void resolveStaticDependency(DependencyMetaData dependency, ModuleComponentIdentifier moduleVersionIdentifier, BuildableModuleVersionMetaDataResolveResult result, ExternalResourceArtifactResolver artifactResolver) {
+        MutableModuleVersionMetaData metaDataArtifactMetaData = parseMetaDataFromArtifact(moduleVersionIdentifier, artifactResolver);
         if (metaDataArtifactMetaData != null) {
-            LOGGER.debug("Metadata file found for module '{}' in repository '{}'.", dependency.getRequested(), getName());
+            LOGGER.debug("Metadata file found for module '{}' in repository '{}'.", moduleVersionIdentifier, getName());
             result.resolved(metaDataArtifactMetaData, null);
             return;
         }
 
         if (isAllownomd()) {
-            MutableModuleVersionMetaData defaultArtifactMetaData = findDefaultArtifact(dependency, artifactResolver);
-            if (defaultArtifactMetaData != null) {
-                LOGGER.debug("Artifact file found for module '{}' in repository '{}'.", dependency.getRequested(), getName());
-                result.resolved(defaultArtifactMetaData, null);
+            MutableModuleVersionMetaData metaDataFromDefaultArtifact = createMetaDataFromDefaultArtifact(moduleVersionIdentifier, dependency, artifactResolver);
+            if (metaDataFromDefaultArtifact != null) {
+                LOGGER.debug("Found artifact but no meta-data for module '{}' in repository '{}', using default meta-data.", moduleVersionIdentifier, getName());
+                result.resolved(metaDataFromDefaultArtifact, null);
                 return;
             }
         }
 
-        LOGGER.debug("No meta-data file or artifact found for module '{}' in repository '{}'.", dependency.getRequested(), getName());
+        LOGGER.debug("No meta-data file or artifact found for module '{}' in repository '{}'.", moduleVersionIdentifier, getName());
         result.missing();
     }
 
-    protected MutableModuleVersionMetaData findMetaDataArtifact(DependencyMetaData dependency, ArtifactResolver artifactResolver) {
-        ModuleVersionArtifactMetaData artifact = getMetaDataArtifactFor(dependency);
+    protected MutableModuleVersionMetaData parseMetaDataFromArtifact(ModuleComponentIdentifier moduleVersionIdentifier, ExternalResourceArtifactResolver artifactResolver) {
+        ModuleVersionArtifactMetaData artifact = getMetaDataArtifactFor(moduleVersionIdentifier);
         if (artifact == null) {
             return null;
         }
-        ExternalResource metaDataResource = artifactResolver.resolveMetaDataArtifact(artifact);
+        LocallyAvailableExternalResource metaDataResource = artifactResolver.resolveMetaDataArtifact(artifact);
         if (metaDataResource == null) {
             return null;
         }
-        MutableModuleVersionMetaData moduleVersionMetaData = getArtifactMetadata(artifact, metaDataResource);
+
+        ExternalResourceResolverDescriptorParseContext context = new ExternalResourceResolverDescriptorParseContext(repositoryChain);
+        MutableModuleVersionMetaData metaData = parseMetaDataFromResource(metaDataResource, context);
+        metaData = processMetaData(metaData);
 
         if (isCheckconsistency()) {
-            ModuleVersionSelector requested = dependency.getRequested();
-            ModuleVersionIdentifier requestedId = DefaultModuleVersionIdentifier.newId(requested.getGroup(), requested.getName(), requested.getVersion());
-            checkMetadataConsistency(requestedId, moduleVersionMetaData);
+            checkMetadataConsistency(moduleVersionIdentifier, metaData);
         }
-        return moduleVersionMetaData;
+        return metaData;
     }
 
-    protected MutableModuleVersionMetaData getArtifactMetadata(ModuleVersionArtifactMetaData artifact, ExternalResource resource) {
-        ExternalResourceResolverDescriptorParseContext context = new ExternalResourceResolverDescriptorParseContext(repositoryChain, this);
-        LocallyAvailableExternalResource cachedResource;
-        try {
-            cachedResource = downloadAndCacheResource(artifact, resource);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
+    private MutableModuleVersionMetaData createMetaDataFromDefaultArtifact(ModuleComponentIdentifier moduleVersionIdentifier, DependencyMetaData dependency, ExternalResourceArtifactResolver artifactResolver) {
+        for (IvyArtifactName artifact : getDependencyArtifactNames(dependency)) {
+            if (artifactResolver.artifactExists(new DefaultModuleVersionArtifactMetaData(moduleVersionIdentifier, artifact))) {
+                MutableModuleVersionMetaData metaData = createMetaDataForDependency(dependency);
+                return processMetaData(metaData);
+            }
         }
-
-        MutableModuleVersionMetaData metaData =  metaDataParser.parseMetaData(context, cachedResource);
-        return processMetaData(metaData);
+        return null;
     }
 
-    private MutableModuleVersionMetaData findDefaultArtifact(DependencyMetaData dependency, ArtifactResolver artifactResolver) {
-        MutableModuleVersionMetaData metaData = getDefaultMetaData(dependency);
+    protected abstract MutableModuleVersionMetaData createMetaDataForDependency(DependencyMetaData dependency);
 
-        if (hasArtifacts(metaData, artifactResolver)) {
-            LOGGER.debug("No meta-data file found for module '{}' in repository '{}', using default data instead.", dependency.getRequested(), getName());
+    protected abstract MutableModuleVersionMetaData parseMetaDataFromResource(LocallyAvailableExternalResource cachedResource, DescriptorParseContext context);
 
-            return metaData;
+    private Set<IvyArtifactName> getDependencyArtifactNames(DependencyMetaData dependency) {
+        String moduleName = dependency.getRequested().getName();
+        Set<IvyArtifactName> artifactSet = Sets.newLinkedHashSet();
+        DependencyDescriptor dependencyDescriptor = dependency.getDescriptor();
+        for (DependencyArtifactDescriptor artifact : dependencyDescriptor.getAllDependencyArtifacts()) {
+            artifactSet.add(new DefaultIvyArtifactName(moduleName, artifact.getType(), artifact.getExt(), artifact.getExtraAttributes()));
         }
-        return null;
-    }
 
-    protected MutableModuleVersionMetaData getDefaultMetaData(DependencyMetaData dependency) {
-        MutableModuleVersionMetaData metaData = ModuleDescriptorAdapter.defaultForDependency(dependency);
-        return processMetaData(metaData);
+        if (artifactSet.isEmpty()) {
+            artifactSet.add(new DefaultIvyArtifactName(moduleName, "jar", "jar", Collections.<String, String>emptyMap()));
+        }
+
+        return artifactSet;
     }
 
     private MutableModuleVersionMetaData processMetaData(MutableModuleVersionMetaData metaData) {
@@ -236,13 +243,13 @@ private MutableModuleVersionMetaData processMetaData(MutableModuleVersionMetaDat
         return metaData;
     }
 
-    private void checkMetadataConsistency(ModuleVersionIdentifier expectedId, ModuleVersionMetaData metadata) throws MetaDataParseException {
+    private void checkMetadataConsistency(ModuleComponentIdentifier expectedId, ModuleVersionMetaData metadata) throws MetaDataParseException {
         List<String> errors = new ArrayList<String>();
         if (!expectedId.getGroup().equals(metadata.getId().getGroup())) {
             errors.add("bad group: expected='" + expectedId.getGroup() + "' found='" + metadata.getId().getGroup() + "'");
         }
-        if (!expectedId.getName().equals(metadata.getId().getName())) {
-            errors.add("bad module name: expected='" + expectedId.getName() + "' found='" + metadata.getId().getName() + "'");
+        if (!expectedId.getModule().equals(metadata.getId().getName())) {
+            errors.add("bad module name: expected='" + expectedId.getModule() + "' found='" + metadata.getId().getName() + "'");
         }
         if (!expectedId.getVersion().equals(metadata.getId().getVersion())) {
             errors.add("bad version: expected='" + expectedId.getVersion() + "' found='" + metadata.getId().getVersion() + "'");
@@ -253,70 +260,7 @@ private void checkMetadataConsistency(ModuleVersionIdentifier expectedId, Module
         }
     }
 
-    @Nullable
-    private ModuleVersionArtifactMetaData getMetaDataArtifactFor(DependencyMetaData dependency) {
-        return getMetaDataArtifactFor(DefaultModuleVersionIdentifier.newId(dependency.getDescriptor().getDependencyRevisionId()));
-    }
-
-    public void localResolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        doResolveModuleArtifacts((ModuleVersionMetaData) component, context, result, true);
-    }
-
-    public void resolveModuleArtifacts(ComponentMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result) {
-        doResolveModuleArtifacts((ModuleVersionMetaData) component, context, result, false);
-    }
-
-    // TODO:DAZ This "local-only" pattern is quite ugly: improve it.
-    private void doResolveModuleArtifacts(ModuleVersionMetaData component, ArtifactResolveContext context, BuildableArtifactSetResolveResult result, boolean localOnly) {
-        try {
-            if (context instanceof ConfigurationResolveContext) {
-                String configurationName = ((ConfigurationResolveContext) context).getConfigurationName();
-                ConfigurationMetaData configuration = component.getConfiguration(configurationName);
-                resolveConfigurationArtifacts(component, configuration, result, localOnly);
-            } else {
-                Class<? extends SoftwareArtifact> artifactType = ((ArtifactTypeResolveContext) context).getArtifactType();
-                if (artifactType == JvmLibraryJavadocArtifact.class) {
-                    resolveJavadocArtifacts(component, result, localOnly);
-                } else if (artifactType == JvmLibrarySourcesArtifact.class) {
-                    resolveSourceArtifacts(component, result, localOnly);
-                } else if (isMetaDataArtifact(artifactType)) {
-                    resolveMetaDataArtifacts(component, result);
-                }
-
-                if (!localOnly && !result.hasResult()) {
-                    result.failed(new ArtifactResolveException(component.getComponentId(),
-                            String.format("Cannot locate artifacts of type %s for '%s' in repository '%s'", artifactType.getSimpleName(), component, name)));
-                }
-            }
-        } catch (Exception e) {
-            result.failed(new ArtifactResolveException(component.getComponentId(), e));
-        }
-    }
-
-    protected void resolveConfigurationArtifacts(ModuleVersionMetaData module, ConfigurationMetaData configuration, BuildableArtifactSetResolveResult result, boolean localOnly) {
-        result.resolved(configuration.getArtifacts());
-    }
-
-    protected abstract boolean isMetaDataArtifact(Class<? extends SoftwareArtifact> artifactType);
-
-    protected void resolveMetaDataArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
-        ModuleVersionArtifactMetaData artifact = getMetaDataArtifactFor(module.getId());
-        if (artifact != null) {
-            result.resolved(ImmutableSet.of(artifact));
-        }
-    }
-
-    protected void resolveJavadocArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result, boolean localOnly) {
-        if (!localOnly) {
-            result.resolved(findOptionalArtifacts(module, "javadoc", "javadoc"));
-        }
-    }
-
-    protected void resolveSourceArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result, boolean localOnly) {
-        if (!localOnly) {
-            result.resolved(findOptionalArtifacts(module, "source", "sources"));
-        }
-    }
+    protected abstract boolean isMetaDataArtifact(Class<? extends Artifact> artifactType);
 
     protected Set<ModuleVersionArtifactMetaData> findOptionalArtifacts(ModuleVersionMetaData module, String type, String classifier) {
         ModuleVersionArtifactMetaData artifact = module.artifact(type, "jar", classifier);
@@ -326,33 +270,19 @@ protected Set<ModuleVersionArtifactMetaData> findOptionalArtifacts(ModuleVersion
         return Collections.emptySet();
     }
 
-    @Nullable
-    protected abstract ModuleVersionArtifactMetaData getMetaDataArtifactFor(ModuleVersionIdentifier moduleVersionIdentifier);
-
-    protected boolean hasArtifacts(ModuleVersionMetaData metaData, ArtifactResolver artifactResolver) {
-        for (ModuleVersionArtifactMetaData artifactMetaData : metaData.getArtifacts()) {
-            if (artifactResolver.artifactExists(artifactMetaData)) {
-                return true;
-            }
+    private ModuleVersionArtifactMetaData getMetaDataArtifactFor(ModuleComponentIdentifier moduleComponentIdentifier) {
+        IvyArtifactName ivyArtifactName = getMetaDataArtifactName(moduleComponentIdentifier.getModule());
+        if (ivyArtifactName == null) {
+            return null;
         }
-        return false;
-    }
-
-    public boolean artifactExists(ModuleVersionArtifactMetaData artifact) {
-        return createArtifactResolver().artifactExists(artifact);
-    }
-
-    // TODO:DAZ This is currently required to handle maven snapshots: if the timestamp was part of the identifier this wouldn't be required
-    protected ArtifactResolver createArtifactResolver(ModuleSource moduleSource) {
-        return createArtifactResolver();
+        return new DefaultModuleVersionArtifactMetaData(moduleComponentIdentifier, ivyArtifactName);
     }
 
-    private LocallyAvailableExternalResource downloadAndCacheResource(ModuleVersionArtifactMetaData artifact, ExternalResource resource) throws IOException {
-        final ExternalResourceDownloader resourceDownloader = new VerifyingExternalResourceDownloader(getChecksumAlgorithms(), getRepository());
-        return repositoryCacheManager.downloadAndCacheArtifactFile(artifact, resourceDownloader, resource);
-    }
+    // TODO This will no longer be @Nullable in Gradle 2.0 (when we remove the ability to call setUsePoms(false) on MavenResolver)
+    @Nullable
+    protected abstract IvyArtifactName getMetaDataArtifactName(String moduleName);
 
-    public void resolveArtifact(ComponentArtifactMetaData componentArtifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+    protected void resolveArtifact(ComponentArtifactMetaData componentArtifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
         ModuleVersionArtifactMetaData artifact = (ModuleVersionArtifactMetaData) componentArtifact;
 
         File localFile;
@@ -370,21 +300,25 @@ public void resolveArtifact(ComponentArtifactMetaData componentArtifact, ModuleS
         }
     }
 
-    protected File download(ModuleVersionArtifactMetaData artifact, ModuleSource moduleSource) throws IOException {
-        return downloadArtifact(artifact, createArtifactResolver(moduleSource));
-    }
-
-    protected File downloadArtifact(ModuleVersionArtifactMetaData artifact, ArtifactResolver artifactResolver) throws IOException {
-        ExternalResource artifactResource = artifactResolver.resolveArtifact(artifact);
+    protected File download(ModuleVersionArtifactMetaData artifact, ModuleSource moduleSource) {
+        LocallyAvailableExternalResource artifactResource = createArtifactResolver(moduleSource).resolveArtifact(artifact);
         if (artifactResource == null) {
             return null;
         }
 
-        return downloadAndCacheResource(artifact, artifactResource).getLocalResource().getFile();
+        return artifactResource.getLocalResource().getFile();
     }
 
-    protected ArtifactResolver createArtifactResolver() {
-        return new ArtifactResolver(getIvyPatterns(), getArtifactPatterns());
+    protected ExternalResourceArtifactResolver createArtifactResolver() {
+        return createArtifactResolver(ivyPatterns, artifactPatterns);
+    }
+
+    protected ExternalResourceArtifactResolver createArtifactResolver(List<ResourcePattern> ivyPatterns, List<ResourcePattern> artifactPatterns) {
+        return new DefaultExternalResourceArtifactResolver(repository, locallyAvailableResourceFinder, ivyPatterns, artifactPatterns, artifactFileStore, cachingResourceAccessor);
+    }
+
+    protected ExternalResourceArtifactResolver createArtifactResolver(ModuleSource moduleSource) {
+        return createArtifactResolver();
     }
 
     public void setSettings(IvySettings settings) {
@@ -397,61 +331,58 @@ public void publish(ModuleVersionPublishMetaData moduleVersion) throws IOExcepti
     }
 
     private void publish(ModuleVersionArtifactMetaData artifact, File src) throws IOException {
-        String destinationPattern;
-        if ("ivy".equals(artifact.getName().getType()) && !getIvyPatterns().isEmpty()) {
-            destinationPattern = getIvyPatterns().get(0);
-        } else if (!getArtifactPatterns().isEmpty()) {
-            destinationPattern = getArtifactPatterns().get(0);
+        ResourcePattern destinationPattern;
+        if ("ivy".equals(artifact.getName().getType()) && !ivyPatterns.isEmpty()) {
+            destinationPattern = ivyPatterns.get(0);
+        } else if (!artifactPatterns.isEmpty()) {
+            destinationPattern = artifactPatterns.get(0);
         } else {
             throw new IllegalStateException("impossible to publish " + artifact + " using " + this + ": no artifact pattern defined");
         }
-        String destination = toResourcePattern(destinationPattern).toPath(artifact);
+        URI destination = destinationPattern.getLocation(artifact).getUri();
 
         put(src, destination);
         LOGGER.info("Published {} to {}", artifact, destination);
     }
 
-    private void put(File src, String destination) throws IOException {
-        String[] checksums = getChecksumAlgorithms();
-        if (checksums.length != 0) {
-            // Should not be reachable for publishing
-            throw new UnsupportedOperationException();
-        }
-
+    private void put(File src, URI destination) throws IOException {
         repository.put(src, destination);
     }
 
-    public void addIvyPattern(String pattern) {
+    protected void addIvyPattern(ResourcePattern pattern) {
         ivyPatterns.add(pattern);
     }
 
-    public void addArtifactPattern(String pattern) {
+    protected void addArtifactPattern(ResourcePattern pattern) {
         artifactPatterns.add(pattern);
     }
 
     public List<String> getIvyPatterns() {
-        return Collections.unmodifiableList(ivyPatterns);
+        return CollectionUtils.collect(ivyPatterns, new Transformer<String, ResourcePattern>() {
+            public String transform(ResourcePattern original) {
+                return original.getPattern();
+            }
+        });
     }
 
     public List<String> getArtifactPatterns() {
-        return Collections.unmodifiableList(artifactPatterns);
+        return CollectionUtils.collect(artifactPatterns, new Transformer<String, ResourcePattern>() {
+            public String transform(ResourcePattern original) {
+                return original.getPattern();
+            }
+        });
     }
 
-    protected void setIvyPatterns(List<String> patterns) {
-        ivyPatterns = patterns;
+    protected void setIvyPatterns(Iterable<? extends ResourcePattern> patterns) {
+        ivyPatterns.clear();
+        CollectionUtils.addAll(ivyPatterns, patterns);
     }
 
-    protected void setArtifactPatterns(List<String> patterns) {
+    protected void setArtifactPatterns(List<ResourcePattern> patterns) {
         artifactPatterns = patterns;
     }
 
-    public boolean isM2compatible() {
-        return m2Compatible;
-    }
-
-    public void setM2compatible(boolean compatible) {
-        m2Compatible = compatible;
-    }
+    public abstract boolean isM2compatible();
 
     public boolean isCheckconsistency() {
         return checkConsistency;
@@ -477,27 +408,6 @@ public void setAllownomd(boolean allowMissingDescriptor) {
         this.allowMissingDescriptor = allowMissingDescriptor;
     }
 
-    public String[] getChecksumAlgorithms() {
-        if (checksums == null) {
-            return new String[0];
-        }
-        // csDef is a comma separated list of checksum algorithms to use with this resolver
-        // we parse and return it as a String[]
-        String[] checksums = this.checksums.split(",");
-        List<String> algos = new ArrayList<String>();
-        for (int i = 0; i < checksums.length; i++) {
-            String cs = checksums[i].trim();
-            if (!"".equals(cs) && !"none".equals(cs)) {
-                algos.add(cs);
-            }
-        }
-        return algos.toArray(new String[algos.size()]);
-    }
-
-    public void setChecksums(String checksums) {
-        this.checksums = checksums;
-    }
-
     public String getChangingMatcherName() {
         return changingMatcherName;
     }
@@ -514,14 +424,6 @@ public void setChangingPattern(String changingPattern) {
         this.changingPattern = changingPattern;
     }
 
-    public void setRepositoryCacheManager(RepositoryArtifactCache repositoryCacheManager) {
-        this.repositoryCacheManager = repositoryCacheManager;
-    }
-
-    protected ResourcePattern toResourcePattern(String pattern) {
-        return isM2compatible() ? new M2ResourcePattern(pattern) : new IvyResourcePattern(pattern);
-    }
-
     private boolean isChanging(String version) {
         if (changingMatcherName == null || changingPattern == null) {
             return false;
@@ -534,66 +436,90 @@ private boolean isChanging(String version) {
         return matcher.getMatcher(changingPattern).matches(version);
     }
 
-    // TODO:DAZ Extract this properly: make this static
-    protected class ArtifactResolver {
-        private final List<String> ivyPatterns;
-        private final List<String> artifactPatterns;
+    protected abstract class AbstractRepositoryAccess implements ModuleComponentRepositoryAccess {
+        public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+            ModuleVersionMetaData moduleMetaData = (ModuleVersionMetaData) component;
 
-        public ArtifactResolver(List<String> ivyPatterns, List<String> artifactPatterns) {
-            this.ivyPatterns = ivyPatterns;
-            this.artifactPatterns = artifactPatterns;
+            if (artifactType.getType() == JavadocArtifact.class) {
+                resolveJavadocArtifacts(moduleMetaData, result);
+            } else if (artifactType.getType() == SourcesArtifact.class) {
+                resolveSourceArtifacts(moduleMetaData, result);
+            } else if (isMetaDataArtifact(artifactType.getType())) {
+                resolveMetaDataArtifacts(moduleMetaData, result);
+            }
         }
 
-        public ExternalResource resolveMetaDataArtifact(ModuleVersionArtifactMetaData artifact) {
-            return findStaticResourceUsingPatterns(ivyPatterns, artifact, true);
+        public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+            String configurationName = componentUsage.getConfigurationName();
+             ConfigurationMetaData configuration = component.getConfiguration(configurationName);
+             resolveConfigurationArtifacts((ModuleVersionMetaData) component, configuration, result);
         }
 
-        public ExternalResource resolveArtifact(ModuleVersionArtifactMetaData artifact) {
-            return findStaticResourceUsingPatterns(artifactPatterns, artifact, true);
+        protected abstract void resolveConfigurationArtifacts(ModuleVersionMetaData module, ConfigurationMetaData configuration, BuildableArtifactSetResolveResult result);
+
+        protected abstract void resolveMetaDataArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result);
+
+        protected abstract void resolveJavadocArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result);
+
+        protected abstract void resolveSourceArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result);
+
+    }
+
+    protected abstract class LocalRepositoryAccess extends AbstractRepositoryAccess {
+        public final void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
         }
 
-        public boolean artifactExists(ModuleVersionArtifactMetaData artifact) {
-            return findStaticResourceUsingPatterns(artifactPatterns, artifact, false) != null;
+        public final void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
         }
 
-        private ExternalResource findStaticResourceUsingPatterns(List<String> patternList, ModuleVersionArtifactMetaData artifact, boolean forDownload) {
-            for (String pattern : patternList) {
-                ResourcePattern resourcePattern = toResourcePattern(pattern);
-                String resourceName = resourcePattern.toPath(artifact);
-                LOGGER.debug("Loading {}", resourceName);
-                ExternalResource resource = getResource(resourceName, artifact, forDownload);
-                if (resource.exists()) {
-                    return resource;
-                } else {
-                    LOGGER.debug("Resource not reachable for {}: res={}", artifact, resource);
-                    discardResource(resource);
-                }
+        protected final void resolveMetaDataArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            ModuleVersionArtifactMetaData artifact = getMetaDataArtifactFor(module.getComponentId());
+            if (artifact != null) {
+                result.resolved(Collections.singleton(artifact));
+            } else {
+                result.resolved(Collections.<ComponentArtifactMetaData>emptySet());
             }
-            return null;
         }
 
-        private ExternalResource getResource(String source, ModuleVersionArtifactMetaData target, boolean forDownload) {
-            try {
-                if (forDownload) {
-                    LocallyAvailableResourceCandidates localCandidates = locallyAvailableResourceFinder.findCandidates(target);
-                    ExternalResource resource = repository.getResource(source, localCandidates);
-                    return resource == null ? new MissingExternalResource(source) : resource;
-                } else {
-                    // TODO - there's a potential problem here in that we don't carry correct isLocal data in MetaDataOnlyExternalResource
-                    ExternalResourceMetaData metaData = repository.getResourceMetaData(source);
-                    return metaData == null ? new MissingExternalResource(source) : new MetaDataOnlyExternalResource(source, metaData);
-                }
-            } catch (IOException e) {
-                throw new RuntimeException(String.format("Could not get resource '%s'.", source), e);
-            }
+        public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+
         }
+    }
 
-        protected void discardResource(ExternalResource resource) {
-            try {
-                resource.close();
-            } catch (IOException e) {
-                LOGGER.warn("Exception closing resource " + resource.getName(), e);
+    protected abstract class RemoteRepositoryAccess extends AbstractRepositoryAccess {
+        public final void listModuleVersions(DependencyMetaData dependency, BuildableModuleVersionSelectionResolveResult result) {
+            doListModuleVersions(dependency, result);
+        }
+
+        public final void resolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+            doResolveComponentMetaData(dependency, moduleComponentIdentifier, result);
+        }
+
+        @Override
+        public void resolveModuleArtifacts(ComponentMetaData component, ArtifactType artifactType, BuildableArtifactSetResolveResult result) {
+            super.resolveModuleArtifacts(component, artifactType, result);
+            checkArtifactsResolved(component, artifactType, result);
+        }
+
+        @Override
+        public void resolveModuleArtifacts(ComponentMetaData component, ComponentUsage componentUsage, BuildableArtifactSetResolveResult result) {
+            super.resolveModuleArtifacts(component, componentUsage, result);
+            checkArtifactsResolved(component, componentUsage, result);
+        }
+
+        private void checkArtifactsResolved(ComponentMetaData component, Object context, BuildableArtifactSetResolveResult result) {
+            if (!result.hasResult()) {
+                result.failed(new ArtifactResolveException(component.getComponentId(),
+                        String.format("Cannot locate %s for '%s' in repository '%s'", context, component, name)));
             }
         }
+
+        protected final void resolveMetaDataArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            // Meta data  artifacts are determined locally
+        }
+
+        public void resolveArtifact(ComponentArtifactMetaData artifact, ModuleSource moduleSource, BuildableArtifactResolveResult result) {
+            ExternalResourceResolver.this.resolveArtifact(artifact, moduleSource, result);
+        }
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverDescriptorParseContext.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverDescriptorParseContext.java
index df22bddec52a..c7f7bf30feaa 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverDescriptorParseContext.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverDescriptorParseContext.java
@@ -15,17 +15,15 @@
  */
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
-import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.result.Artifact;
 import org.gradle.api.internal.artifacts.ivyservice.*;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.RepositoryChain;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
 import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData;
 import org.gradle.api.internal.artifacts.metadata.DefaultDependencyMetaData;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
 import org.gradle.internal.resource.local.DefaultLocallyAvailableResource;
 import org.gradle.internal.resource.local.LocallyAvailableResource;
 
@@ -38,31 +36,24 @@
  */
 public class ExternalResourceResolverDescriptorParseContext implements DescriptorParseContext {
     private final RepositoryChain mainResolvers;
-    private final ExternalResourceResolver moduleResolver;
 
-    public ExternalResourceResolverDescriptorParseContext(RepositoryChain mainResolvers, ExternalResourceResolver moduleResolver) {
+    public ExternalResourceResolverDescriptorParseContext(RepositoryChain mainResolvers) {
         this.mainResolvers = mainResolvers;
-        this.moduleResolver = moduleResolver;
     }
 
-    public boolean artifactExists(ModuleVersionArtifactMetaData artifact) {
-        return moduleResolver.artifactExists(artifact);
-    }
-
-    public LocallyAvailableExternalResource getMetaDataArtifact(ModuleVersionIdentifier moduleVersionIdentifier, Class<? extends SoftwareArtifact> artifactType) {
+    public LocallyAvailableExternalResource getMetaDataArtifact(ModuleVersionIdentifier moduleVersionIdentifier, Class<? extends Artifact> artifactType) {
         File resolvedArtifactFile = resolveMetaDataArtifactFile(moduleVersionIdentifier, mainResolvers.getDependencyResolver(), mainResolvers.getArtifactResolver(), artifactType);
         LocallyAvailableResource localResource = new DefaultLocallyAvailableResource(resolvedArtifactFile);
-        return new DefaultLocallyAvailableExternalResource(resolvedArtifactFile.toURI().toString(), localResource);
+        return new DefaultLocallyAvailableExternalResource(resolvedArtifactFile.toURI(), localResource);
     }
 
     private File resolveMetaDataArtifactFile(ModuleVersionIdentifier moduleVersionIdentifier, DependencyToModuleVersionResolver dependencyResolver,
-                                             ArtifactResolver artifactResolver, Class<? extends SoftwareArtifact> artifactType) {
+                                             ArtifactResolver artifactResolver, Class<? extends Artifact> artifactType) {
         BuildableComponentResolveResult moduleVersionResolveResult = new DefaultBuildableComponentResolveResult();
-        dependencyResolver.resolve(new DefaultDependencyMetaData(new DefaultDependencyDescriptor(IvyUtil.createModuleRevisionId(moduleVersionIdentifier), true)), moduleVersionResolveResult);
+        dependencyResolver.resolve(new DefaultDependencyMetaData(moduleVersionIdentifier, true), moduleVersionResolveResult);
 
         BuildableArtifactSetResolveResult moduleArtifactsResolveResult = new DefaultBuildableArtifactSetResolveResult();
-        ArtifactTypeResolveContext context = new ArtifactTypeResolveContext(artifactType);
-        artifactResolver.resolveModuleArtifacts(moduleVersionResolveResult.getMetaData(), context, moduleArtifactsResolveResult);
+        artifactResolver.resolveModuleArtifacts(moduleVersionResolveResult.getMetaData(), new DefaultArtifactType(artifactType), moduleArtifactsResolveResult);
 
         BuildableArtifactResolveResult artifactResolveResult = new DefaultBuildableArtifactResolveResult();
         ComponentArtifactMetaData artifactMetaData = moduleArtifactsResolveResult.getArtifacts().iterator().next();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResolver.java
index c1e90001e4ad..620d7d435a23 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResolver.java
@@ -15,32 +15,33 @@
  */
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
-import org.gradle.api.Nullable;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.result.Artifact;
 import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepositoryAccess;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DownloadedIvyModuleDescriptorParser;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
 import org.gradle.api.internal.artifacts.metadata.*;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport;
-import org.gradle.api.internal.artifacts.resolution.IvyDescriptorArtifact;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
+import org.gradle.api.internal.artifacts.result.metadata.IvyDescriptorArtifact;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.FileStore;
 
 import java.net.URI;
 
 public class IvyResolver extends ExternalResourceResolver implements PatternBasedResolver {
 
-    private final RepositoryTransport transport;
     private final boolean dynamicResolve;
+    private final MetaDataParser metaDataParser;
+    private boolean m2Compatible;
 
     public IvyResolver(String name, RepositoryTransport transport,
                        LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
-                       boolean dynamicResolve, ResolverStrategy resolverStrategy) {
-        super(name, transport.getRepository(), new ResourceVersionLister(transport.getRepository()),
-                locallyAvailableResourceFinder, new DownloadedIvyModuleDescriptorParser(resolverStrategy),
-                resolverStrategy);
-        this.transport = transport;
-        this.transport.configureCacheManager(this);
+                       boolean dynamicResolve, ResolverStrategy resolverStrategy, FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
+        super(name, transport.isLocal(), transport.getRepository(), transport.getResourceAccessor(), new ResourceVersionLister(transport.getRepository()), locallyAvailableResourceFinder, resolverStrategy, artifactFileStore);
+        this.metaDataParser = new DownloadedIvyModuleDescriptorParser(resolverStrategy);
         this.dynamicResolve = dynamicResolve;
     }
 
@@ -49,44 +50,91 @@ public boolean isDynamicResolveMode() {
         return dynamicResolve;
     }
 
-    @Override
-    protected boolean isMetaDataArtifact(Class<? extends SoftwareArtifact> artifactType) {
+    protected boolean isMetaDataArtifact(Class<? extends Artifact> artifactType) {
         return artifactType == IvyDescriptorArtifact.class;
     }
 
-    @Nullable
-    protected ModuleVersionArtifactMetaData getMetaDataArtifactFor(ModuleVersionIdentifier moduleVersionIdentifier) {
-        DefaultModuleVersionArtifactIdentifier artifactId = new DefaultModuleVersionArtifactIdentifier(moduleVersionIdentifier, "ivy", "ivy", "xml");
-        return new DefaultModuleVersionArtifactMetaData(artifactId);
+    @Override
+    protected IvyArtifactName getMetaDataArtifactName(String moduleName) {
+        return new DefaultIvyArtifactName("ivy", "ivy", "xml");
+    }
+
+    @Override
+    public boolean isM2compatible() {
+        return m2Compatible;
+    }
+
+    public void setM2compatible(boolean m2compatible) {
+        this.m2Compatible = m2compatible;
     }
 
     public void addArtifactLocation(URI baseUri, String pattern) {
-        String artifactPattern = transport.convertToPath(baseUri) + pattern;
-        addArtifactPattern(artifactPattern);
+        addArtifactPattern(toResourcePattern(baseUri, pattern));
     }
 
     public void addDescriptorLocation(URI baseUri, String pattern) {
-        String descriptorPattern = transport.convertToPath(baseUri) + pattern;
-        addIvyPattern(descriptorPattern);
+        addIvyPattern(toResourcePattern(baseUri, pattern));
     }
 
-    @Override
-    protected void resolveJavadocArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result, boolean localOnly) {
-        ConfigurationMetaData configuration = module.getConfiguration("javadoc");
-        if (configuration != null) {
+    protected ResourcePattern toResourcePattern(URI baseUri, String pattern) {
+        return isM2compatible() ? new M2ResourcePattern(baseUri, pattern) : new IvyResourcePattern(baseUri, pattern);
+    }
+
+    public ModuleComponentRepositoryAccess getLocalAccess() {
+        return new IvyLocalRepositoryAccess();
+    }
+
+    public ModuleComponentRepositoryAccess getRemoteAccess() {
+        return new IvyRemoteRepositoryAccess();
+    }
+
+    protected MutableModuleVersionMetaData createMetaDataForDependency(DependencyMetaData dependency) {
+        return new DefaultIvyModuleVersionMetaData(dependency);
+    }
+
+    protected MutableModuleVersionMetaData parseMetaDataFromResource(LocallyAvailableExternalResource cachedResource, DescriptorParseContext context) {
+        return metaDataParser.parseMetaData(context, cachedResource);
+    }
+
+    private class IvyLocalRepositoryAccess extends LocalRepositoryAccess {
+
+        protected void resolveConfigurationArtifacts(ModuleVersionMetaData module, ConfigurationMetaData configuration, BuildableArtifactSetResolveResult result) {
             result.resolved(configuration.getArtifacts());
-        } else {
-            super.resolveJavadocArtifacts(module, result, localOnly);
+        }
+
+        @Override
+        protected void resolveJavadocArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            ConfigurationMetaData configuration = module.getConfiguration("javadoc");
+            if (configuration != null) {
+                result.resolved(configuration.getArtifacts());
+            }
+        }
+
+        @Override
+        protected void resolveSourceArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            ConfigurationMetaData configuration = module.getConfiguration("sources");
+            if (configuration != null) {
+                result.resolved(configuration.getArtifacts());
+            }
         }
     }
 
-    @Override
-    protected void resolveSourceArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result, boolean localOnly) {
-        ConfigurationMetaData configuration = module.getConfiguration("sources");
-        if (configuration != null) {
-            result.resolved(configuration.getArtifacts());
-        } else {
-            super.resolveSourceArtifacts(module, result, localOnly);
+    private class IvyRemoteRepositoryAccess extends RemoteRepositoryAccess {
+        @Override
+        protected void resolveConfigurationArtifacts(ModuleVersionMetaData module, ConfigurationMetaData configuration, BuildableArtifactSetResolveResult result) {
+            // Configuration artifacts are determined locally
+        }
+
+        @Override
+        protected void resolveJavadocArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            // Probe for artifact with classifier
+            result.resolved(findOptionalArtifacts(module, "javadoc", "javadoc"));
+        }
+
+        @Override
+        protected void resolveSourceArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            // Probe for artifact with classifier
+            result.resolved(findOptionalArtifacts(module, "source", "sources"));
         }
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePattern.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePattern.java
index 1771ed62f20d..7a25736fda97 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePattern.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePattern.java
@@ -16,69 +16,45 @@
 
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
-import org.apache.ivy.core.IvyPatternHelper;
 import org.gradle.api.artifacts.ModuleIdentifier;
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
+import org.gradle.internal.resource.ExternalResourceName;
 
-import java.util.HashMap;
+import java.net.URI;
 import java.util.Map;
 
-public class IvyResourcePattern implements ResourcePattern {
-    private final String pattern;
+public class IvyResourcePattern extends AbstractResourcePattern implements ResourcePattern {
 
     public IvyResourcePattern(String pattern) {
-        this.pattern = pattern;
+        super(pattern);
     }
 
-    public String getPattern() {
-        return pattern;
+    public IvyResourcePattern(URI baseUri, String pattern) {
+        super(baseUri, pattern);
     }
 
     @Override
     public String toString() {
-        return String.format("Ivy pattern '%s'", pattern);
+        return String.format("Ivy pattern '%s'", getPattern());
     }
 
-    public String toPath(ModuleVersionArtifactMetaData artifact) {
-        Map<String, Object> attributes = toAttributes(artifact);
-        return IvyPatternHelper.substituteTokens(pattern, attributes);
+    public ExternalResourceName getLocation(ModuleVersionArtifactMetaData artifact) {
+        Map<String, String> attributes = toAttributes(artifact);
+        return getBase().getRoot().resolve(substituteTokens(getBase().getPath(), attributes));
     }
 
-    public String toVersionListPattern(ModuleVersionArtifactMetaData artifactId) {
-        Map<String, Object> attributes = toAttributes(artifactId);
-        attributes.remove(IvyPatternHelper.REVISION_KEY);
-        return IvyPatternHelper.substituteTokens(pattern, attributes);
+    public ExternalResourceName toVersionListPattern(ModuleIdentifier module, IvyArtifactName artifact) {
+        Map<String, String> attributes = toAttributes(module, artifact);
+        return getBase().getRoot().resolve(substituteTokens(getBase().getPath(), attributes));
     }
 
-    public String toModulePath(ModuleIdentifier module) {
+    public ExternalResourceName toModulePath(ModuleIdentifier module) {
         throw new UnsupportedOperationException("not implemented yet.");
     }
 
-    public String toModuleVersionPath(ModuleVersionArtifactMetaData artifact) {
+    public ExternalResourceName toModuleVersionPath(ModuleComponentIdentifier componentIdentifier) {
         throw new UnsupportedOperationException("not implemented yet.");
     }
-
-    // TODO:DAZ Handle extra attributes
-    protected Map<String, Object> toAttributes(ModuleVersionArtifactMetaData artifact) {
-        HashMap<String, Object> attributes = new HashMap<String, Object>();
-        ModuleComponentIdentifier moduleVersionIdentifier = artifact.getId().getComponentIdentifier();
-        IvyArtifactName ivyArtifact = artifact.getName();
-        attributes.put(IvyPatternHelper.ORGANISATION_KEY, moduleVersionIdentifier.getGroup());
-        attributes.put(IvyPatternHelper.MODULE_KEY, moduleVersionIdentifier.getModule());
-        attributes.put(IvyPatternHelper.REVISION_KEY, moduleVersionIdentifier.getVersion());
-        attributes.put(IvyPatternHelper.ARTIFACT_KEY, ivyArtifact.getName());
-        attributes.put(IvyPatternHelper.TYPE_KEY, ivyArtifact.getType());
-        attributes.put(IvyPatternHelper.EXT_KEY, ivyArtifact.getExtension());
-        attributes.put("classifier", ivyArtifact.getClassifier());
-        return attributes;
-    }
-
-    protected Map<String, Object> toAttributes(ModuleIdentifier module) {
-        HashMap<String, Object> attributes = new HashMap<String, Object>();
-        attributes.put(IvyPatternHelper.ORGANISATION_KEY, module.getGroup());
-        attributes.put(IvyPatternHelper.MODULE_KEY, module.getName());
-        return attributes;
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePattern.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePattern.java
index 3df3368f23cd..6278f34a8ff6 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePattern.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePattern.java
@@ -18,62 +18,70 @@
 
 import org.apache.ivy.core.IvyPatternHelper;
 import org.gradle.api.artifacts.ModuleIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
+import org.gradle.internal.resource.ExternalResourceName;
 
+import java.net.URI;
 import java.util.Map;
 
-// TODO:DAZ Should extend common base class
-public class M2ResourcePattern extends IvyResourcePattern {
+public class M2ResourcePattern extends AbstractResourcePattern {
     public M2ResourcePattern(String pattern) {
         super(pattern);
     }
 
+    public M2ResourcePattern(URI baseUri, String pattern) {
+        super(baseUri, pattern);
+    }
+
     @Override
     public String toString() {
         return String.format("M2 pattern '%s'", getPattern());
     }
 
-    @Override
-    public String toModulePath(ModuleIdentifier module) {
-        String pattern = getPattern();
+    public ExternalResourceName getLocation(ModuleVersionArtifactMetaData artifact) {
+        Map<String, String> attributes = toAttributes(artifact);
+        String pattern = maybeSubstituteTimestamp(artifact, getBase().getPath());
+        return getBase().getRoot().resolve(substituteTokens(pattern, attributes));
+    }
+
+    private String maybeSubstituteTimestamp(ModuleVersionArtifactMetaData artifact, String pattern) {
+        if (artifact.getComponentId() instanceof MavenUniqueSnapshotComponentIdentifier) {
+            String timestampedVersion = ((MavenUniqueSnapshotComponentIdentifier) artifact.getComponentId()).getTimestampedVersion();
+            pattern = pattern.replaceFirst("\\-\\[revision\\]", "-" + timestampedVersion);
+        }
+        return pattern;
+    }
+
+    public ExternalResourceName toVersionListPattern(ModuleIdentifier module, IvyArtifactName artifact) {
+        Map<String, String> attributes = toAttributes(module, artifact);
+        return getBase().getRoot().resolve(substituteTokens(getBase().getPath(), attributes));
+    }
+
+    public ExternalResourceName toModulePath(ModuleIdentifier module) {
+        String pattern = getBase().getPath();
         if (!pattern.endsWith(MavenPattern.M2_PATTERN)) {
             throw new UnsupportedOperationException("Cannot locate module for non-maven layout.");
         }
         String metaDataPattern = pattern.substring(0, pattern.length() - MavenPattern.M2_PER_MODULE_PATTERN.length() - 1);
-        return IvyPatternHelper.substituteTokens(metaDataPattern, toAttributes(module));
+        return getBase().getRoot().resolve(substituteTokens(metaDataPattern, toAttributes(module)));
     }
 
-    @Override
-    public String toPath(ModuleVersionArtifactMetaData artifact) {
-        Map<String, Object> attributes = toAttributes(artifact);
-        return IvyPatternHelper.substituteTokens(getPattern(), attributes);
-    }
-
-    @Override
-    public String toModuleVersionPath(ModuleVersionArtifactMetaData artifact) {
-        String pattern = getPattern();
+    public ExternalResourceName toModuleVersionPath(ModuleComponentIdentifier componentIdentifier) {
+        String pattern = getBase().getPath();
         if (!pattern.endsWith(MavenPattern.M2_PATTERN)) {
             throw new UnsupportedOperationException("Cannot locate module version for non-maven layout.");
         }
         String metaDataPattern = pattern.substring(0, pattern.length() - MavenPattern.M2_PER_MODULE_VERSION_PATTERN.length() - 1);
-        return IvyPatternHelper.substituteTokens(metaDataPattern, toAttributes(artifact));
-    }
-
-    @Override
-    protected Map<String, Object> toAttributes(ModuleVersionArtifactMetaData artifact) {
-        return mapOrganisation(super.toAttributes(artifact));
-    }
-
-    @Override
-    protected Map<String, Object> toAttributes(ModuleIdentifier module) {
-        return mapOrganisation(super.toAttributes(module));
+        return getBase().getRoot().resolve(substituteTokens(metaDataPattern, toAttributes(componentIdentifier)));
     }
 
-    private Map<String, Object> mapOrganisation(Map<String, Object> attributes) {
-        String org = (String) attributes.get(IvyPatternHelper.ORGANISATION_KEY);
+    protected String substituteTokens(String pattern, Map<String, String> attributes) {
+        String org = attributes.get(IvyPatternHelper.ORGANISATION_KEY);
         if (org != null) {
             attributes.put(IvyPatternHelper.ORGANISATION_KEY, org.replace(".", "/"));
         }
-        return attributes;
+        return super.substituteTokens(pattern, attributes);
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenLocalResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenLocalResolver.java
index 3097423085c6..e80f1dfce7ea 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenLocalResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenLocalResolver.java
@@ -15,13 +15,14 @@
  */
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
-import org.gradle.api.internal.artifacts.metadata.DependencyMetaData;
+import org.gradle.api.internal.artifacts.metadata.MavenModuleVersionMetaData;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData;
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.FileStore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,26 +33,41 @@ public class MavenLocalResolver extends MavenResolver {
 
     public MavenLocalResolver(String name, URI rootUri, RepositoryTransport transport,
                               LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
-                              ResolverStrategy resolverStrategy) {
-        super(name, rootUri, transport, locallyAvailableResourceFinder, resolverStrategy);
+                              ResolverStrategy resolverStrategy, FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
+        super(name, rootUri, transport, locallyAvailableResourceFinder, resolverStrategy, artifactFileStore);
     }
 
     @Override
-    protected MutableModuleVersionMetaData findMetaDataArtifact(DependencyMetaData dependency, ArtifactResolver artifactResolver) {
-        MutableModuleVersionMetaData metaData = super.findMetaDataArtifact(dependency, artifactResolver);
-        if (isOrphanedPom(metaData, artifactResolver)) {
+    protected MutableModuleVersionMetaData parseMetaDataFromArtifact(ModuleComponentIdentifier moduleComponentIdentifier, ExternalResourceArtifactResolver artifactResolver) {
+        MutableModuleVersionMetaData metaData = super.parseMetaDataFromArtifact(moduleComponentIdentifier, artifactResolver);
+
+        if (isOrphanedPom(mavenMetaData(metaData), artifactResolver)) {
             return null;
         }
         return metaData;
     }
 
-    private boolean isOrphanedPom(ModuleVersionMetaData metaData, ArtifactResolver artifactResolver) {
-        if (!metaData.isMetaDataOnly()) {
-            if (!hasArtifacts(metaData, artifactResolver)) {
-                LOGGER.debug("POM file found for module '{}' in repository '{}' but no artifact found. Ignoring.", metaData.getId(), getName());
-                return true;
+    private boolean isOrphanedPom(MavenModuleVersionMetaData metaData, ExternalResourceArtifactResolver artifactResolver) {
+        if (metaData.isPomPackaging()) {
+            return false;
+        }
+
+        // check custom packaging
+        if(!metaData.isKnownJarPackaging()) {
+            ModuleVersionArtifactMetaData customArtifactMetaData = metaData.artifact(metaData.getPackaging(), metaData.getPackaging(), null);
+
+            if(artifactResolver.artifactExists(customArtifactMetaData)) {
+                return false;
             }
         }
-        return false;
+
+        ModuleVersionArtifactMetaData artifact = metaData.artifact("jar", "jar", null);
+
+        if(artifactResolver.artifactExists(artifact)) {
+            return false;
+        }
+
+        LOGGER.debug("POM file found for module '{}' in repository '{}' but no artifact found. Ignoring.", metaData.getId(), getName());
+        return true;
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenMetadataLoader.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenMetadataLoader.java
index 7f794a29ad50..68ea3fd55866 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenMetadataLoader.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenMetadataLoader.java
@@ -19,10 +19,10 @@
 import org.apache.ivy.util.ContextualSAXHandler;
 import org.apache.ivy.util.XMLHelper;
 import org.gradle.internal.ErroringAction;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository;
-import org.gradle.api.internal.resource.ResourceException;
-import org.gradle.api.internal.resource.ResourceNotFoundException;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
+import org.gradle.internal.resource.ResourceException;
+import org.gradle.internal.resource.ResourceNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
@@ -30,6 +30,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 class MavenMetadataLoader {
     private static final Logger LOGGER = LoggerFactory.getLogger(MavenMetadataLoader.class);
@@ -53,7 +54,7 @@ public MavenMetadata load(String metadataLocation) throws ResourceNotFoundExcept
     }
 
     private void parseMavenMetadataInfo(final String metadataLocation, final MavenMetadata metadata) throws Exception {
-        final ExternalResource resource = repository.getResource(metadataLocation);
+        ExternalResource resource = repository.getResource(URI.create(metadataLocation));
         if (resource == null) {
             throw new ResourceNotFoundException(String.format("Maven meta-data not available: %s", metadataLocation));
         }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolver.java
index ea847917f544..17933968b61c 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolver.java
@@ -15,24 +15,27 @@
  */
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
-import org.apache.ivy.core.module.id.ModuleRevisionId;
+import com.google.common.collect.ImmutableSet;
 import org.apache.ivy.plugins.matcher.PatternMatcher;
-import org.gradle.api.Transformer;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.artifacts.result.Artifact;
 import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionMetaDataResolveResult;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepositoryAccess;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.DescriptorParseContext;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.GradlePomModuleDescriptorParser;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy;
 import org.gradle.api.internal.artifacts.metadata.*;
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport;
-import org.gradle.api.internal.artifacts.resolution.MavenPomArtifact;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
-import org.gradle.api.internal.resource.ResourceNotFoundException;
+import org.gradle.api.internal.artifacts.result.metadata.MavenPomArtifact;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.ResourceNotFoundException;
 import org.gradle.api.resources.ResourceException;
-import org.gradle.util.CollectionUtils;
+import org.gradle.internal.Transformers;
+import org.gradle.internal.resource.local.FileStore;
 import org.gradle.util.DeprecationLogger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,29 +43,29 @@
 import java.net.URI;
 import java.util.*;
 
-public class MavenResolver extends ExternalResourceResolver implements PatternBasedResolver {
+public class MavenResolver extends ExternalResourceResolver {
     private static final Logger LOGGER = LoggerFactory.getLogger(MavenResolver.class);
-    private final RepositoryTransport transport;
-    private final String root;
-    private final List<String> artifactRoots = new ArrayList<String>();
+    private final URI root;
+    private final List<URI> artifactRoots = new ArrayList<URI>();
     private String pattern = MavenPattern.M2_PATTERN;
     private boolean usepoms = true;
     private boolean useMavenMetadata = true;
     private final MavenMetadataLoader mavenMetaDataLoader;
+    private final MetaDataParser metaDataParser;
 
     public MavenResolver(String name, URI rootUri, RepositoryTransport transport,
                          LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> locallyAvailableResourceFinder,
-                         ResolverStrategy resolverStrategy) {
-        super(name, transport.getRepository(),
+                         ResolverStrategy resolverStrategy, FileStore<ModuleVersionArtifactMetaData> artifactFileStore) {
+        super(name, transport.isLocal(),
+                transport.getRepository(),
+                transport.getResourceAccessor(),
                 new ChainedVersionLister(new MavenVersionLister(transport.getRepository()), new ResourceVersionLister(transport.getRepository())),
-                locallyAvailableResourceFinder, new GradlePomModuleDescriptorParser(), resolverStrategy);
-        transport.configureCacheManager(this);
-
+                locallyAvailableResourceFinder,
+                resolverStrategy,
+                artifactFileStore);
+        this.metaDataParser = new GradlePomModuleDescriptorParser();
         this.mavenMetaDataLoader = new MavenMetadataLoader(transport.getRepository());
-        this.transport = transport;
-        this.root = transport.convertToPath(rootUri);
-
-        super.setM2compatible(true);
+        this.root = rootUri;
 
         // SNAPSHOT revisions are changing revisions
         setChangingMatcher(PatternMatcher.REGEXP);
@@ -71,114 +74,96 @@ public MavenResolver(String name, URI rootUri, RepositoryTransport transport,
         updatePatterns();
     }
 
-    public void getDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result) {
-        if (isSnapshotVersion(dependency)) {
-            final TimestampedModuleSource uniqueSnapshotVersion = findUniqueSnapshotVersion(dependency.getDescriptor().getDependencyRevisionId());
+    public String getRoot() {
+        return root.toString();
+    }
+
+    protected void doResolveComponentMetaData(DependencyMetaData dependency, ModuleComponentIdentifier moduleComponentIdentifier, BuildableModuleVersionMetaDataResolveResult result) {
+        if (isSnapshotVersion(moduleComponentIdentifier)) {
+            final MavenUniqueSnapshotModuleSource uniqueSnapshotVersion = findUniqueSnapshotVersion(moduleComponentIdentifier);
             if (uniqueSnapshotVersion != null) {
-                resolveUniqueSnapshotDependency(dependency, result, uniqueSnapshotVersion);
+                resolveUniqueSnapshotDependency(dependency, moduleComponentIdentifier, result, uniqueSnapshotVersion);
                 return;
             }
         }
 
-        resolveStaticDependency(dependency, result, createArtifactResolver());
+        resolveStaticDependency(dependency, moduleComponentIdentifier, result, super.createArtifactResolver());
     }
 
     @Override
-    protected boolean isMetaDataArtifact(Class<? extends SoftwareArtifact> artifactType) {
+    protected boolean isMetaDataArtifact(Class<? extends Artifact> artifactType) {
         return artifactType == MavenPomArtifact.class;
     }
 
-    private void resolveUniqueSnapshotDependency(DependencyMetaData dependency, BuildableModuleVersionMetaDataResolveResult result, TimestampedModuleSource snapshotSource) {
-        resolveStaticDependency(dependency, result, createArtifactResolver(snapshotSource));
+    private void resolveUniqueSnapshotDependency(DependencyMetaData dependency, ModuleComponentIdentifier module, BuildableModuleVersionMetaDataResolveResult result, MavenUniqueSnapshotModuleSource snapshotSource) {
+        resolveStaticDependency(dependency, module, result, createArtifactResolver(snapshotSource));
         if (result.getState() == BuildableModuleVersionMetaDataResolveResult.State.Resolved) {
             result.setModuleSource(snapshotSource);
         }
     }
 
-    private boolean isSnapshotVersion(DependencyMetaData dd) {
-        return dd.getRequested().getVersion().endsWith("SNAPSHOT");
+    private boolean isSnapshotVersion(ModuleComponentIdentifier module) {
+        return module.getVersion().endsWith("SNAPSHOT");
     }
 
     @Override
-    protected ArtifactResolver createArtifactResolver(ModuleSource moduleSource) {
-
-        if (moduleSource instanceof TimestampedModuleSource) {
+    protected ExternalResourceArtifactResolver createArtifactResolver(ModuleSource moduleSource) {
 
-            final String timestampedVersion = ((TimestampedModuleSource) moduleSource).getTimestampedVersion();
-            Transformer<String, String> patternTransformer = new Transformer<String, String>() {
-                public String transform(String original) {
-                    return original.replaceFirst("\\-\\[revision\\]", "-" + timestampedVersion);
-                }
-            };
-            return new ArtifactResolver(
-                    CollectionUtils.collect(getIvyPatterns(), patternTransformer),
-                    CollectionUtils.collect(getArtifactPatterns(), patternTransformer));
+        if (moduleSource instanceof MavenUniqueSnapshotModuleSource) {
+            final String timestamp = ((MavenUniqueSnapshotModuleSource) moduleSource).getTimestamp();
+            return new MavenUniqueSnapshotExternalResourceArtifactResolver(super.createArtifactResolver(moduleSource), timestamp);
         }
 
         return super.createArtifactResolver(moduleSource);
     }
 
-    public void addArtifactLocation(URI baseUri, String pattern) {
-        if (pattern != null && pattern.length() > 0) {
-            throw new IllegalArgumentException("Maven Resolver only supports a single pattern. It cannot be provided on a per-location basis.");
-        }
-        artifactRoots.add(transport.convertToPath(baseUri));
-
+    public void addArtifactLocation(URI baseUri) {
+        artifactRoots.add(baseUri);
         updatePatterns();
     }
 
-    public void addDescriptorLocation(URI baseUri, String pattern) {
-        throw new UnsupportedOperationException("Cannot have multiple descriptor urls for MavenResolver");
-    }
-
-    private String getWholePattern() {
-        return root + pattern;
+    private M2ResourcePattern getWholePattern() {
+        return new M2ResourcePattern(root, pattern);
     }
 
     private void updatePatterns() {
         if (isUsepoms()) {
             setIvyPatterns(Collections.singletonList(getWholePattern()));
         } else {
-            setIvyPatterns(Collections.<String>emptyList());
+            setIvyPatterns(Collections.<ResourcePattern>emptyList());
         }
 
-        List<String> artifactPatterns = new ArrayList<String>();
+        List<ResourcePattern> artifactPatterns = new ArrayList<ResourcePattern>();
         artifactPatterns.add(getWholePattern());
-        for (String artifactRoot : artifactRoots) {
-            artifactPatterns.add(artifactRoot + pattern);
+        for (URI artifactRoot : artifactRoots) {
+            artifactPatterns.add(new M2ResourcePattern(artifactRoot, pattern));
         }
         setArtifactPatterns(artifactPatterns);
     }
 
     @Override
-    protected ModuleVersionArtifactMetaData getMetaDataArtifactFor(ModuleVersionIdentifier moduleVersionIdentifier) {
+    protected IvyArtifactName getMetaDataArtifactName(String moduleName) {
         if (isUsepoms()) {
-            DefaultModuleVersionArtifactIdentifier artifactId = new DefaultModuleVersionArtifactIdentifier(moduleVersionIdentifier, moduleVersionIdentifier.getName(), "pom", "pom");
-            return new DefaultModuleVersionArtifactMetaData(artifactId);
+            return new DefaultIvyArtifactName(moduleName, "pom", "pom");
         }
 
         return null;
     }
 
-    private TimestampedModuleSource findUniqueSnapshotVersion(ModuleRevisionId moduleRevisionId) {
-        ModuleVersionIdentifier moduleVersionIdentifier = DefaultModuleVersionIdentifier.newId(moduleRevisionId);
-        ModuleVersionArtifactIdentifier artifactId = new DefaultModuleVersionArtifactIdentifier(moduleVersionIdentifier, moduleVersionIdentifier.getName(), "pom", "pom");
-        DefaultModuleVersionArtifactMetaData pomArtifact = new DefaultModuleVersionArtifactMetaData(artifactId);
-        String metadataLocation = toResourcePattern(getWholePattern()).toModuleVersionPath(pomArtifact) + "/maven-metadata.xml";
+    private MavenUniqueSnapshotModuleSource findUniqueSnapshotVersion(ModuleComponentIdentifier module) {
+        String metadataLocation = getWholePattern().toModuleVersionPath(module).resolve("maven-metadata.xml").getUri().toString();
         MavenMetadata mavenMetadata = parseMavenMetadata(metadataLocation);
 
         if (mavenMetadata.timestamp != null) {
             // we have found a timestamp, so this is a snapshot unique version
-            String rev = moduleRevisionId.getRevision();
-            rev = rev.substring(0, rev.length() - "SNAPSHOT".length());
-            rev = rev + mavenMetadata.timestamp + "-" + mavenMetadata.buildNumber;
-            return new TimestampedModuleSource(rev);
+            String timestamp = String.format("%s-%s", mavenMetadata.timestamp, mavenMetadata.buildNumber);
+            return new MavenUniqueSnapshotModuleSource(timestamp);
         }
         return null;
     }
 
     private MavenMetadata parseMavenMetadata(String metadataLocation) {
-        if (shouldUseMavenMetadata(pattern)) {
+        if (isUseMavenMetadata()) {
             try {
                 return mavenMetaDataLoader.load(metadataLocation);
             } catch (ResourceNotFoundException e) {
@@ -217,59 +202,81 @@ public void setUseMavenMetadata(boolean useMavenMetadata) {
         }
     }
 
-    private boolean shouldUseMavenMetadata(String pattern) {
-        return isUseMavenMetadata() && pattern.endsWith(MavenPattern.M2_PATTERN);
+    @Override
+    public boolean isM2compatible() {
+        return true;
     }
 
-    public String getPattern() {
-        return pattern;
+    public ModuleComponentRepositoryAccess getLocalAccess() {
+        return new MavenLocalRepositoryAccess();
     }
 
-    public void setPattern(String pattern) {
-        if (pattern == null) {
-            throw new NullPointerException("pattern must not be null");
-        }
-        this.pattern = pattern;
-        updatePatterns();
+    public ModuleComponentRepositoryAccess getRemoteAccess() {
+        return new MavenRemoteRepositoryAccess();
     }
 
-    public String getRoot() {
-        return root;
+    @Override
+    protected MutableModuleVersionMetaData createMetaDataForDependency(DependencyMetaData dependency) {
+        return new DefaultMavenModuleVersionMetaData(dependency);
     }
 
-    public void setRoot(String root) {
-        throw new UnsupportedOperationException("Cannot configure root on mavenRepo. Use 'url' property instead.");
+    protected MutableModuleVersionMetaData parseMetaDataFromResource(LocallyAvailableExternalResource cachedResource, DescriptorParseContext context) {
+        return metaDataParser.parseMetaData(context, cachedResource);
     }
 
-    @Override
-    public void setM2compatible(boolean compatible) {
-        if (!compatible) {
-            throw new IllegalArgumentException("Cannot set m2compatible = false on mavenRepo.");
+    protected static MavenModuleVersionMetaData mavenMetaData(ModuleVersionMetaData metaData) {
+        return Transformers.cast(MavenModuleVersionMetaData.class).transform(metaData);
+    }
+
+    private class MavenLocalRepositoryAccess extends LocalRepositoryAccess {
+        @Override
+        protected void resolveConfigurationArtifacts(ModuleVersionMetaData module, ConfigurationMetaData configuration, BuildableArtifactSetResolveResult result) {
+            if (mavenMetaData(module).isKnownJarPackaging()) {
+                ModuleVersionArtifactMetaData artifact = module.artifact("jar", "jar", null);
+                result.resolved(ImmutableSet.of(artifact));
+            }
+        }
+
+        @Override
+        protected void resolveJavadocArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            // Javadoc artifacts are optional, so we need to probe for them remotely
+        }
+
+        @Override
+        protected void resolveSourceArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            // Javadoc artifacts are optional, so we need to probe for them remotely
         }
     }
 
-    @Override
-    protected void resolveConfigurationArtifacts(ModuleVersionMetaData module, ConfigurationMetaData configuration, BuildableArtifactSetResolveResult result, boolean localOnly) {
-        if (module.isMetaDataOnly()) {
-            if (!localOnly) {
-                Set<ComponentArtifactMetaData> artifacts = new LinkedHashSet<ComponentArtifactMetaData>(configuration.getArtifacts());
+    private class MavenRemoteRepositoryAccess extends RemoteRepositoryAccess {
+        @Override
+        protected void resolveConfigurationArtifacts(ModuleVersionMetaData module, ConfigurationMetaData configuration, BuildableArtifactSetResolveResult result) {
+            MavenModuleVersionMetaData mavenMetaData = mavenMetaData(module);
+            if (mavenMetaData.isPomPackaging()) {
+                Set<ComponentArtifactMetaData> artifacts = new LinkedHashSet<ComponentArtifactMetaData>();
                 artifacts.addAll(findOptionalArtifacts(module, "jar", null));
                 result.resolved(artifacts);
+            } else {
+                ModuleVersionArtifactMetaData artifactMetaData = module.artifact(mavenMetaData.getPackaging(), mavenMetaData.getPackaging(), null);
+
+                if (createArtifactResolver(module.getSource()).artifactExists(artifactMetaData)) {
+                    DeprecationLogger.nagUserOfDeprecated("Relying on packaging to define the extension of the main artifact");
+                    result.resolved(ImmutableSet.of(artifactMetaData));
+                } else {
+                    ModuleVersionArtifactMetaData artifact = module.artifact("jar", "jar", null);
+                    result.resolved(ImmutableSet.of(artifact));
+                }
             }
-        } else {
-            result.resolved(configuration.getArtifacts());
         }
-    }
 
-    protected static class TimestampedModuleSource implements ModuleSource {
-        public String getTimestampedVersion() {
-            return timestampedVersion;
+        @Override
+        protected void resolveJavadocArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            result.resolved(findOptionalArtifacts(module, "javadoc", "javadoc"));
         }
 
-        private final String timestampedVersion;
-
-        public TimestampedModuleSource(String uniqueSnapshotVersion) {
-            this.timestampedVersion = uniqueSnapshotVersion;
+        @Override
+        protected void resolveSourceArtifacts(ModuleVersionMetaData module, BuildableArtifactSetResolveResult result) {
+            result.resolved(findOptionalArtifacts(module, "source", "sources"));
         }
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotComponentIdentifier.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotComponentIdentifier.java
new file mode 100644
index 000000000000..c749a2efff76
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotComponentIdentifier.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.repositories.resolver;
+
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier;
+
+/**
+ * A component identifier for a Maven unique snapshot module.
+ */
+public class MavenUniqueSnapshotComponentIdentifier extends DefaultModuleComponentIdentifier {
+    private final String timestamp;
+
+    public MavenUniqueSnapshotComponentIdentifier(String group, String module, String version, String timestamp) {
+        super(group, module, version);
+        this.timestamp = timestamp;
+    }
+
+    public MavenUniqueSnapshotComponentIdentifier(ModuleComponentIdentifier baseIdentifier, String timestamp) {
+        super(baseIdentifier.getGroup(), baseIdentifier.getModule(), baseIdentifier.getVersion());
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o) && ((MavenUniqueSnapshotComponentIdentifier) o).timestamp.equals(timestamp);
+    }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode() + timestamp.hashCode();
+    }
+
+    @Override
+    public String getDisplayName() {
+        return String.format("%s:%s", super.getDisplayName(), timestamp);
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public String getTimestampedVersion() {
+        return getVersion().replace("SNAPSHOT", timestamp);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotExternalResourceArtifactResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotExternalResourceArtifactResolver.java
new file mode 100644
index 000000000000..2f3ef9fd1707
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotExternalResourceArtifactResolver.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.repositories.resolver;
+
+import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactMetaData;
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+
+class MavenUniqueSnapshotExternalResourceArtifactResolver implements ExternalResourceArtifactResolver {
+    private final ExternalResourceArtifactResolver delegate;
+    private final String timestamp;
+
+    public MavenUniqueSnapshotExternalResourceArtifactResolver(ExternalResourceArtifactResolver delegate, String timestamp) {
+        this.delegate = delegate;
+        this.timestamp = timestamp;
+    }
+
+    public boolean artifactExists(ModuleVersionArtifactMetaData artifact) {
+        return delegate.artifactExists(timestamp(artifact));
+    }
+
+    public LocallyAvailableExternalResource resolveArtifact(ModuleVersionArtifactMetaData artifact) {
+        return delegate.resolveArtifact(timestamp(artifact));
+    }
+
+    public LocallyAvailableExternalResource resolveMetaDataArtifact(ModuleVersionArtifactMetaData artifact) {
+        return delegate.resolveMetaDataArtifact(timestamp(artifact));
+    }
+
+    protected ModuleVersionArtifactMetaData timestamp(ModuleVersionArtifactMetaData artifact) {
+        MavenUniqueSnapshotComponentIdentifier snapshotComponentIdentifier =
+                new MavenUniqueSnapshotComponentIdentifier(artifact.getId().getComponentIdentifier(), timestamp);
+        return new DefaultModuleVersionArtifactMetaData(snapshotComponentIdentifier, artifact.getName());
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapper.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotModuleSource.java
similarity index 60%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapper.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotModuleSource.java
index 20b694d8a8f5..5c7795a33210 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/OutputClassMapper.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotModuleSource.java
@@ -13,20 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package org.gradle.api.internal.artifacts.repositories.resolver;
 
-package org.gradle.api.internal.tasks.compile.incremental;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource;
 
-import java.io.File;
+class MavenUniqueSnapshotModuleSource implements ModuleSource {
+    private final String timestamp;
 
-public class OutputClassMapper {
-
-    private File destinationDir;
-
-    public OutputClassMapper(File destinationDir) {
-        this.destinationDir = destinationDir;
+    MavenUniqueSnapshotModuleSource(String timestamp) {
+        this.timestamp = timestamp;
     }
 
-    public File getOutputFile(String className) {
-        return new File(destinationDir, className.replaceAll("\\.", "/").concat(".class")); //TODO SF duplicated
+    public String getTimestamp() {
+        return timestamp;
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionLister.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionLister.java
index 31f4521b7cf2..c1a5fbcc8e0e 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionLister.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionLister.java
@@ -17,9 +17,9 @@
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
 import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository;
-import org.gradle.api.internal.resource.ResourceException;
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
+import org.gradle.internal.resource.ResourceException;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -35,14 +35,14 @@ public VersionList getVersionList(final ModuleIdentifier module) {
         return new DefaultVersionList() {
             final Set<String> searched = new HashSet<String>();
 
-            public void visit(ResourcePattern resourcePattern, ModuleVersionArtifactMetaData artifact) throws ResourceException {
-                String metadataLocation = resourcePattern.toModulePath(module) + "/maven-metadata.xml";
+            public void visit(ResourcePattern pattern, IvyArtifactName artifact) throws ResourceException {
+                String metadataLocation = pattern.toModulePath(module).resolve("maven-metadata.xml").getUri().toString();
                 if (!searched.add(metadataLocation)) {
                     return;
                 }
                 MavenMetadata mavenMetaData = mavenMetadataLoader.load(metadataLocation);
                 for (String version : mavenMetaData.versions) {
-                    add(new ListedVersion(version, resourcePattern));
+                    add(new ListedVersion(version, pattern));
                 }
             }
         };
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/PatternBasedResolver.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/PatternBasedResolver.java
index 3bdb961a01f4..f952dccb3d8f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/PatternBasedResolver.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/PatternBasedResolver.java
@@ -16,16 +16,14 @@
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
 import java.net.URI;
-import java.util.List;
 
 public interface PatternBasedResolver {
-    void addArtifactLocation(URI baseUri, String pattern);
-
-    void addDescriptorLocation(URI baseUri, String pattern);
-
+    /**
+     * Must be called before any patterns are added.
+     */
     void setM2compatible(boolean b);
 
-    List<String> getIvyPatterns();
+    void addArtifactLocation(URI baseUri, String pattern);
 
-    List<String> getArtifactPatterns();
+    void addDescriptorLocation(URI baseUri, String pattern);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourcePattern.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourcePattern.java
index a22e1b82df4c..5e4782975384 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourcePattern.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourcePattern.java
@@ -17,27 +17,35 @@
 package org.gradle.api.internal.artifacts.repositories.resolver;
 
 import org.gradle.api.artifacts.ModuleIdentifier;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
+import org.gradle.internal.resource.ExternalResourceName;
 
 public interface ResourcePattern {
     /**
-     * Returns the path to the given artifact.
+     * Returns this pattern converted to a String.
      */
-    String toPath(ModuleVersionArtifactMetaData artifact);
+    String getPattern();
+
+    /**
+     * Returns the path for the given artifact.
+     */
+    ExternalResourceName getLocation(ModuleVersionArtifactMetaData artifact);
 
     /**
      * Returns the pattern which can be used to search for versions of the given artifact.
      * The returned pattern should include at least one [revision] placeholder.
      */
-    String toVersionListPattern(ModuleVersionArtifactMetaData artifact);
+    ExternalResourceName toVersionListPattern(ModuleIdentifier module, IvyArtifactName artifact);
 
     /**
-     * Returns the path to the given module.
+     * Returns the path for the given module.
      */
-    String toModulePath(ModuleIdentifier moduleIdentifier);
+    ExternalResourceName toModulePath(ModuleIdentifier moduleIdentifier);
 
     /**
-     * Returns the path to the module version for the given artifact.
+     * Returns the path for the given component.
      */
-    String toModuleVersionPath(ModuleVersionArtifactMetaData artifact);
+    ExternalResourceName toModuleVersionPath(ModuleComponentIdentifier componentIdentifier);
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionLister.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionLister.java
index 82996050f72a..48fef4fcfc9e 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionLister.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionLister.java
@@ -18,13 +18,15 @@
 
 import org.apache.ivy.core.IvyPatternHelper;
 import org.gradle.api.artifacts.ModuleIdentifier;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository;
-import org.gradle.api.internal.resource.ResourceException;
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
+import org.gradle.internal.resource.ExternalResourceName;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
+import org.gradle.internal.resource.ResourceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -43,41 +45,43 @@ public ResourceVersionLister(ExternalResourceRepository repository) {
 
     public VersionList getVersionList(final ModuleIdentifier module) {
         return new DefaultVersionList() {
-            final Set<String> directories = new HashSet<String>();
+            final Set<URI> directories = new HashSet<URI>();
 
-            public void visit(ResourcePattern resourcePattern, ModuleVersionArtifactMetaData artifact) throws ResourceException {
-                String partiallyResolvedPattern = resourcePattern.toVersionListPattern(artifact);
-                LOGGER.debug("Listing all in {}", partiallyResolvedPattern);
+            public void visit(ResourcePattern pattern, IvyArtifactName artifact) throws ResourceException {
+                ExternalResourceName versionListPattern = pattern.toVersionListPattern(module, artifact);
+                LOGGER.debug("Listing all in {}", versionListPattern);
                 try {
-                    List<String> versionStrings = listRevisionToken(partiallyResolvedPattern);
+                    List<String> versionStrings = listRevisionToken(versionListPattern);
                     for (String versionString : versionStrings) {
-                        add(new ListedVersion(versionString, resourcePattern));
+                        add(new ListedVersion(versionString, pattern));
                     }
                 } catch (ResourceException e) {
                     throw e;
                 } catch (Exception e) {
-                    throw new ResourceException(String.format("Could not list versions using %s.", resourcePattern), e);
+                    throw new ResourceException(String.format("Could not list versions using %s.", pattern), e);
                 }
             }
 
             // lists all the values a revision token listed by a given url lister
-            private List<String> listRevisionToken(String pattern) throws IOException {
-                pattern = standardize(pattern);
+            private List<String> listRevisionToken(ExternalResourceName versionListPattern) throws IOException {
+                String pattern = versionListPattern.getPath();
                 if (!pattern.contains(REVISION_TOKEN)) {
                     LOGGER.debug("revision token not defined in pattern {}.", pattern);
                     return Collections.emptyList();
                 }
                 String prefix = pattern.substring(0, pattern.indexOf(REVISION_TOKEN));
                 if (revisionMatchesDirectoryName(pattern)) {
-                    return listAll(prefix);
+                    ExternalResourceName parent = versionListPattern.getRoot().resolve(prefix);
+                    return listAll(parent.getUri());
                 } else {
                     int parentFolderSlashIndex = prefix.lastIndexOf(fileSeparator);
                     String revisionParentFolder = parentFolderSlashIndex == -1 ? "" : prefix.substring(0, parentFolderSlashIndex + 1);
+                    ExternalResourceName parent = versionListPattern.getRoot().resolve(revisionParentFolder);
                     LOGGER.debug("using {} to list all in {} ", repository, revisionParentFolder);
-                    if (!directories.add(revisionParentFolder)) {
+                    if (!directories.add(parent.getUri())) {
                         return Collections.emptyList();
                     }
-                    List<String> all = repository.list(revisionParentFolder);
+                    List<String> all = repository.list(parent.getUri());
                     if (all == null) {
                         return Collections.emptyList();
                     }
@@ -89,10 +93,6 @@ private List<String> listRevisionToken(String pattern) throws IOException {
                 }
             }
 
-            private String standardize(String source) {
-                return source.replace('\\', '/');
-            }
-
             private List<String> filterMatchedValues(List<String> all, final Pattern p) {
                 List<String> ret = new ArrayList<String>(all.size());
                 for (String path : all) {
@@ -115,10 +115,7 @@ private Pattern createRegexPattern(String pattern, int prefixLastSlashIndex) {
                 }
                 namePattern = namePattern.replaceAll("\\.", "\\\\.");
 
-                String acceptNamePattern = ".*?"
-                        + namePattern.replaceAll("\\[revision\\]", "([^" + fileSeparator + "]+)")
-                        + "($|" + fileSeparator + ".*)";
-
+                String acceptNamePattern = namePattern.replaceAll("\\[revision\\]", "(.+)");
                 return Pattern.compile(acceptNamePattern);
             }
 
@@ -136,29 +133,17 @@ private boolean revisionMatchesDirectoryName(String pattern) {
                 return true;
             }
 
-            private List<String> listAll(String parent) throws IOException {
+            private List<String> listAll(URI parent) throws IOException {
                 if (!directories.add(parent)) {
                     return Collections.emptyList();
                 }
                 LOGGER.debug("using {} to list all in {}", repository, parent);
-                List<String> fullPaths = repository.list(parent);
-                if (fullPaths == null) {
+                List<String> paths = repository.list(parent);
+                if (paths == null) {
                     return Collections.emptyList();
                 }
-                LOGGER.debug("found {} resources", fullPaths.size());
-                return extractVersionInfoFromPaths(fullPaths);
-            }
-
-            private List<String> extractVersionInfoFromPaths(List<String> paths) {
-                List<String> ret = new ArrayList<String>(paths.size());
-                for (String fullpath : paths) {
-                    if (fullpath.endsWith(fileSeparator)) {
-                        fullpath = fullpath.substring(0, fullpath.length() - 1);
-                    }
-                    int slashIndex = fullpath.lastIndexOf(fileSeparator);
-                    ret.add(fullpath.substring(slashIndex + 1));
-                }
-                return ret;
+                LOGGER.debug("found {} resources", paths.size());
+                return paths;
             }
         };
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VerifyingExternalResourceDownloader.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VerifyingExternalResourceDownloader.java
deleted file mode 100644
index c3dd43a760cc..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VerifyingExternalResourceDownloader.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.repositories.resolver;
-
-import org.apache.ivy.util.ChecksumHelper;
-import org.gradle.api.internal.artifacts.repositories.cachemanager.RepositoryArtifactCache;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository;
-import org.gradle.util.GFileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.io.IOException;
-
-class VerifyingExternalResourceDownloader implements RepositoryArtifactCache.ExternalResourceDownloader {
-    private static final Logger LOGGER = LoggerFactory.getLogger(VerifyingExternalResourceDownloader.class);
-
-    private final ExternalResourceRepository repository;
-    private final String[] checksumAlgorithms;
-
-    VerifyingExternalResourceDownloader(String[] checksumAlgorithms, ExternalResourceRepository repository) {
-        this.checksumAlgorithms = checksumAlgorithms;
-        this.repository = repository;
-    }
-
-    public void download(ExternalResource resource, File dest) throws IOException {
-        get(resource, dest);
-        verifyChecksums(resource, dest);
-    }
-
-    private void get(ExternalResource resource, File destination) throws IOException {
-        LOGGER.debug("Downloading {} to {}", resource.getName(), destination);
-        if (destination.getParentFile() != null) {
-            GFileUtils.mkdirs(destination.getParentFile());
-        }
-
-        try {
-            resource.writeTo(destination);
-        } finally {
-            resource.close();
-        }
-    }
-
-    private void verifyChecksums(ExternalResource resource, File dest) throws IOException {
-        boolean checked = false;
-        for (int i = 0; i < checksumAlgorithms.length && !checked; i++) {
-            checked = check(resource, dest, checksumAlgorithms[i]);
-        }
-    }
-
-    private boolean check(ExternalResource resource, File dest, String algorithm) throws IOException {
-        if (!ChecksumHelper.isKnownAlgorithm(algorithm)) {
-            throw new IllegalArgumentException("Unknown checksum algorithm: " + algorithm);
-        }
-
-        ExternalResource checksumResource = repository.getResource(resource.getName() + "." + algorithm);
-        if (checksumResource != null && checksumResource.exists()) {
-            LOGGER.debug(algorithm + " file found for " + resource + ": checking...");
-            File csFile = File.createTempFile("ivytmp", algorithm);
-            try {
-                get(checksumResource, csFile);
-                ChecksumHelper.check(dest, csFile, algorithm);
-                LOGGER.debug("{} OK for {}", algorithm, resource);
-                return true;
-            } finally {
-                csFile.delete();
-            }
-        } else {
-            return false;
-        }
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VersionList.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VersionList.java
index 588c834af263..dbcc849060b1 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VersionList.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/resolver/VersionList.java
@@ -18,8 +18,8 @@
 
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.Versioned;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy;
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
-import org.gradle.api.internal.resource.ResourceException;
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName;
+import org.gradle.internal.resource.ResourceException;
 
 import java.util.List;
 import java.util.Set;
@@ -32,7 +32,7 @@ public interface VersionList {
      * 
      * @throws ResourceException If information for versions cannot be loaded.
      */
-    void visit(ResourcePattern pattern, ModuleVersionArtifactMetaData artifact) throws ResourceException;
+    void visit(ResourcePattern pattern, IvyArtifactName artifact) throws ResourceException;
 
     Set<ListedVersion> getVersions();
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/ProgressLoggingTransferListener.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/ProgressLoggingTransferListener.java
index 8013e059be1e..f78d6fab2753 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/ProgressLoggingTransferListener.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/ProgressLoggingTransferListener.java
@@ -18,8 +18,8 @@
 import org.apache.ivy.plugins.repository.Resource;
 import org.apache.ivy.plugins.repository.TransferEvent;
 import org.apache.ivy.plugins.repository.TransferListener;
-import org.gradle.api.internal.externalresource.transfer.AbstractProgressLoggingHandler;
-import org.gradle.api.internal.externalresource.transfer.ResourceOperation;
+import org.gradle.internal.resource.transfer.AbstractProgressLoggingHandler;
+import org.gradle.internal.resource.transfer.ResourceOperation;
 import org.gradle.logging.ProgressLoggerFactory;
 
 public class ProgressLoggingTransferListener extends AbstractProgressLoggingHandler implements TransferListener {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransport.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransport.java
index 910735c53a14..48120eeddb6a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransport.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransport.java
@@ -15,15 +15,13 @@
  */
 package org.gradle.api.internal.artifacts.repositories.transport;
 
-import org.gradle.api.internal.artifacts.repositories.resolver.ExternalResourceResolver;
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository;
-
-import java.net.URI;
+import org.gradle.internal.resource.transfer.CacheAwareExternalResourceAccessor;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
 
 public interface RepositoryTransport {
     ExternalResourceRepository getRepository();
 
-    void configureCacheManager(ExternalResourceResolver resolver);
+    CacheAwareExternalResourceAccessor getResourceAccessor();
 
-    String convertToPath(URI uri);
+    boolean isLocal();
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactory.java
index 7a63dcb23e64..a3e981051cc9 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactory.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactory.java
@@ -15,42 +15,79 @@
  */
 package org.gradle.api.internal.artifacts.repositories.transport;
 
+import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.artifacts.repositories.PasswordCredentials;
-import org.gradle.api.internal.artifacts.repositories.cachemanager.RepositoryArtifactCache;
-import org.gradle.api.internal.externalresource.cached.CachedExternalResourceIndex;
-import org.gradle.api.internal.externalresource.transport.file.FileTransport;
-import org.gradle.api.internal.externalresource.transport.http.HttpTransport;
+import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
+import org.gradle.internal.resource.cached.CachedExternalResourceIndex;
+import org.gradle.internal.resource.transport.file.FileTransport;
+import org.gradle.internal.resource.transport.http.HttpTransport;
+import org.gradle.internal.resource.transport.sftp.SftpClientFactory;
+import org.gradle.internal.resource.transport.sftp.SftpTransport;
 import org.gradle.api.internal.file.TemporaryFileProvider;
 import org.gradle.logging.ProgressLoggerFactory;
 import org.gradle.util.BuildCommencedTimeProvider;
+import org.gradle.util.WrapUtil;
+
+import java.util.HashSet;
+import java.util.Set;
 
 public class RepositoryTransportFactory {
-    private final RepositoryArtifactCache downloadingCacheManager;
     private final TemporaryFileProvider temporaryFileProvider;
     private final CachedExternalResourceIndex<String> cachedExternalResourceIndex;
-    private final RepositoryArtifactCache localCacheManager;
     private final ProgressLoggerFactory progressLoggerFactory;
     private final BuildCommencedTimeProvider timeProvider;
+    private final SftpClientFactory sftpClientFactory;
+    private final CacheLockingManager cacheLockingManager;
 
     public RepositoryTransportFactory(ProgressLoggerFactory progressLoggerFactory,
-                                      RepositoryArtifactCache localCacheManager,
-                                      RepositoryArtifactCache downloadingCacheManager,
                                       TemporaryFileProvider temporaryFileProvider,
                                       CachedExternalResourceIndex<String> cachedExternalResourceIndex,
-                                      BuildCommencedTimeProvider timeProvider) {
+                                      BuildCommencedTimeProvider timeProvider,
+                                      SftpClientFactory sftpClientFactory,
+                                      CacheLockingManager cacheLockingManager) {
         this.progressLoggerFactory = progressLoggerFactory;
-        this.localCacheManager = localCacheManager;
-        this.downloadingCacheManager = downloadingCacheManager;
         this.temporaryFileProvider = temporaryFileProvider;
         this.cachedExternalResourceIndex = cachedExternalResourceIndex;
         this.timeProvider = timeProvider;
+        this.sftpClientFactory = sftpClientFactory;
+        this.cacheLockingManager = cacheLockingManager;
+    }
+
+    private RepositoryTransport createHttpTransport(String name, PasswordCredentials credentials) {
+        return new HttpTransport(name, convertPasswordCredentials(credentials), progressLoggerFactory, temporaryFileProvider, cachedExternalResourceIndex, timeProvider, cacheLockingManager);
+    }
+
+    private RepositoryTransport createFileTransport(String name) {
+        return new FileTransport(name, temporaryFileProvider);
+    }
+
+    private RepositoryTransport createSftpTransport(String name, PasswordCredentials credentials) {
+        return new SftpTransport(name, convertPasswordCredentials(credentials), progressLoggerFactory, temporaryFileProvider, cachedExternalResourceIndex, timeProvider, sftpClientFactory, cacheLockingManager);
+    }
+
+    public RepositoryTransport createTransport(String scheme, String name, PasswordCredentials credentials) {
+        Set<String> schemes = new HashSet<String>();
+        schemes.add(scheme);
+        return createTransport(schemes, name, credentials);
     }
 
-    public RepositoryTransport createHttpTransport(String name, PasswordCredentials credentials) {
-        return new HttpTransport(name, credentials, downloadingCacheManager, progressLoggerFactory, temporaryFileProvider, cachedExternalResourceIndex, timeProvider);
+    private org.gradle.internal.resource.PasswordCredentials convertPasswordCredentials(PasswordCredentials credentials) {
+        return new org.gradle.internal.resource.PasswordCredentials(credentials.getUsername(), credentials.getPassword());
     }
 
-    public RepositoryTransport createFileTransport(String name) {
-        return new FileTransport(name, localCacheManager, temporaryFileProvider);
+    public RepositoryTransport createTransport(Set<String> schemes, String name, PasswordCredentials credentials) {
+        if (!WrapUtil.toSet("http", "https", "file", "sftp").containsAll(schemes)) {
+            throw new InvalidUserDataException("You may only specify 'file', 'http', 'https' and 'sftp' URLs for a repository.");
+        }
+        if (WrapUtil.toSet("http", "https").containsAll(schemes)) {
+            return createHttpTransport(name, credentials);
+        }
+        if (WrapUtil.toSet("file").containsAll(schemes)) {
+            return createFileTransport(name);
+        }
+        if (WrapUtil.toSet("sftp").containsAll(schemes)) {
+            return createSftpTransport(name, credentials);
+        }
+        throw new InvalidUserDataException("You cannot mix different URL schemes for a single repository. Please declare separate repositories.");
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareComponent.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareComponent.java
deleted file mode 100644
index 829b21449123..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareComponent.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.resolution;
-
-import org.gradle.api.artifacts.component.ComponentIdentifier;
-import org.gradle.api.artifacts.resolution.SoftwareComponent;
-
-public abstract class AbstractSoftwareComponent implements SoftwareComponent {
-    private final ComponentIdentifier componentId;
-
-    protected AbstractSoftwareComponent(ComponentIdentifier componentId) {
-        this.componentId = componentId;
-    }
-
-    public ComponentIdentifier getId() {
-        return componentId;
-    }
-
-    @Override
-    public final boolean equals(Object other) {
-        if (this == other) {
-            return true;
-        }
-
-        if (other == null || getClass() != other.getClass()) {
-            return false;
-        }
-
-        return componentId.equals(((AbstractSoftwareComponent) other).componentId);
-    }
-
-    @Override
-    public final int hashCode() {
-        return componentId.hashCode();
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryResult.java
deleted file mode 100644
index f06fd9f84b1f..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultArtifactResolutionQueryResult.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.resolution;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-import org.gradle.api.artifacts.resolution.ArtifactResolutionQueryResult;
-import org.gradle.api.artifacts.resolution.SoftwareComponent;
-import org.gradle.api.artifacts.resolution.UnresolvedSoftwareComponent;
-
-import java.util.Set;
-
-public class DefaultArtifactResolutionQueryResult implements ArtifactResolutionQueryResult {
-    private final Set<? extends SoftwareComponent> components;
-    private final Set<UnresolvedSoftwareComponent> unresolvedComponents;
-
-    public DefaultArtifactResolutionQueryResult(Set<? extends SoftwareComponent> components, Set<UnresolvedSoftwareComponent> unresolvedComponents) {
-        this.components = components;
-        this.unresolvedComponents = unresolvedComponents;
-    }
-
-    public Set<? extends SoftwareComponent> getComponents() {
-        return components;
-    }
-
-    public <T extends SoftwareComponent> Set<T> getComponents(final Class<T> type) {
-        return Sets.newHashSet(Iterables.filter(components, type));
-    }
-
-    public Set<UnresolvedSoftwareComponent> getUnresolvedComponents() {
-        return unresolvedComponents;
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrary.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrary.java
deleted file mode 100644
index c17ae53e1775..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrary.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.resolution;
-
-import org.gradle.api.artifacts.component.ComponentIdentifier;
-import org.gradle.api.artifacts.resolution.JvmLibrary;
-import org.gradle.api.artifacts.resolution.JvmLibraryJavadocArtifact;
-import org.gradle.api.artifacts.resolution.JvmLibrarySourcesArtifact;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-public class DefaultJvmLibrary extends AbstractSoftwareComponent implements JvmLibrary {
-    private final Set<JvmLibrarySourcesArtifact> sourceArtifacts;
-    private final Set<JvmLibraryJavadocArtifact> javadocArtifacts;
-
-    public DefaultJvmLibrary(ComponentIdentifier componentId,
-                             Set<? extends JvmLibrarySourcesArtifact> sourceArtifacts,
-                             Set<? extends JvmLibraryJavadocArtifact> javadocArtifacts) {
-        super(componentId);
-        this.sourceArtifacts = new LinkedHashSet<JvmLibrarySourcesArtifact>(sourceArtifacts);
-        this.javadocArtifacts = new LinkedHashSet<JvmLibraryJavadocArtifact>(javadocArtifacts);
-    }
-
-    public Set<JvmLibrarySourcesArtifact> getSourcesArtifacts() {
-        return sourceArtifacts;
-    }
-
-    public Set<JvmLibraryJavadocArtifact> getJavadocArtifacts() {
-        return javadocArtifacts;
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultArtifactResolutionResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultArtifactResolutionResult.java
new file mode 100644
index 000000000000..61c32b6ba82b
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultArtifactResolutionResult.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.result;
+
+import com.google.common.collect.Sets;
+import org.gradle.api.Transformer;
+import org.gradle.api.artifacts.result.*;
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact;
+import org.gradle.api.artifacts.result.jvm.JvmLibraryComponent;
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact;
+import org.gradle.api.internal.artifacts.result.jvm.DefaultJavadocArtifact;
+import org.gradle.api.internal.artifacts.result.jvm.DefaultJvmLibraryComponent;
+import org.gradle.api.internal.artifacts.result.jvm.DefaultSourcesArtifact;
+import org.gradle.internal.reflect.DirectInstantiator;
+import org.gradle.internal.reflect.Instantiator;
+import org.gradle.util.CollectionUtils;
+
+import java.util.Set;
+
+// TODO:DAZ Unit tests
+public class DefaultArtifactResolutionResult implements ArtifactResolutionResult {
+    private final Set<ComponentResult> componentResults;
+
+    public DefaultArtifactResolutionResult(Set<ComponentResult> componentResults) {
+        this.componentResults = componentResults;
+    }
+
+    public Set<ComponentResult> getComponents() {
+        return componentResults;
+    }
+
+    public <T extends Component> Set<T> getResolvedComponents(Class<T> type) {
+        if (type.isAssignableFrom(JvmLibraryComponent.class)) {
+            return (Set<T>) getJvmLibraries();
+        }
+        throw new IllegalArgumentException("Not a known component type: " + type);
+    }
+
+    // TODO:DAZ This should live with the JVM model classes
+    private Set<JvmLibraryComponent> getJvmLibraries() {
+        Set<JvmLibraryComponent> libraries = Sets.newLinkedHashSet();
+        for (ComponentResult componentResult : componentResults) {
+            if (componentResult instanceof ResolvedComponentArtifactsResult) {
+                Set<SourcesArtifact> sourcesArtifacts = transform((ResolvedComponentArtifactsResult) componentResult, SourcesArtifact.class, DefaultSourcesArtifact.class);
+                Set<JavadocArtifact> javadocArtifacts = transform((ResolvedComponentArtifactsResult) componentResult, JavadocArtifact.class, DefaultJavadocArtifact.class);
+                libraries.add(new DefaultJvmLibraryComponent(componentResult.getId(), sourcesArtifacts, javadocArtifacts));
+            }
+        }
+        return libraries;
+    }
+
+    private <T extends Artifact, U extends T> Set<T> transform(ResolvedComponentArtifactsResult componentResult, Class<T> type, final Class<U> impl) {
+        Set<ArtifactResult> sourceArtifactResults = componentResult.getArtifacts(type);
+        final Instantiator instantiator = new DirectInstantiator();
+        return CollectionUtils.collect(sourceArtifactResults, new Transformer<T, ArtifactResult>() {
+            public T transform(ArtifactResult original) {
+                if (original instanceof ResolvedArtifactResult) {
+                    return instantiator.newInstance(impl, ((ResolvedArtifactResult) original).getFile());
+                } else {
+                    return instantiator.newInstance(impl, ((UnresolvedArtifactResult) original).getFailure());
+                }
+            }
+        });
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedArtifactResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedArtifactResult.java
new file mode 100644
index 000000000000..84537b287d37
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedArtifactResult.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.result;
+
+import org.gradle.api.artifacts.result.Artifact;
+import org.gradle.api.artifacts.result.ResolvedArtifactResult;
+
+import java.io.File;
+
+public class DefaultResolvedArtifactResult implements ResolvedArtifactResult {
+    private final Class<? extends Artifact> type;
+    private final File file;
+
+    public DefaultResolvedArtifactResult(Class<? extends Artifact> type, File file) {
+        this.type = type;
+        this.file = file;
+    }
+
+    public Class<? extends Artifact> getType() {
+        return type;
+    }
+
+    public File getFile() {
+        return file;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentArtifactsResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentArtifactsResult.java
new file mode 100644
index 000000000000..b0fa6887a51f
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentArtifactsResult.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.result;
+
+import com.google.common.collect.Sets;
+import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.result.Artifact;
+import org.gradle.api.artifacts.result.ArtifactResult;
+import org.gradle.api.artifacts.result.ResolvedComponentArtifactsResult;
+
+import java.util.Set;
+
+public class DefaultResolvedComponentArtifactsResult implements ResolvedComponentArtifactsResult {
+    private final ComponentIdentifier componentIdentifier;
+    private final Set<ArtifactResult> artifactResults = Sets.newHashSet();
+
+    public DefaultResolvedComponentArtifactsResult(ComponentIdentifier componentIdentifier) {
+        this.componentIdentifier = componentIdentifier;
+    }
+
+    public ComponentIdentifier getId() {
+        return componentIdentifier;
+    }
+
+    public Set<ArtifactResult> getArtifacts(Class<? extends Artifact> type) {
+        Set<ArtifactResult> matching = Sets.newLinkedHashSet();
+        for (ArtifactResult artifactResult : artifactResults) {
+            if (type.isAssignableFrom(artifactResult.getType())) {
+                matching.add(artifactResult);
+            }
+        }
+        return matching;
+    }
+
+    public void addArtifact(ArtifactResult artifact) {
+        artifactResults.add(artifact);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultUnresolvedArtifactResult.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultUnresolvedArtifactResult.java
new file mode 100644
index 000000000000..cc6c65b9696f
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultUnresolvedArtifactResult.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.result;
+
+import org.gradle.api.artifacts.result.Artifact;
+import org.gradle.api.artifacts.result.UnresolvedArtifactResult;
+
+public class DefaultUnresolvedArtifactResult implements UnresolvedArtifactResult {
+    private final Class<? extends Artifact> type;
+    private final Throwable failure;
+
+    public DefaultUnresolvedArtifactResult(Class<? extends Artifact> type, Throwable failure) {
+        this.type = type;
+        this.failure = failure;
+    }
+
+    public Class<? extends Artifact> getType() {
+        return type;
+    }
+
+    public Throwable getFailure() {
+        return failure;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultUnresolvedSoftwareComponent.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultUnresolvedComponentResult.java
similarity index 65%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultUnresolvedSoftwareComponent.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultUnresolvedComponentResult.java
index 96a026bdbfda..3c0e8ab16236 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultUnresolvedSoftwareComponent.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/DefaultUnresolvedComponentResult.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.resolution;
+package org.gradle.api.internal.artifacts.result;
 
 import org.gradle.api.artifacts.component.ComponentIdentifier;
-import org.gradle.api.artifacts.resolution.UnresolvedSoftwareComponent;
+import org.gradle.api.artifacts.result.UnresolvedComponentResult;
 
-public class DefaultUnresolvedSoftwareComponent implements UnresolvedSoftwareComponent {
-    private final ComponentIdentifier id;
+public class DefaultUnresolvedComponentResult implements UnresolvedComponentResult {
+    private final ComponentIdentifier componentIdentifier;
     private final Throwable failure;
 
-    public DefaultUnresolvedSoftwareComponent(ComponentIdentifier id, Throwable failure) {
-        this.id = id;
+    public DefaultUnresolvedComponentResult(ComponentIdentifier componentIdentifier, Throwable failure) {
+        this.componentIdentifier = componentIdentifier;
         this.failure = failure;
     }
 
     public ComponentIdentifier getId() {
-        return id;
+        return componentIdentifier;
     }
 
     public Throwable getFailure() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareArtifact.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/AbstractArtifact.java
similarity index 65%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareArtifact.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/AbstractArtifact.java
index f3e3460341bc..c9f5518ea426 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/AbstractSoftwareArtifact.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/AbstractArtifact.java
@@ -13,39 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.resolution;
+package org.gradle.api.internal.artifacts.result.jvm;
 
-import org.gradle.api.GradleException;
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.result.Artifact;
+import org.gradle.internal.UncheckedException;
 
 import java.io.File;
 
-public abstract class AbstractSoftwareArtifact implements SoftwareArtifact {
+public abstract class AbstractArtifact implements Artifact {
     private final File file;
-    private final GradleException failure;
+    private final Throwable failure;
 
-    protected AbstractSoftwareArtifact(File file) {
+    protected AbstractArtifact(File file) {
         this.file = file;
         failure = null;
     }
 
-    protected AbstractSoftwareArtifact(GradleException failure) {
+    protected AbstractArtifact(Throwable failure) {
         file = null;
         this.failure = failure;
     }
 
-    public File getFile() throws GradleException {
+    public File getFile() {
         assertNoFailure();
         return file;
     }
 
-    public GradleException getFailure() {
+    public Throwable getFailure() {
         return failure;
     }
 
     private void assertNoFailure() {
         if (failure != null) {
-            throw failure;
+            throw UncheckedException.throwAsUncheckedException(failure);
         }
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrarySourcesArtifact.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultJavadocArtifact.java
similarity index 63%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrarySourcesArtifact.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultJavadocArtifact.java
index 31082c8b4908..40dd788cc43a 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibrarySourcesArtifact.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultJavadocArtifact.java
@@ -13,19 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.resolution;
+package org.gradle.api.internal.artifacts.result.jvm;
 
-import org.gradle.api.GradleException;
-import org.gradle.api.artifacts.resolution.JvmLibrarySourcesArtifact;
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact;
 
 import java.io.File;
 
-public class DefaultJvmLibrarySourcesArtifact extends AbstractSoftwareArtifact implements JvmLibrarySourcesArtifact {
-    public DefaultJvmLibrarySourcesArtifact(File file) {
+public class DefaultJavadocArtifact extends AbstractArtifact implements JavadocArtifact {
+    public DefaultJavadocArtifact(File file) {
         super(file);
     }
 
-    public DefaultJvmLibrarySourcesArtifact(GradleException failure) {
+    public DefaultJavadocArtifact(Throwable failure) {
         super(failure);
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultJvmLibraryComponent.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultJvmLibraryComponent.java
new file mode 100644
index 000000000000..cef70bb72fd4
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultJvmLibraryComponent.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.result.jvm;
+
+import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.result.Component;
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact;
+import org.gradle.api.artifacts.result.jvm.JvmLibraryComponent;
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+public class DefaultJvmLibraryComponent implements JvmLibraryComponent, Component {
+    private final ComponentIdentifier componentId;
+    private final Set<SourcesArtifact> sourceArtifacts;
+    private final Set<JavadocArtifact> javadocArtifacts;
+
+    public DefaultJvmLibraryComponent(ComponentIdentifier componentId,
+                                      Set<? extends SourcesArtifact> sourceArtifacts,
+                                      Set<? extends JavadocArtifact> javadocArtifacts) {
+        this.componentId = componentId;
+        this.sourceArtifacts = new LinkedHashSet<SourcesArtifact>(sourceArtifacts);
+        this.javadocArtifacts = new LinkedHashSet<JavadocArtifact>(javadocArtifacts);
+    }
+
+    public ComponentIdentifier getId() {
+        return componentId;
+    }
+
+    public Set<SourcesArtifact> getSourcesArtifacts() {
+        return sourceArtifacts;
+    }
+
+    public Set<JavadocArtifact> getJavadocArtifacts() {
+        return javadocArtifacts;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibraryJavadocArtifact.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultSourcesArtifact.java
similarity index 63%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibraryJavadocArtifact.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultSourcesArtifact.java
index f52b9046221c..84146decfc49 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/DefaultJvmLibraryJavadocArtifact.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/jvm/DefaultSourcesArtifact.java
@@ -13,19 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.resolution;
+package org.gradle.api.internal.artifacts.result.jvm;
 
-import org.gradle.api.GradleException;
-import org.gradle.api.artifacts.resolution.JvmLibraryJavadocArtifact;
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact;
 
 import java.io.File;
 
-public class DefaultJvmLibraryJavadocArtifact extends AbstractSoftwareArtifact implements JvmLibraryJavadocArtifact {
-    public DefaultJvmLibraryJavadocArtifact(File file) {
+public class DefaultSourcesArtifact extends AbstractArtifact implements SourcesArtifact {
+    public DefaultSourcesArtifact(File file) {
         super(file);
     }
 
-    public DefaultJvmLibraryJavadocArtifact(GradleException failure) {
+    public DefaultSourcesArtifact(Throwable failure) {
         super(failure);
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/IvyDescriptorArtifact.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/metadata/IvyDescriptorArtifact.java
similarity index 77%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/IvyDescriptorArtifact.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/metadata/IvyDescriptorArtifact.java
index f00b5ae24172..5a7dc166b081 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/IvyDescriptorArtifact.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/metadata/IvyDescriptorArtifact.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.resolution;
+package org.gradle.api.internal.artifacts.result.metadata;
 
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.result.Artifact;
 
-public interface IvyDescriptorArtifact extends SoftwareArtifact {
+public interface IvyDescriptorArtifact extends Artifact {
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/MavenPomArtifact.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/metadata/MavenPomArtifact.java
similarity index 77%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/MavenPomArtifact.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/metadata/MavenPomArtifact.java
index f47e69d0ac0e..b0ed5b53c085 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/MavenPomArtifact.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/result/metadata/MavenPomArtifact.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.artifacts.resolution;
+package org.gradle.api.internal.artifacts.result.metadata;
 
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+import org.gradle.api.artifacts.result.Artifact;
 
-public interface MavenPomArtifact extends SoftwareArtifact {
+public interface MavenPomArtifact extends Artifact {
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/MetaDataOnlyExternalResource.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/MetaDataOnlyExternalResource.java
deleted file mode 100644
index 004b5746d9bc..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/MetaDataOnlyExternalResource.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.externalresource;
-
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-public class MetaDataOnlyExternalResource extends AbstractExternalResource {
-
-    private final ExternalResourceMetaData metaData;
-    private final String source;
-    private final boolean local;
-
-    public MetaDataOnlyExternalResource(String source, ExternalResourceMetaData metaData) {
-        this(source, metaData, false);
-    }
-
-    public MetaDataOnlyExternalResource(String source, ExternalResourceMetaData metaData, boolean local) {
-        this.source = source;
-        this.metaData = metaData;
-        this.local = local;
-    }
-
-    public ExternalResourceMetaData getMetaData() {
-        return metaData;
-    }
-
-    @Override
-    public String toString() {
-        return "MetaDataOnlyResource: " + getName();
-    }
-
-    public String getName() {
-        return source;
-    }
-
-    public boolean exists() {
-        return true;
-    }
-
-    public long getLastModified() {
-        return -1;
-    }
-
-    public long getContentLength() {
-        return -1;
-    }
-
-    public boolean isLocal() {
-        return local;
-    }
-
-    public InputStream openStream() throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/MissingExternalResource.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/MissingExternalResource.java
deleted file mode 100644
index d1dcfaa23ff6..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/MissingExternalResource.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.externalresource;
-
-import org.gradle.api.internal.externalresource.metadata.DefaultExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Sentinel for representing that there is no resource at some source location.
- */
-public class MissingExternalResource extends AbstractExternalResource {
-    private final String source;
-    private final ExternalResourceMetaData metaData;
-
-    public MissingExternalResource(String source) {
-        this.source = source;
-        this.metaData = new DefaultExternalResourceMetaData(source);
-    }
-
-    @Override
-    public String toString() {
-        return "MissingResource: " + getName();
-    }
-
-    public String getName() {
-        return source;
-    }
-
-    public boolean exists() {
-        return false;
-    }
-
-    public long getLastModified() {
-        return -1;
-    }
-
-    public long getContentLength() {
-        return -1;
-    }
-
-    public boolean isLocal() {
-        throw new UnsupportedOperationException();
-    }
-
-    public InputStream openStream() throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    public ExternalResourceMetaData getMetaData() {
-        return this.metaData;
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/CacheAwareExternalResourceAccessor.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/CacheAwareExternalResourceAccessor.java
deleted file mode 100644
index 64b86a92a80b..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/CacheAwareExternalResourceAccessor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.externalresource.transfer;
-
-import org.gradle.api.Nullable;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceCandidates;
-
-import java.io.IOException;
-
-public interface CacheAwareExternalResourceAccessor {
-
-    ExternalResource getResource(String source, @Nullable LocallyAvailableResourceCandidates localCandidates) throws IOException;
-
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/file/FileTransport.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/file/FileTransport.java
deleted file mode 100644
index 240e7d49f23a..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/file/FileTransport.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.externalresource.transport.file;
-
-import org.gradle.api.Nullable;
-import org.gradle.api.internal.artifacts.repositories.cachemanager.RepositoryArtifactCache;
-import org.gradle.api.internal.artifacts.repositories.resolver.ExternalResourceResolver;
-import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceCandidates;
-import org.gradle.api.internal.externalresource.transfer.CacheAwareExternalResourceAccessor;
-import org.gradle.api.internal.externalresource.transport.DefaultExternalResourceRepository;
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository;
-import org.gradle.api.internal.file.TemporaryFileProvider;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URI;
-
-public class FileTransport implements RepositoryTransport {
-    private final String name;
-    private final RepositoryArtifactCache repositoryCacheManager;
-    private final ExternalResourceRepository repository;
-
-    public FileTransport(String name, RepositoryArtifactCache repositoryCacheManager, TemporaryFileProvider temporaryFileProvider) {
-        this.name = name;
-        this.repositoryCacheManager = repositoryCacheManager;
-        repository = createRepository(temporaryFileProvider);
-    }
-
-    public ExternalResourceRepository getRepository() {
-        return repository;
-    }
-
-    public ExternalResourceRepository createRepository(TemporaryFileProvider temporaryFileProvider) {
-        FileResourceConnector connector = new FileResourceConnector();
-        return new DefaultExternalResourceRepository(name, connector, connector, connector, temporaryFileProvider, new NoOpCacheAwareExternalResourceAccessor(connector));
-    }
-
-    public void configureCacheManager(ExternalResourceResolver resolver) {
-        resolver.setRepositoryCacheManager(repositoryCacheManager);
-    }
-
-    public String convertToPath(URI uri) {
-        return normalisePath(new File(uri).getAbsolutePath());
-    }
-
-    private String normalisePath(String path) {
-        if (path.endsWith("/")) {
-            return path;
-        }
-        return path + "/";
-    }
-
-    private static class NoOpCacheAwareExternalResourceAccessor implements CacheAwareExternalResourceAccessor {
-        private final FileResourceConnector connector;
-
-        public NoOpCacheAwareExternalResourceAccessor(FileResourceConnector connector) {
-            this.connector = connector;
-        }
-
-        public ExternalResource getResource(String source, @Nullable LocallyAvailableResourceCandidates localCandidates) throws IOException {
-            return connector.getResource(source);
-        }
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpTransport.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpTransport.java
deleted file mode 100644
index 7696c25f2496..000000000000
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpTransport.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.externalresource.transport.http;
-
-import org.gradle.api.artifacts.repositories.PasswordCredentials;
-import org.gradle.api.internal.artifacts.repositories.cachemanager.RepositoryArtifactCache;
-import org.gradle.api.internal.artifacts.repositories.resolver.ExternalResourceResolver;
-import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport;
-import org.gradle.api.internal.externalresource.cached.CachedExternalResourceIndex;
-import org.gradle.api.internal.externalresource.transfer.DefaultCacheAwareExternalResourceAccessor;
-import org.gradle.api.internal.externalresource.transfer.ProgressLoggingExternalResourceAccessor;
-import org.gradle.api.internal.externalresource.transfer.ProgressLoggingExternalResourceUploader;
-import org.gradle.api.internal.externalresource.transport.DefaultExternalResourceRepository;
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository;
-import org.gradle.api.internal.file.TemporaryFileProvider;
-import org.gradle.logging.ProgressLoggerFactory;
-import org.gradle.util.BuildCommencedTimeProvider;
-
-import java.net.URI;
-
-public class HttpTransport implements RepositoryTransport {
-    private final String name;
-    private final RepositoryArtifactCache repositoryCacheManager;
-    private final ExternalResourceRepository repository;
-
-    public HttpTransport(String name, PasswordCredentials credentials, RepositoryArtifactCache repositoryCacheManager,
-                         ProgressLoggerFactory progressLoggerFactory, TemporaryFileProvider temporaryFileProvider,
-                         CachedExternalResourceIndex<String> cachedExternalResourceIndex, BuildCommencedTimeProvider timeProvider) {
-        this.name = name;
-        this.repositoryCacheManager = repositoryCacheManager;
-        repository = createRepository(credentials, progressLoggerFactory, temporaryFileProvider, cachedExternalResourceIndex, timeProvider);
-    }
-
-    public ExternalResourceRepository getRepository() {
-        return repository;
-    }
-
-    private ExternalResourceRepository createRepository(PasswordCredentials credentials, ProgressLoggerFactory progressLoggerFactory,
-                                                        TemporaryFileProvider temporaryFileProvider, CachedExternalResourceIndex<String> cachedExternalResourceIndex, BuildCommencedTimeProvider timeProvider) {
-        HttpClientHelper http = new HttpClientHelper(new DefaultHttpSettings(credentials));
-        HttpResourceAccessor accessor = new HttpResourceAccessor(http);
-        HttpResourceUploader uploader = new HttpResourceUploader(http);
-        ProgressLoggingExternalResourceAccessor loggingAccessor = new ProgressLoggingExternalResourceAccessor(accessor, progressLoggerFactory);
-        return new DefaultExternalResourceRepository(
-                name,
-                accessor,
-                new ProgressLoggingExternalResourceUploader(uploader, progressLoggerFactory),
-                new HttpResourceLister(accessor),
-                temporaryFileProvider,
-                new DefaultCacheAwareExternalResourceAccessor(loggingAccessor, cachedExternalResourceIndex, timeProvider)
-        );
-    }
-
-    public void configureCacheManager(ExternalResourceResolver resolver) {
-        resolver.setRepositoryCacheManager(repositoryCacheManager);
-    }
-
-    public String convertToPath(URI uri) {
-        return normalisePath(uri.toString());
-    }
-
-    private String normalisePath(String path) {
-        if (path.endsWith("/")) {
-            return path;
-        }
-        return path + "/";
-    }
-}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/filestore/ivy/ArtifactIdentifierFileStore.java b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/filestore/ivy/ArtifactIdentifierFileStore.java
index 311941bb5461..6466e4fadba2 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/filestore/ivy/ArtifactIdentifierFileStore.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/filestore/ivy/ArtifactIdentifierFileStore.java
@@ -21,8 +21,8 @@
 import org.gradle.api.internal.artifacts.repositories.resolver.IvyResourcePattern;
 import org.gradle.api.internal.artifacts.repositories.resolver.ResourcePattern;
 import org.gradle.api.internal.file.TemporaryFileProvider;
-import org.gradle.api.internal.filestore.GroupedAndNamedUniqueFileStore;
-import org.gradle.api.internal.filestore.PathKeyFileStore;
+import org.gradle.internal.resource.local.GroupedAndNamedUniqueFileStore;
+import org.gradle.internal.resource.local.PathKeyFileStore;
 
 public class ArtifactIdentifierFileStore extends GroupedAndNamedUniqueFileStore<ModuleVersionArtifactMetaData> {
 
@@ -37,7 +37,7 @@ private static Transformer<String, ModuleVersionArtifactMetaData> toTransformer(
         final ResourcePattern resourcePattern = new IvyResourcePattern(pattern);
         return new Transformer<String, ModuleVersionArtifactMetaData>() {
              public String transform(ModuleVersionArtifactMetaData artifact) {
-                 return resourcePattern.toPath(artifact);
+                 return resourcePattern.getLocation(artifact).getPath();
              }
          };
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/ByUrlCachedExternalResourceIndex.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ByUrlCachedExternalResourceIndex.java
similarity index 95%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/ByUrlCachedExternalResourceIndex.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ByUrlCachedExternalResourceIndex.java
index e2d910970f8d..b058f97cc1ca 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/ByUrlCachedExternalResourceIndex.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ByUrlCachedExternalResourceIndex.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
 import org.gradle.util.BuildCommencedTimeProvider;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedArtifact.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedArtifact.java
similarity index 92%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedArtifact.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedArtifact.java
index 4d3ec1aef10e..14a3e8b20bf9 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedArtifact.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedArtifact.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
 import java.math.BigInteger;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedArtifactIndex.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedArtifactIndex.java
similarity index 94%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedArtifactIndex.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedArtifactIndex.java
index d4b8b6b592f6..11ca4e8da936 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedArtifactIndex.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedArtifactIndex.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
 import org.gradle.api.Nullable;
-import org.gradle.api.internal.externalresource.ivy.ArtifactAtRepositoryKey;
+import org.gradle.internal.resource.cached.ivy.ArtifactAtRepositoryKey;
 
 import java.io.File;
 import java.math.BigInteger;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResource.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResource.java
similarity index 70%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResource.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResource.java
index 4264581d528d..a50440714248 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResource.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResource.java
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
 import org.gradle.api.Nullable;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 
 import java.util.Date;
 
 /**
  * A record of some kind of external resource that has been cached locally (typically into the filestore).
  *
- * Note that this is not a kind of {@link org.gradle.api.internal.externalresource.ExternalResource}. There is an adapter that can represent a cached resource as an external resource as {@link
+ * Note that this is not a kind of {@link org.gradle.internal.resource.ExternalResource}. There is an adapter that can represent a cached resource as an external resource as {@link
  * CachedExternalResourceAdapter}.
  */
 public interface CachedExternalResource extends CachedItem {
@@ -46,11 +46,4 @@ public interface CachedExternalResource extends CachedItem {
      */
     Date getExternalLastModified();
 
-    /**
-     * Null safe shortcut for getExternalResourceMetaData().getLastModified() as a timestamp.
-     *
-     * @return The external last modified as a timestamp, or < 0 if unavailable.
-     */
-    long getExternalLastModifiedAsTimestamp();
-
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapter.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResourceAdapter.java
similarity index 57%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapter.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResourceAdapter.java
index f4434d66da9e..e2f089d958b7 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapter.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResourceAdapter.java
@@ -13,43 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
-import org.gradle.api.internal.externalresource.LocalFileStandInExternalResource;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceAccessor;
+import org.gradle.internal.resource.LocalFileStandInExternalResource;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.transfer.ExternalResourceAccessor;
+import org.gradle.internal.hash.HashValue;
+import org.gradle.internal.resource.local.LocallyAvailableResource;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
 
 /**
  * Creates an ExternalResource from something that has been cached locally.
  */
 public class CachedExternalResourceAdapter extends LocalFileStandInExternalResource {
-    private final CachedExternalResource cached;
+    private final LocallyAvailableResource local;
     private final ExternalResourceAccessor accessor;
+    private final HashValue expectedChecksum;
 
-    public CachedExternalResourceAdapter(String source, CachedExternalResource cached, ExternalResourceAccessor accessor) {
-        this(source, cached, accessor, null);
-    }
-
-    public CachedExternalResourceAdapter(String source, CachedExternalResource cached, ExternalResourceAccessor accessor, ExternalResourceMetaData metaData) {
-        super(source, cached.getCachedFile(), metaData);
-        this.cached = cached;
+    public CachedExternalResourceAdapter(URI source, LocallyAvailableResource local, ExternalResourceAccessor accessor, ExternalResourceMetaData remoteMetaData, HashValue expectedChecksum) {
+        super(source, local.getFile(), remoteMetaData);
+        this.local = local;
         this.accessor = accessor;
+        this.expectedChecksum = expectedChecksum;
     }
 
     @Override
-    public String toString() {
-        return "CachedResource: " + cached.getCachedFile() + " for " + getName();
-    }
-
-    public long getLastModified() {
-        return cached.getExternalLastModifiedAsTimestamp();
-    }
-
-    public long getContentLength() {
-        return cached.getContentLength();
+    public InputStream openStream() throws IOException {
+        return new FileInputStream(local.getFile());
     }
 
     public void writeTo(File destination) throws IOException {
@@ -62,14 +57,14 @@ public void writeTo(File destination) throws IOException {
 
         // If the checksum of the downloaded file does not match the cached artifact, download it directly.
         // This may be the case if the cached artifact was changed before copying
-        if (!getSha1(destination).equals(getLocalFileSha1())) {
+        if (!getSha1(destination).equals(expectedChecksum)) {
             downloadResourceDirect(destination);
         }
     }
 
     private void downloadResourceDirect(File destination) throws IOException {
         // Perform a regular download, without considering external caches
-        accessor.getResource(getName()).writeTo(destination);
+        accessor.getResource(getURI()).writeTo(destination);
     }
 
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceIndex.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResourceIndex.java
similarity index 94%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceIndex.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResourceIndex.java
index 8110de5bfa18..06f06181e323 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceIndex.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedExternalResourceIndex.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
 import org.gradle.api.Nullable;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 
 import java.io.File;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedItem.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedItem.java
similarity index 96%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedItem.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedItem.java
index 740c74a27c7a..d0f128b8e7d6 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/CachedItem.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/CachedItem.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
 import org.gradle.api.Nullable;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedArtifact.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedArtifact.java
similarity index 96%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedArtifact.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedArtifact.java
index b1da4ff66494..4cbe4ee9bab1 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedArtifact.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedArtifact.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
 import java.io.File;
 import java.io.Serializable;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedExternalResource.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedExternalResource.java
similarity index 84%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedExternalResource.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedExternalResource.java
index b6f0cb7144f6..f865beadbcc5 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedExternalResource.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedExternalResource.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 
 import java.io.File;
 import java.io.Serializable;
@@ -60,11 +60,6 @@ public Date getExternalLastModified() {
         return externalResourceMetaData != null ? externalResourceMetaData.getLastModified() : null;
     }
 
-    public long getExternalLastModifiedAsTimestamp() {
-        Date externalLastModified = getExternalLastModified();
-        return externalLastModified == null ? -1 : externalLastModified.getTime();
-    }
-
     public long getContentLength() {
         return isMissing() ? -1 : cachedFile.length();
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedExternalResourceIndex.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedExternalResourceIndex.java
similarity index 91%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedExternalResourceIndex.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedExternalResourceIndex.java
index 7f51eea79752..7b5eccef3ade 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/cached/DefaultCachedExternalResourceIndex.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/DefaultCachedExternalResourceIndex.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached;
+package org.gradle.internal.resource.cached;
 
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
-import org.gradle.api.internal.externalresource.ivy.AbstractCachedIndex;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.cached.ivy.AbstractCachedIndex;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 import org.gradle.messaging.serialize.DefaultSerializer;
 import org.gradle.util.BuildCommencedTimeProvider;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/AbstractCachedIndex.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/AbstractCachedIndex.java
similarity index 96%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/AbstractCachedIndex.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/AbstractCachedIndex.java
index 88bfe6ef87ee..120883f9d8c6 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/AbstractCachedIndex.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/AbstractCachedIndex.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.ivy;
+package org.gradle.internal.resource.cached.ivy;
 
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
-import org.gradle.api.internal.externalresource.cached.CachedItem;
+import org.gradle.internal.resource.cached.CachedItem;
 import org.gradle.cache.PersistentIndexedCache;
 import org.gradle.internal.Factory;
 import org.gradle.messaging.serialize.Serializer;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryCachedArtifactIndex.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/ArtifactAtRepositoryCachedArtifactIndex.java
similarity index 94%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryCachedArtifactIndex.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/ArtifactAtRepositoryCachedArtifactIndex.java
index 6a225df78487..98ba688b9bac 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryCachedArtifactIndex.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/ArtifactAtRepositoryCachedArtifactIndex.java
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.ivy;
+package org.gradle.internal.resource.cached.ivy;
 
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifierSerializer;
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier;
-import org.gradle.api.internal.externalresource.cached.CachedArtifact;
-import org.gradle.api.internal.externalresource.cached.CachedArtifactIndex;
-import org.gradle.api.internal.externalresource.cached.DefaultCachedArtifact;
+import org.gradle.internal.resource.cached.CachedArtifact;
+import org.gradle.internal.resource.cached.CachedArtifactIndex;
+import org.gradle.internal.resource.cached.DefaultCachedArtifact;
 import org.gradle.messaging.serialize.Decoder;
 import org.gradle.messaging.serialize.Encoder;
 import org.gradle.messaging.serialize.Serializer;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryKey.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/ArtifactAtRepositoryKey.java
similarity index 96%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryKey.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/ArtifactAtRepositoryKey.java
index 6385f280d77b..6cea1286b570 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryKey.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/cached/ivy/ArtifactAtRepositoryKey.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.ivy;
+package org.gradle.internal.resource.cached.ivy;
 
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/ivy/LocallyAvailableResourceFinderFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/local/ivy/LocallyAvailableResourceFinderFactory.java
similarity index 91%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/ivy/LocallyAvailableResourceFinderFactory.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/local/ivy/LocallyAvailableResourceFinderFactory.java
index 26cdfcad79d8..47626f77ed34 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/ivy/LocallyAvailableResourceFinderFactory.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/local/ivy/LocallyAvailableResourceFinderFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.local.ivy;
+package org.gradle.internal.resource.local.ivy;
 
 import org.gradle.api.internal.artifacts.ivyservice.ArtifactCacheMetaData;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
@@ -22,12 +22,12 @@
 import org.gradle.api.internal.artifacts.repositories.resolver.IvyResourcePattern;
 import org.gradle.api.internal.artifacts.repositories.resolver.M2ResourcePattern;
 import org.gradle.api.internal.artifacts.repositories.resolver.ResourcePattern;
-import org.gradle.api.internal.externalresource.local.CompositeLocallyAvailableResourceFinder;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceCandidates;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinderSearchableFileStoreAdapter;
+import org.gradle.internal.resource.local.CompositeLocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceCandidates;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinderSearchableFileStoreAdapter;
 import org.gradle.internal.Factory;
-import org.gradle.internal.filestore.FileStoreSearcher;
+import org.gradle.internal.resource.local.FileStoreSearcher;
 import org.gradle.internal.hash.HashValue;
 import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.slf4j.Logger;
@@ -59,9 +59,6 @@ public LocallyAvailableResourceFinder<ModuleVersionArtifactMetaData> create() {
         // The current filestore
         finders.add(new LocallyAvailableResourceFinderSearchableFileStoreAdapter<ModuleVersionArtifactMetaData>(fileStore));
 
-        // 1.9
-//        addForPattern(finders, "modules-2/files-2.1/[organisation]/[module](/[branch])/[revision]/*/[artifact]-[revision](-[classifier])(.[ext])");
-
         // 1.8
         addForPattern(finders, "artifacts-26/filestore/[organisation]/[module](/[branch])/[revision]/[type]/*/[artifact]-[revision](-[classifier])(.[ext])");
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/ivy/PatternBasedLocallyAvailableResourceFinder.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/local/ivy/PatternBasedLocallyAvailableResourceFinder.java
similarity index 92%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/ivy/PatternBasedLocallyAvailableResourceFinder.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/local/ivy/PatternBasedLocallyAvailableResourceFinder.java
index 7601cf55e26e..c3fe907d1244 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/ivy/PatternBasedLocallyAvailableResourceFinder.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/local/ivy/PatternBasedLocallyAvailableResourceFinder.java
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.local.ivy;
+package org.gradle.internal.resource.local.ivy;
 
 import org.gradle.api.Transformer;
 import org.gradle.api.file.EmptyFileVisitor;
 import org.gradle.api.file.FileVisitDetails;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData;
 import org.gradle.api.internal.artifacts.repositories.resolver.ResourcePattern;
-import org.gradle.api.internal.externalresource.local.AbstractLocallyAvailableResourceFinder;
+import org.gradle.internal.resource.local.AbstractLocallyAvailableResourceFinder;
 import org.gradle.api.internal.file.collections.MinimalFileTree;
 import org.gradle.api.internal.file.collections.SingleIncludePatternFileTree;
 import org.gradle.internal.Factory;
@@ -54,7 +54,7 @@ public void visitFile(FileVisitDetails fileDetails) {
             }
 
             private MinimalFileTree getMatchingFiles(ModuleVersionArtifactMetaData artifact) {
-                String patternString = pattern.toPath(artifact);
+                String patternString = pattern.getLocation(artifact).getPath();
                 return new SingleIncludePatternFileTree(baseDir, patternString);
             }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/AbstractProgressLoggingHandler.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/AbstractProgressLoggingHandler.java
similarity index 96%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/AbstractProgressLoggingHandler.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/AbstractProgressLoggingHandler.java
index 3f80387a3aaf..f95139f2026c 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/AbstractProgressLoggingHandler.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/AbstractProgressLoggingHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer;
+package org.gradle.internal.resource.transfer;
 
 import org.gradle.logging.ProgressLogger;
 import org.gradle.logging.ProgressLoggerFactory;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/CacheAwareExternalResourceAccessor.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/CacheAwareExternalResourceAccessor.java
new file mode 100644
index 000000000000..5ade9870d9f5
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/CacheAwareExternalResourceAccessor.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transfer;
+
+import org.gradle.api.Nullable;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.local.LocallyAvailableResourceCandidates;
+import org.gradle.internal.resource.local.LocallyAvailableResource;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URI;
+
+public interface CacheAwareExternalResourceAccessor {
+    @Nullable
+    LocallyAvailableExternalResource getResource(URI source, ResourceFileStore fileStore, @Nullable LocallyAvailableResourceCandidates localCandidates) throws IOException;
+
+    interface ResourceFileStore {
+        /**
+         * Called when a resource is to be cached. Should *move* the given file into the appropriate location and return a handle to the file.
+         */
+        LocallyAvailableResource moveIntoCache(File downloadedResource);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessor.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/DefaultCacheAwareExternalResourceAccessor.java
similarity index 52%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessor.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/DefaultCacheAwareExternalResourceAccessor.java
index e24fd2a8b9fa..3ec46a322b96 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessor.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/DefaultCacheAwareExternalResourceAccessor.java
@@ -14,27 +14,35 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer;
+package org.gradle.internal.resource.transfer;
 
 import org.gradle.api.Nullable;
+import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
 import org.gradle.api.internal.artifacts.ivyservice.resolutionstrategy.DefaultExternalResourceCachePolicy;
 import org.gradle.api.internal.artifacts.ivyservice.resolutionstrategy.ExternalResourceCachePolicy;
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.cached.CachedExternalResource;
-import org.gradle.api.internal.externalresource.cached.CachedExternalResourceAdapter;
-import org.gradle.api.internal.externalresource.cached.CachedExternalResourceIndex;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceCandidates;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaDataCompare;
+import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.cached.CachedExternalResource;
+import org.gradle.internal.resource.cached.CachedExternalResourceAdapter;
+import org.gradle.internal.resource.cached.CachedExternalResourceIndex;
+import org.gradle.internal.resource.local.LocallyAvailableResourceCandidates;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaDataCompare;
+import org.gradle.api.internal.file.TemporaryFileProvider;
+import org.gradle.internal.resource.ResourceException;
 import org.gradle.internal.Factory;
 import org.gradle.internal.hash.HashValue;
+import org.gradle.internal.resource.local.DefaultLocallyAvailableResource;
 import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.gradle.util.BuildCommencedTimeProvider;
+import org.gradle.util.GFileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 
 public class DefaultCacheAwareExternalResourceAccessor implements CacheAwareExternalResourceAccessor {
 
@@ -43,26 +51,30 @@ public class DefaultCacheAwareExternalResourceAccessor implements CacheAwareExte
     private final ExternalResourceAccessor delegate;
     private final CachedExternalResourceIndex<String> cachedExternalResourceIndex;
     private final BuildCommencedTimeProvider timeProvider;
+    private final TemporaryFileProvider temporaryFileProvider;
+    private final CacheLockingManager cacheLockingManager;
     private final ExternalResourceCachePolicy externalResourceCachePolicy = new DefaultExternalResourceCachePolicy();
 
-    public DefaultCacheAwareExternalResourceAccessor(ExternalResourceAccessor delegate, CachedExternalResourceIndex<String> cachedExternalResourceIndex, BuildCommencedTimeProvider timeProvider) {
+    public DefaultCacheAwareExternalResourceAccessor(ExternalResourceAccessor delegate, CachedExternalResourceIndex<String> cachedExternalResourceIndex, BuildCommencedTimeProvider timeProvider, TemporaryFileProvider temporaryFileProvider, CacheLockingManager cacheLockingManager) {
         this.delegate = delegate;
         this.cachedExternalResourceIndex = cachedExternalResourceIndex;
         this.timeProvider = timeProvider;
+        this.temporaryFileProvider = temporaryFileProvider;
+        this.cacheLockingManager = cacheLockingManager;
     }
 
-    public ExternalResource getResource(final String location, @Nullable LocallyAvailableResourceCandidates localCandidates) throws IOException {
+    public LocallyAvailableExternalResource getResource(final URI location, final ResourceFileStore fileStore, @Nullable LocallyAvailableResourceCandidates localCandidates) throws IOException {
         LOGGER.debug("Constructing external resource: {}", location);
-        CachedExternalResource cached = cachedExternalResourceIndex.lookup(location);
+        CachedExternalResource cached = cachedExternalResourceIndex.lookup(location.toString());
 
         // If we have no caching options, just get the thing directly
         if (cached == null && (localCandidates == null || localCandidates.isNone())) {
-            return delegate.getResource(location);
+            return copyToCache(location, fileStore, delegate.getResource(location));
         }
 
         // We might be able to use a cached/locally available version
         if (cached != null && !externalResourceCachePolicy.mustRefreshExternalResource(getAgeMillis(timeProvider, cached))) {
-            return new CachedExternalResourceAdapter(location, cached, delegate, cached.getExternalResourceMetaData());
+            return new DefaultLocallyAvailableExternalResource(location, new DefaultLocallyAvailableResource(cached.getCachedFile()), cached.getExternalResourceMetaData());
         }
 
         // Get the metadata first to see if it's there
@@ -84,8 +96,8 @@ public ExternalResourceMetaData create() {
 
             if (isUnchanged) {
                 LOGGER.info("Cached resource is up-to-date (lastModified: {}). [HTTP: {}]", cached.getExternalLastModified(), location);
-                // TODO - should we use the remote metadata? It may be “better”
-                return new CachedExternalResourceAdapter(location, cached, delegate, remoteMetaData);
+                // TODO - update the index with the new remote meta-data
+                return new DefaultLocallyAvailableExternalResource(location, new DefaultLocallyAvailableResource(cached.getCachedFile()), cached.getExternalResourceMetaData());
             }
         }
 
@@ -103,13 +115,48 @@ public ExternalResourceMetaData create() {
                 LocallyAvailableResource local = localCandidates.findByHashValue(remoteChecksum);
                 if (local != null) {
                     LOGGER.info("Found locally available resource with matching checksum: [{}, {}]", location, local.getFile());
-                    return new DefaultLocallyAvailableExternalResource(location, local, remoteMetaData);
+                    // TODO - should iterate over each candidate until we successfully copy into the cache
+                    return copyToCache(location, fileStore, new CachedExternalResourceAdapter(location, local, delegate, remoteMetaData, remoteChecksum));
                 }
             }
         }
 
         // All local/cached options failed, get directly
-        return delegate.getResource(location);
+        return copyToCache(location, fileStore, delegate.getResource(location));
+    }
+
+    private LocallyAvailableExternalResource copyToCache(final URI source, final ResourceFileStore fileStore, final ExternalResource resource) {
+        if (resource == null) {
+            return null;
+        }
+
+        final File destination = temporaryFileProvider.createTemporaryFile("gradle_download", "bin");
+        try {
+            try {
+                try {
+                    LOGGER.debug("Downloading {} to {}", resource.getName(), destination);
+                    if (destination.getParentFile() != null) {
+                        GFileUtils.mkdirs(destination.getParentFile());
+                    }
+                    resource.writeTo(destination);
+                } finally {
+                    resource.close();
+                }
+            } catch (IOException e) {
+                throw new ResourceException(String.format("Failed to download resource '%s'.", resource.getName()), e);
+            }
+            return cacheLockingManager.useCache(String.format("Store %s", resource.getName()), new Factory<LocallyAvailableExternalResource>() {
+                public LocallyAvailableExternalResource create() {
+                    LocallyAvailableResource cachedResource = fileStore.moveIntoCache(destination);
+                    File fileInFileStore = cachedResource.getFile();
+                    ExternalResourceMetaData metaData = resource.getMetaData();
+                    cachedExternalResourceIndex.store(source.toString(), fileInFileStore, metaData);
+                    return new DefaultLocallyAvailableExternalResource(source, cachedResource, metaData);
+                }
+            });
+        } finally {
+            destination.delete();
+        }
     }
 
     public long getAgeMillis(BuildCommencedTimeProvider timeProvider, CachedExternalResource cached) {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceAccessor.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceAccessor.java
similarity index 90%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceAccessor.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceAccessor.java
index df39de9a3d38..1a93898cae69 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceAccessor.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceAccessor.java
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer;
+package org.gradle.internal.resource.transfer;
 
 import org.gradle.api.Action;
 import org.gradle.api.Nullable;
 import org.gradle.api.Transformer;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-import org.gradle.logging.ProgressLoggerFactory;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 import org.gradle.internal.hash.HashValue;
+import org.gradle.logging.ProgressLoggerFactory;
 
 import java.io.*;
+import java.net.URI;
 
 public class ProgressLoggingExternalResourceAccessor extends AbstractProgressLoggingHandler implements ExternalResourceAccessor {
     private final ExternalResourceAccessor delegate;
@@ -34,7 +35,7 @@ public ProgressLoggingExternalResourceAccessor(ExternalResourceAccessor delegate
         this.delegate = delegate;
     }
 
-    public ExternalResource getResource(String location) throws IOException {
+    public ExternalResource getResource(URI location) throws IOException {
         ExternalResource resource = delegate.getResource(location);
         if (resource != null) {
             return new ProgressLoggingExternalResource(resource);
@@ -44,12 +45,12 @@ public ExternalResource getResource(String location) throws IOException {
     }
 
     @Nullable
-    public HashValue getResourceSha1(String location) {
+    public HashValue getResourceSha1(URI location) {
         return delegate.getResourceSha1(location);
     }
 
     @Nullable
-    public ExternalResourceMetaData getMetaData(String location) throws IOException {
+    public ExternalResourceMetaData getMetaData(URI location) throws IOException {
         return delegate.getMetaData(location);
     }
 
@@ -99,12 +100,12 @@ public ExternalResourceMetaData getMetaData() {
             return resource.getMetaData();
         }
 
-        public String getName() {
-            return resource.getName();
+        public URI getURI() {
+            return resource.getURI();
         }
 
-        public long getLastModified() {
-            return resource.getLastModified();
+        public String getName() {
+            return resource.getName();
         }
 
         public long getContentLength() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceUploader.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceUploader.java
similarity index 92%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceUploader.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceUploader.java
index 947a65e34f86..9a582bad3308 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceUploader.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceUploader.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer;
+package org.gradle.internal.resource.transfer;
 
 import org.gradle.internal.Factory;
 import org.gradle.logging.ProgressLoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 public class ProgressLoggingExternalResourceUploader extends AbstractProgressLoggingHandler implements ExternalResourceUploader {
     private final ExternalResourceUploader delegate;
@@ -29,8 +30,8 @@ public ProgressLoggingExternalResourceUploader(ExternalResourceUploader delegate
         super(progressLoggerFactory);
         this.delegate = delegate;
     }
-    public void upload(final Factory<InputStream> source, final Long contentLength, String destination) throws IOException {
-        final ResourceOperation uploadOperation = createResourceOperation(destination, ResourceOperation.Type.upload, getClass(), contentLength);
+    public void upload(final Factory<InputStream> source, final Long contentLength, URI destination) throws IOException {
+        final ResourceOperation uploadOperation = createResourceOperation(destination.toString(), ResourceOperation.Type.upload, getClass(), contentLength);
 
         try {
             delegate.upload(new Factory<InputStream>() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ResourceOperation.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ResourceOperation.java
similarity index 97%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ResourceOperation.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ResourceOperation.java
index b1a81020ec1a..b131d85dde25 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ResourceOperation.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transfer/ResourceOperation.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer;
+package org.gradle.internal.resource.transfer;
 
 import org.apache.commons.lang.StringUtils;
 import org.gradle.logging.ProgressLogger;
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterRepositoryConfigurer.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/AbstractRepositoryTransport.java
similarity index 65%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterRepositoryConfigurer.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/AbstractRepositoryTransport.java
index c0b169150033..e16674aedb81 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterRepositoryConfigurer.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/AbstractRepositoryTransport.java
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.internal.resource.transport;
 
-import org.gradle.api.Action;
-import org.gradle.api.artifacts.dsl.RepositoryHandler;
+import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport;
 
-public class JCenterRepositoryConfigurer implements Action<RepositoryHandler> {
-    public void execute(RepositoryHandler repositories) {
-        repositories.jcenter();
+public abstract class AbstractRepositoryTransport implements RepositoryTransport {
+    protected final String name;
+
+    protected AbstractRepositoryTransport(String name) {
+        this.name = name;
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/DefaultExternalResourceRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/DefaultExternalResourceRepository.java
similarity index 66%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/DefaultExternalResourceRepository.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/DefaultExternalResourceRepository.java
index ea94d031a808..68252db1e3e8 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/DefaultExternalResourceRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/DefaultExternalResourceRepository.java
@@ -14,26 +14,25 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport;
+package org.gradle.internal.resource.transport;
 
 
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceCandidates;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.transfer.CacheAwareExternalResourceAccessor;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceAccessor;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceLister;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceUploader;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.transfer.ExternalResourceAccessor;
+import org.gradle.internal.resource.transfer.ExternalResourceLister;
+import org.gradle.internal.resource.transfer.ExternalResourceUploader;
 import org.gradle.api.internal.file.TemporaryFileProvider;
 import org.gradle.internal.Factory;
 import org.gradle.internal.UncheckedException;
-import org.gradle.util.GFileUtils;
 import org.gradle.internal.hash.HashUtil;
 import org.gradle.internal.hash.HashValue;
+import org.gradle.util.GFileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.net.URI;
 import java.util.List;
 
 public class DefaultExternalResourceRepository implements ExternalResourceRepository {
@@ -44,39 +43,31 @@ public class DefaultExternalResourceRepository implements ExternalResourceReposi
     private final ExternalResourceUploader uploader;
     private final ExternalResourceLister lister;
 
-    private final CacheAwareExternalResourceAccessor cacheAwareAccessor;
-
     public DefaultExternalResourceRepository(String name, ExternalResourceAccessor accessor, ExternalResourceUploader uploader,
-                                             ExternalResourceLister lister, TemporaryFileProvider temporaryFileProvider,
-                                             CacheAwareExternalResourceAccessor cacheAwareAccessor) {
+                                             ExternalResourceLister lister, TemporaryFileProvider temporaryFileProvider) {
         this.name = name;
         this.accessor = accessor;
         this.uploader = uploader;
         this.lister = lister;
         this.temporaryFileProvider = temporaryFileProvider;
-        this.cacheAwareAccessor = cacheAwareAccessor;
     }
 
-    public ExternalResource getResource(String source) throws IOException {
+    public ExternalResource getResource(URI source) throws IOException {
         return accessor.getResource(source);
     }
 
-    public ExternalResource getResource(String source, LocallyAvailableResourceCandidates localCandidates) throws IOException {
-        return cacheAwareAccessor.getResource(source, localCandidates);
-    }
-
-    public ExternalResourceMetaData getResourceMetaData(String source) throws IOException {
+    public ExternalResourceMetaData getResourceMetaData(URI source) throws IOException {
         return accessor.getMetaData(source);
     }
 
-    public void put(File source, String destination) throws IOException {
+    public void put(File source, URI destination) throws IOException {
         doPut(source, destination);
         putChecksum("SHA1", 40, source, destination);
     }
 
-    private void putChecksum(String algorithm, int checksumlength, File source, String destination) throws IOException {
+    private void putChecksum(String algorithm, int checksumlength, File source, URI destination) throws IOException {
         File checksumFile = createChecksumFile(source, algorithm, checksumlength);
-        String checksumDestination = destination + "." + algorithm.toLowerCase();
+        URI checksumDestination = URI.create(destination + "." + algorithm.toLowerCase());
         doPut(checksumFile, checksumDestination);
     }
 
@@ -95,7 +86,7 @@ private String formatHashString(String hashKey, int length) {
         return hashKey;
     }
 
-    protected void doPut(final File source, String destination) throws IOException {
+    protected void doPut(final File source, URI destination) throws IOException {
         LOGGER.debug("Attempting to put resource {}.", destination);
         assert source.isFile();
         try {
@@ -110,12 +101,10 @@ public InputStream create() {
             }, source.length(), destination);
         } catch (IOException e) {
             throw e;
-        } catch (Exception e) {
-            throw UncheckedException.throwAsUncheckedException(e);
         }
     }
 
-    public List<String> list(String parent) throws IOException {
+    public List<String> list(URI parent) throws IOException {
         return lister.list(parent);
     }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/ExternalResourceRepository.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/ExternalResourceRepository.java
similarity index 61%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/ExternalResourceRepository.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/ExternalResourceRepository.java
index 227ccb844dd7..852a14167f5b 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/ExternalResourceRepository.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/ExternalResourceRepository.java
@@ -14,32 +14,24 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport;
+package org.gradle.internal.resource.transport;
 
 import org.gradle.api.Nullable;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceCandidates;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.util.List;
 
 public interface ExternalResourceRepository {
-
-    /**
-     * Attempts to fetch the given resource.
-     *
-     * @return null if the resource is not found.
-     */
-    ExternalResource getResource(String source) throws IOException;
-
     /**
      * Attempts to fetch the given resource.
      *
      * @return null if the resource is not found.
      */
-    ExternalResource getResource(String source, @Nullable LocallyAvailableResourceCandidates localCandidates) throws IOException;
+    ExternalResource getResource(URI source) throws IOException;
 
     /**
      * Transfer a resource to the repository
@@ -48,7 +40,7 @@ public interface ExternalResourceRepository {
      * @param destination Where to transfer the resource.
      * @throws IOException On publication failure.
      */
-    void put(File source, String destination) throws IOException;
+    void put(File source, URI destination) throws IOException;
 
     /**
      * Fetches only the metadata for the result.
@@ -57,14 +49,15 @@ public interface ExternalResourceRepository {
      * @return The resource metadata, or null if the resource does not exist
      */
     @Nullable
-    ExternalResourceMetaData getResourceMetaData(String source) throws IOException;
+    ExternalResourceMetaData getResourceMetaData(URI source) throws IOException;
 
     /**
-     * Return a listing of resources names
+     * Return a listing of child resources names.
      *
      * @param parent The parent directory from which to generate the listing.
-     * @return A listing of the parent directory's file content, as a List of String.
+     * @return A listing of the direct children of the given parent. Returns null when the parent resource does not exist.
      * @throws IOException On listing failure.
      */
-    List<String> list(String parent) throws IOException;
+    @Nullable
+    List<String> list(URI parent) throws IOException;
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/file/FileResourceConnector.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/file/FileResourceConnector.java
similarity index 56%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/file/FileResourceConnector.java
rename to subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/file/FileResourceConnector.java
index 4ed60f859ebe..5c2670ad65db 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/file/FileResourceConnector.java
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/file/FileResourceConnector.java
@@ -13,44 +13,42 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.file;
+package org.gradle.internal.resource.transport.file;
 
 import org.apache.commons.io.IOUtils;
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceAccessor;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceLister;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceUploader;
+import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.transfer.ExternalResourceAccessor;
+import org.gradle.internal.resource.transfer.ExternalResourceLister;
+import org.gradle.internal.resource.transfer.ExternalResourceUploader;
 import org.gradle.internal.Factory;
+import org.gradle.internal.hash.HashValue;
 import org.gradle.internal.resource.local.DefaultLocallyAvailableResource;
 import org.gradle.util.GFileUtils;
-import org.gradle.internal.hash.HashValue;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
+import java.net.URI;
+import java.util.Arrays;
 import java.util.List;
 
 public class FileResourceConnector implements ExternalResourceLister, ExternalResourceAccessor, ExternalResourceUploader {
-    public List<String> list(String parent) throws IOException {
+    public List<String> list(URI parent) throws IOException {
         File dir = getFile(parent);
         if (dir.exists() && dir.isDirectory()) {
             String[] names = dir.list();
             if (names != null) {
-                List<String> ret = new ArrayList<String>(names.length);
-                for (String name : names) {
-                    ret.add(parent + '/' + name);
-                }
-                return ret;
+                return Arrays.asList(names);
             }
         }
         return null;
     }
 
-    public void upload(Factory<InputStream> source, Long contentLength, String destination) throws IOException {
+    public void upload(Factory<InputStream> source, Long contentLength, URI destination) throws IOException {
         File target = getFile(destination);
         if (!target.canWrite()) {
             target.delete();
@@ -60,9 +58,7 @@ public void upload(Factory<InputStream> source, Long contentLength, String desti
         try {
             InputStream sourceInputStream = source.create();
             try {
-                if (IOUtils.copy(sourceInputStream, fileOutputStream) == -1) {
-                    throw new IOException(String.format("File copy failed from %s to %s", source, target));
-                }
+                IOUtils.copyLarge(sourceInputStream, fileOutputStream);
             } finally {
                 sourceInputStream.close();
             }
@@ -71,29 +67,25 @@ public void upload(Factory<InputStream> source, Long contentLength, String desti
         }
     }
 
-    public ExternalResource getResource(String location) throws IOException {
-        File localFile = getFile(location);
+    public LocallyAvailableExternalResource getResource(URI uri) throws IOException {
+        File localFile = getFile(uri);
         if (!localFile.exists()) {
             return null;
         }
-        return new DefaultLocallyAvailableExternalResource(location, new DefaultLocallyAvailableResource(localFile));
+        return new DefaultLocallyAvailableExternalResource(uri, new DefaultLocallyAvailableResource(localFile));
     }
 
-    public ExternalResourceMetaData getMetaData(String location) throws IOException {
+    public ExternalResourceMetaData getMetaData(URI location) throws IOException {
         ExternalResource resource = getResource(location);
         return resource == null ? null : resource.getMetaData();
     }
 
-    public HashValue getResourceSha1(String location) {
+    public HashValue getResourceSha1(URI location) {
         // TODO Read sha1 from published .sha1 file
         return null;
     }
 
-    private static File getFile(String absolutePath) {
-        File f = new File(absolutePath);
-        if (!f.isAbsolute()) {
-            throw new IllegalArgumentException("Filename must be absolute: " + absolutePath);
-        }
-        return f;
+    private static File getFile(URI uri) {
+        return new File(uri);
     }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/file/FileTransport.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/file/FileTransport.java
new file mode 100644
index 000000000000..fd22d7f46760
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/file/FileTransport.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.internal.resource.transport.file;
+
+import org.gradle.api.Nullable;
+import org.gradle.internal.resource.LocallyAvailableExternalResource;
+import org.gradle.internal.resource.local.LocallyAvailableResourceCandidates;
+import org.gradle.internal.resource.transfer.CacheAwareExternalResourceAccessor;
+import org.gradle.internal.resource.transport.AbstractRepositoryTransport;
+import org.gradle.internal.resource.transport.DefaultExternalResourceRepository;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
+import org.gradle.api.internal.file.TemporaryFileProvider;
+
+import java.io.IOException;
+import java.net.URI;
+
+public class FileTransport extends AbstractRepositoryTransport {
+    private final ExternalResourceRepository repository;
+    private final NoOpCacheAwareExternalResourceAccessor resourceAccessor;
+
+    public FileTransport(String name, TemporaryFileProvider temporaryFileProvider) {
+        super(name);
+        FileResourceConnector connector = new FileResourceConnector();
+        resourceAccessor = new NoOpCacheAwareExternalResourceAccessor(connector);
+        repository = new DefaultExternalResourceRepository(name, connector, connector, connector, temporaryFileProvider);
+    }
+
+    public boolean isLocal() {
+        return true;
+    }
+
+    public ExternalResourceRepository getRepository() {
+        return repository;
+    }
+
+    public CacheAwareExternalResourceAccessor getResourceAccessor() {
+        return resourceAccessor;
+    }
+
+    private static class NoOpCacheAwareExternalResourceAccessor implements CacheAwareExternalResourceAccessor {
+        private final FileResourceConnector connector;
+
+        public NoOpCacheAwareExternalResourceAccessor(FileResourceConnector connector) {
+            this.connector = connector;
+        }
+
+        public LocallyAvailableExternalResource getResource(URI source, ResourceFileStore fileStore, @Nullable LocallyAvailableResourceCandidates localCandidates) throws IOException {
+            return connector.getResource(source);
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/http/HttpTransport.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/http/HttpTransport.java
new file mode 100644
index 000000000000..510c324d15d7
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/http/HttpTransport.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2011 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.internal.resource.transport.http;
+
+import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
+import org.gradle.api.internal.file.TemporaryFileProvider;
+import org.gradle.internal.resource.PasswordCredentials;
+import org.gradle.internal.resource.cached.CachedExternalResourceIndex;
+import org.gradle.internal.resource.transfer.CacheAwareExternalResourceAccessor;
+import org.gradle.internal.resource.transfer.DefaultCacheAwareExternalResourceAccessor;
+import org.gradle.internal.resource.transfer.ProgressLoggingExternalResourceAccessor;
+import org.gradle.internal.resource.transfer.ProgressLoggingExternalResourceUploader;
+import org.gradle.internal.resource.transport.AbstractRepositoryTransport;
+import org.gradle.internal.resource.transport.DefaultExternalResourceRepository;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
+import org.gradle.logging.ProgressLoggerFactory;
+import org.gradle.util.BuildCommencedTimeProvider;
+
+public class HttpTransport extends AbstractRepositoryTransport {
+    private final ExternalResourceRepository repository;
+    private final DefaultCacheAwareExternalResourceAccessor resourceAccessor;
+
+    public HttpTransport(String name, PasswordCredentials credentials,
+                         ProgressLoggerFactory progressLoggerFactory,
+                         TemporaryFileProvider temporaryFileProvider,
+                         CachedExternalResourceIndex<String> cachedExternalResourceIndex,
+                         BuildCommencedTimeProvider timeProvider,
+                         CacheLockingManager cacheLockingManager) {
+        super(name);
+        HttpClientHelper http = new HttpClientHelper(new DefaultHttpSettings(credentials));
+        HttpResourceAccessor accessor = new HttpResourceAccessor(http);
+        HttpResourceUploader uploader = new HttpResourceUploader(http);
+        ProgressLoggingExternalResourceAccessor loggingAccessor = new ProgressLoggingExternalResourceAccessor(accessor, progressLoggerFactory);
+        resourceAccessor = new DefaultCacheAwareExternalResourceAccessor(loggingAccessor, cachedExternalResourceIndex, timeProvider, temporaryFileProvider, cacheLockingManager);
+        repository = new DefaultExternalResourceRepository(
+                name,
+                accessor,
+                new ProgressLoggingExternalResourceUploader(uploader, progressLoggerFactory),
+                new HttpResourceLister(accessor),
+                temporaryFileProvider);
+    }
+
+    public boolean isLocal() {
+        return false;
+    }
+
+    public CacheAwareExternalResourceAccessor getResourceAccessor() {
+        return resourceAccessor;
+    }
+
+    public ExternalResourceRepository getRepository() {
+        return repository;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/LockableSftpClient.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/LockableSftpClient.java
new file mode 100644
index 000000000000..f8a2fdbc8351
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/LockableSftpClient.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+import com.jcraft.jsch.ChannelSftp;
+import org.gradle.internal.concurrent.Stoppable;
+
+public interface LockableSftpClient extends Stoppable {
+    SftpHost getHost();
+    ChannelSftp getSftpClient();
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpClientFactory.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpClientFactory.java
new file mode 100644
index 000000000000..94b7bf7d4bb8
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpClientFactory.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.ListMultimap;
+import com.jcraft.jsch.*;
+import net.jcip.annotations.ThreadSafe;
+import org.gradle.internal.concurrent.CompositeStoppable;
+import org.gradle.internal.concurrent.Stoppable;
+import org.gradle.internal.resource.PasswordCredentials;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.List;
+
+@ThreadSafe
+public class SftpClientFactory implements Stoppable {
+    private SftpClientCreator sftpClientCreator = new SftpClientCreator();
+    private final Object lock = new Object();
+    private final ListMultimap<SftpHost, LockableSftpClient> clients = ArrayListMultimap.create();
+
+    public LockableSftpClient createSftpClient(URI uri, PasswordCredentials credentials) throws IOException {
+        synchronized (lock) {
+            SftpHost sftpHost = new SftpHost(uri, credentials);
+            return acquireClient(sftpHost);
+        }
+    }
+
+    private LockableSftpClient acquireClient(SftpHost sftpHost) throws IOException {
+        return clients.containsKey(sftpHost) ? reuseExistingOrCreateNewClient(sftpHost) : sftpClientCreator.createNewClient(sftpHost);
+    }
+
+    private LockableSftpClient reuseExistingOrCreateNewClient(SftpHost sftpHost) throws IOException {
+        List<LockableSftpClient> clientsByHost = clients.get(sftpHost);
+        if (clientsByHost.isEmpty()) {
+            return sftpClientCreator.createNewClient(sftpHost);
+        }
+        return clientsByHost.remove(0);
+    }
+
+    private static class SftpClientCreator {
+        private JSch jsch;
+
+        public LockableSftpClient createNewClient(SftpHost sftpHost) throws IOException {
+            try {
+                Session session = createJsch().getSession(sftpHost.getUsername(), sftpHost.getHostname(), sftpHost.getPort());
+                session.setPassword(sftpHost.getPassword());
+                session.connect();
+                Channel channel = session.openChannel("sftp");
+                channel.connect();
+                return new DefaultLockableSftpClient(sftpHost, (ChannelSftp) channel, session);
+            } catch (JSchException e) {
+                if (e.getMessage().equals("Auth fail")) {
+                    throw new SftpException(String.format("Invalid credentials for SFTP server at sftp://%s:%d", sftpHost.getHostname(), sftpHost.getPort()), e);
+                }
+                throw new SftpException(String.format("Could not connect to SFTP server at sftp://%s:%d", sftpHost.getHostname(), sftpHost.getPort()), e);
+            }
+        }
+
+        private JSch createJsch() {
+            if (jsch == null) {
+                jsch = new JSch();
+                jsch.setHostKeyRepository(new HostKeyRepository() {
+                    public int check(String host, byte[] key) {
+                        return OK;
+                    }
+
+                    public void add(HostKey hostkey, UserInfo ui) {
+                    }
+
+                    public void remove(String host, String type) {
+                    }
+
+                    public void remove(String host, String type, byte[] key) {
+                    }
+
+                    public String getKnownHostsRepositoryID() {
+                        return "allow-everything";
+                    }
+
+                    public HostKey[] getHostKey() {
+                        throw new UnsupportedOperationException();
+                    }
+
+                    public HostKey[] getHostKey(String host, String type) {
+                        return new HostKey[0];
+                    }
+                });
+            }
+            return jsch;
+        }
+    }
+
+    public void releaseSftpClient(LockableSftpClient sftpClient) {
+        synchronized (lock) {
+            clients.put(sftpClient.getHost(), sftpClient);
+        }
+    }
+
+    public void stop() {
+        synchronized (lock) {
+            try {
+                CompositeStoppable stoppable = new CompositeStoppable();
+                for (LockableSftpClient client : clients.values()) {
+                    stoppable.add(client);
+                }
+                stoppable.stop();
+            } finally {
+                clients.clear();
+            }
+        }
+    }
+
+    private static class DefaultLockableSftpClient implements LockableSftpClient {
+        final SftpHost host;
+        final ChannelSftp channelSftp;
+        final Session session;
+
+        private DefaultLockableSftpClient(SftpHost host, ChannelSftp channelSftp, Session session) {
+            this.host = host;
+            this.channelSftp = channelSftp;
+            this.session = session;
+        }
+
+        public void stop() {
+            channelSftp.disconnect();
+            session.disconnect();
+        }
+
+        public SftpHost getHost() {
+            return host;
+        }
+
+        public ChannelSftp getSftpClient() {
+            return channelSftp;
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpException.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpException.java
new file mode 100644
index 000000000000..95f0baef3b51
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpException.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+public class SftpException extends RuntimeException {
+    public SftpException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpHost.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpHost.java
new file mode 100644
index 000000000000..c9152b8a08b6
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpHost.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+import org.gradle.internal.resource.PasswordCredentials;
+
+import java.net.URI;
+
+public class SftpHost {
+    private final String hostname;
+    private final int port;
+    private final String username;
+    private final String password;
+
+    public SftpHost(URI uri, PasswordCredentials credentials) {
+        hostname = uri.getHost();
+        port = uri.getPort();
+        username = credentials.getUsername();
+        password = credentials.getPassword();
+    }
+
+    public String getHostname() {
+        return hostname;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        SftpHost sftpHost = (SftpHost) o;
+
+        if (port != sftpHost.port) {
+            return false;
+        }
+        if (!hostname.equals(sftpHost.hostname)) {
+            return false;
+        }
+        if (password != null ? !password.equals(sftpHost.password) : sftpHost.password != null) {
+            return false;
+        }
+        if (username != null ? !username.equals(sftpHost.username) : sftpHost.username != null) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = hostname.hashCode();
+        result = 31 * result + port;
+        result = 31 * result + (username != null ? username.hashCode() : 0);
+        result = 31 * result + (password != null ? password.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s:%d (Username: %s)", hostname, port, username);
+    }
+}
\ No newline at end of file
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResource.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResource.java
new file mode 100644
index 000000000000..75c7888284ee
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResource.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+import org.gradle.internal.resource.AbstractExternalResource;
+import org.gradle.internal.resource.PasswordCredentials;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+
+public class SftpResource extends AbstractExternalResource {
+
+    private final SftpClientFactory clientFactory;
+    private final ExternalResourceMetaData metaData;
+    private final URI uri;
+    private final PasswordCredentials credentials;
+
+    private LockableSftpClient client;
+
+    public SftpResource(SftpClientFactory clientFactory, ExternalResourceMetaData metaData, URI uri, PasswordCredentials credentials) {
+        this.clientFactory = clientFactory;
+        this.metaData = metaData;
+        this.uri = uri;
+        this.credentials = credentials;
+    }
+
+    @Override
+    protected InputStream openStream() throws IOException {
+        client = clientFactory.createSftpClient(uri, credentials);
+        try {
+            return client.getSftpClient().get(uri.getPath());
+        } catch (com.jcraft.jsch.SftpException e) {
+            throw new SftpException(String.format("Could not get resource at '%s'.", uri), e);
+        }
+    }
+
+    public URI getURI() {
+        return uri;
+    }
+
+    public long getLastModified() {
+        return metaData.getLastModified().getTime();
+    }
+
+    public long getContentLength() {
+        return metaData.getContentLength();
+    }
+
+    public boolean exists() {
+        return true;
+    }
+
+    public boolean isLocal() {
+        return false;
+    }
+
+    public ExternalResourceMetaData getMetaData() {
+        return metaData;
+    }
+
+    public void close() throws IOException {
+        clientFactory.releaseSftpClient(client);
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceAccessor.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceAccessor.java
new file mode 100644
index 000000000000..e877affaa62d
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceAccessor.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+import com.jcraft.jsch.ChannelSftp;
+import com.jcraft.jsch.SftpATTRS;
+import org.gradle.internal.hash.HashValue;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.PasswordCredentials;
+import org.gradle.internal.resource.metadata.DefaultExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.transfer.ExternalResourceAccessor;
+
+import java.io.IOException;
+import java.net.URI;
+
+public class SftpResourceAccessor implements ExternalResourceAccessor {
+
+    private final SftpClientFactory sftpClientFactory;
+    private final PasswordCredentials credentials;
+
+    public SftpResourceAccessor(SftpClientFactory sftpClientFactory, PasswordCredentials credentials) {
+        this.sftpClientFactory = sftpClientFactory;
+        this.credentials = credentials;
+    }
+
+    public ExternalResourceMetaData getMetaData(URI uri) throws IOException {
+        LockableSftpClient sftpClient = sftpClientFactory.createSftpClient(uri, credentials);
+        try {
+            SftpATTRS attributes = sftpClient.getSftpClient().lstat(uri.getPath());
+            return attributes != null ? toMetaData(uri, attributes) : null;
+        } catch (com.jcraft.jsch.SftpException e) {
+            if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
+                return null;
+            }
+            throw new SftpException(String.format("Could not get resource '%s'.", uri), e);
+        } finally {
+            sftpClientFactory.releaseSftpClient(sftpClient);
+        }
+    }
+
+    private ExternalResourceMetaData toMetaData(URI uri, SftpATTRS attributes) {
+        long lastModified = -1;
+        long contentLength = -1;
+
+        if ((attributes.getFlags() & SftpATTRS.SSH_FILEXFER_ATTR_ACMODTIME) != 0) {
+            lastModified = attributes.getMTime() * 1000;
+        }
+        if ((attributes.getFlags() & SftpATTRS.SSH_FILEXFER_ATTR_SIZE) != 0) {
+            contentLength = attributes.getSize();
+        }
+
+        return new DefaultExternalResourceMetaData(uri, lastModified, contentLength, null, null);
+    }
+
+    public ExternalResource getResource(URI location) throws IOException {
+        ExternalResourceMetaData metaData = getMetaData(location);
+        return metaData != null ? new SftpResource(sftpClientFactory, metaData, location, credentials) : null;
+    }
+
+    public HashValue getResourceSha1(URI location) {
+        return null;
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceLister.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceLister.java
new file mode 100644
index 000000000000..ff96a5a000df
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceLister.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+import com.jcraft.jsch.ChannelSftp;
+import org.gradle.internal.resource.PasswordCredentials;
+import org.gradle.internal.resource.transfer.ExternalResourceLister;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Vector;
+
+public class SftpResourceLister implements ExternalResourceLister {
+    private final SftpClientFactory sftpClientFactory;
+    private final PasswordCredentials credentials;
+
+    public SftpResourceLister(SftpClientFactory sftpClientFactory, PasswordCredentials credentials) {
+        this.sftpClientFactory = sftpClientFactory;
+        this.credentials = credentials;
+    }
+
+    public List<String> list(URI parent) throws IOException {
+        LockableSftpClient client = sftpClientFactory.createSftpClient(parent, credentials);
+
+        try {
+            Vector<ChannelSftp.LsEntry> entries = client.getSftpClient().ls(parent.getPath());
+            List<String> list = new ArrayList<String>();
+            for (ChannelSftp.LsEntry entry : entries) {
+                list.add(entry.getFilename());
+            }
+            return list;
+        } catch (com.jcraft.jsch.SftpException e) {
+            if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
+                return null;
+            }
+            throw new SftpException(String.format("Could not list children for resource '%s'.", parent), e);
+        } finally {
+            sftpClientFactory.releaseSftpClient(client);
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceUploader.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceUploader.java
new file mode 100644
index 000000000000..ddccc1b79645
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpResourceUploader.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+import com.jcraft.jsch.ChannelSftp;
+import org.apache.commons.io.FilenameUtils;
+import org.gradle.internal.Factory;
+import org.gradle.internal.resource.PasswordCredentials;
+import org.gradle.internal.resource.transfer.ExternalResourceUploader;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+
+public class SftpResourceUploader implements ExternalResourceUploader {
+
+    private final SftpClientFactory sftpClientFactory;
+    private final PasswordCredentials credentials;
+
+    public SftpResourceUploader(SftpClientFactory sftpClientFactory, PasswordCredentials credentials) {
+        this.sftpClientFactory = sftpClientFactory;
+        this.credentials = credentials;
+    }
+
+    public void upload(Factory<InputStream> sourceFactory, Long contentLength, URI destination) throws IOException {
+        LockableSftpClient client = sftpClientFactory.createSftpClient(destination, credentials);
+
+        try {
+            ChannelSftp channel = client.getSftpClient();
+            ensureParentDirectoryExists(channel, destination);
+            InputStream sourceStream = sourceFactory.create();
+            try {
+                channel.put(sourceStream, destination.getPath());
+            } finally {
+                sourceStream.close();
+            }
+        } catch (com.jcraft.jsch.SftpException e) {
+            throw new SftpException(String.format("Could not write to resource '%s'.", destination), e);
+        } finally {
+            sftpClientFactory.releaseSftpClient(client);
+        }
+    }
+
+    private void ensureParentDirectoryExists(ChannelSftp channel, URI uri) {
+        String parentPath = FilenameUtils.getFullPathNoEndSeparator(uri.getPath());
+        if (parentPath.equals("")) {
+            return;
+        }
+        URI parent = uri.resolve(parentPath);
+
+        try {
+            channel.lstat(parentPath);
+            return;
+        } catch (com.jcraft.jsch.SftpException e) {
+            if (e.id != ChannelSftp.SSH_FX_NO_SUCH_FILE) {
+                throw new SftpException(String.format("Could not get resource '%s'.", parent), e);
+            }
+        }
+        ensureParentDirectoryExists(channel, parent);
+        try {
+            channel.mkdir(parentPath);
+        } catch (com.jcraft.jsch.SftpException e) {
+            throw new SftpException(String.format("Could not create resource '%s'.", parent), e);
+        }
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpTransport.java b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpTransport.java
new file mode 100644
index 000000000000..b49526b02b5e
--- /dev/null
+++ b/subprojects/core-impl/src/main/groovy/org/gradle/internal/resource/transport/sftp/SftpTransport.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp;
+
+import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager;
+import org.gradle.internal.resource.PasswordCredentials;
+import org.gradle.internal.resource.cached.CachedExternalResourceIndex;
+import org.gradle.internal.resource.transfer.CacheAwareExternalResourceAccessor;
+import org.gradle.internal.resource.transfer.DefaultCacheAwareExternalResourceAccessor;
+import org.gradle.internal.resource.transfer.ProgressLoggingExternalResourceAccessor;
+import org.gradle.internal.resource.transfer.ProgressLoggingExternalResourceUploader;
+import org.gradle.internal.resource.transport.AbstractRepositoryTransport;
+import org.gradle.internal.resource.transport.DefaultExternalResourceRepository;
+import org.gradle.internal.resource.transport.ExternalResourceRepository;
+import org.gradle.api.internal.file.TemporaryFileProvider;
+import org.gradle.logging.ProgressLoggerFactory;
+import org.gradle.util.BuildCommencedTimeProvider;
+
+public class SftpTransport extends AbstractRepositoryTransport {
+
+    private final ExternalResourceRepository repository;
+    private final DefaultCacheAwareExternalResourceAccessor resourceAccessor;
+
+    public SftpTransport(String name,
+                         PasswordCredentials credentials,
+                         ProgressLoggerFactory progressLoggerFactory,
+                         TemporaryFileProvider temporaryFileProvider,
+                         CachedExternalResourceIndex<String> cachedExternalResourceIndex,
+                         BuildCommencedTimeProvider timeProvider,
+                         SftpClientFactory sftpClientFactory,
+                         CacheLockingManager cacheLockingManager) {
+        super(name);
+        SftpResourceAccessor accessor = new SftpResourceAccessor(sftpClientFactory, credentials);
+        SftpResourceUploader uploader = new SftpResourceUploader(sftpClientFactory, credentials);
+        ProgressLoggingExternalResourceAccessor loggingAccessor = new ProgressLoggingExternalResourceAccessor(accessor, progressLoggerFactory);
+        resourceAccessor = new DefaultCacheAwareExternalResourceAccessor(loggingAccessor, cachedExternalResourceIndex, timeProvider, temporaryFileProvider, cacheLockingManager);
+        repository = new DefaultExternalResourceRepository(
+                name,
+                accessor,
+                new ProgressLoggingExternalResourceUploader(uploader, progressLoggerFactory),
+                new SftpResourceLister(sftpClientFactory, credentials),
+                temporaryFileProvider);
+    }
+
+    public boolean isLocal() {
+        return false;
+    }
+
+    public CacheAwareExternalResourceAccessor getResourceAccessor() {
+        return resourceAccessor;
+    }
+
+    public ExternalResourceRepository getRepository() {
+        return repository;
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifactTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifactTest.groovy
index 38dd852c7da0..1de7f566e763 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifactTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedArtifactTest.groovy
@@ -29,10 +29,10 @@ class DefaultResolvedArtifactTest extends Specification {
         def dependencySameModule = dep("group", "module1", "1.2")
         def dependency2 = dep("group", "module2", "1-beta")
         def ivyArt = Stub(IvyArtifactName)
-        def artifact = new DefaultResolvedArtifact(dependency, {} as Factory, ivyArt, artifactSource, 0)
-        def equalArtifact = new DefaultResolvedArtifact(dependencySameModule, {} as Factory, ivyArt, artifactSource, 0)
-        def differentModule = new DefaultResolvedArtifact(dependency2, {} as Factory, ivyArt, artifactSource, 0)
-        def differentName = new DefaultResolvedArtifact(dependency, {} as Factory, Stub(IvyArtifactName), artifactSource, 0)
+        def artifact = new DefaultResolvedArtifact(dependency, ivyArt, artifactSource, 0)
+        def equalArtifact = new DefaultResolvedArtifact(dependencySameModule, ivyArt, artifactSource, 0)
+        def differentModule = new DefaultResolvedArtifact(dependency2, ivyArt, artifactSource, 0)
+        def differentName = new DefaultResolvedArtifact(dependency, Stub(IvyArtifactName), artifactSource, 0)
 
         expect:
         artifact Matchers.strictlyEqual(equalArtifact)
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedDependencyTest.java b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedDependencyTest.java
index f88f6a184ece..881f47e1b3a1 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedDependencyTest.java
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/DefaultResolvedDependencyTest.java
@@ -115,7 +115,7 @@ public static DefaultResolvedArtifact createResolvedArtifact(final Mockery conte
             allowing(version).getId();
             will(returnValue(new DefaultModuleVersionIdentifier("group", name, "1.2")));
         }});
-        return new DefaultResolvedArtifact(resolvedDependency.getModule(), null , artifactStub, artifactSource, 0);
+        return new DefaultResolvedArtifact(resolvedDependency.getModule(), artifactStub, artifactSource, 0);
     }
 
     private DefaultResolvedDependency createResolvedDependency() {
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationSpec.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationSpec.groovy
index 0d01f1ce3ef0..aa67d537cc44 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationSpec.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationSpec.groovy
@@ -17,6 +17,7 @@ package org.gradle.api.internal.artifacts.configurations
 
 import org.gradle.api.Action
 import org.gradle.api.Task
+import org.gradle.api.artifacts.*
 import org.gradle.api.artifacts.result.ResolutionResult
 import org.gradle.api.internal.artifacts.ConfigurationResolver
 import org.gradle.api.internal.artifacts.ResolverResults
@@ -25,7 +26,6 @@ import org.gradle.api.tasks.TaskDependency
 import org.gradle.listener.ListenerBroadcast
 import org.gradle.listener.ListenerManager
 import spock.lang.Specification
-import org.gradle.api.artifacts.*
 
 class DefaultConfigurationSpec extends Specification {
 
@@ -317,4 +317,18 @@ class DefaultConfigurationSpec extends Specification {
         1 * resolver.resolve(config) >> resolverResults
         out == result
     }
+
+    def "provides task dependency from project dependency using 'needed'"() {
+        def conf = conf("conf")
+        when: def dep = conf.getTaskDependencyFromProjectDependency(true, "foo") as TasksFromProjectDependencies
+        then: dep.taskName == "foo"
+    }
+
+    def "provides task dependency from project dependency using 'dependents'"() {
+        def conf = conf("conf")
+        when: def dep = conf.getTaskDependencyFromProjectDependency(false, "bar") as TasksFromDependentProjects
+        then:
+        dep.taskName == "bar"
+        dep.configurationName == "conf"
+    }
 }
\ No newline at end of file
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationTest.java b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationTest.java
index 76d32708d0e0..d7f9f6b0a081 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationTest.java
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/DefaultConfigurationTest.java
@@ -29,7 +29,6 @@
 import org.gradle.api.internal.artifacts.publish.DefaultPublishArtifact;
 import org.gradle.api.specs.Spec;
 import org.gradle.api.specs.Specs;
-import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.TaskDependency;
 import org.gradle.listener.ListenerBroadcast;
 import org.gradle.listener.ListenerManager;
@@ -37,6 +36,7 @@
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -52,6 +52,9 @@
 
 @RunWith(JMock.class)
 public class DefaultConfigurationTest {
+
+    //TODO **** if you touch this class, try pushing out more coverage into new DefaultConfigurationSpec ****
+
     private JUnit4Mockery context = new JUnit4GroovyMockery();
     private ConfigurationResolver dependencyResolver = context.mock(ConfigurationResolver.class);
     private ConfigurationsProvider configurationContainer;
@@ -255,7 +258,7 @@ public void fileCollectionWithDependencies() {
     public void filesWithSpec() {
         final Set<File> fileSet = toSet(new File("somePath"));
         prepareForFilesBySpec(fileSet);
-        assertThat(configuration.files(context.mock(Spec.class)), equalTo(fileSet));
+        Assert.<Set<File>>assertThat(configuration.files(context.mock(Spec.class)), equalTo(fileSet));
         assertThat(configuration.getState(), equalTo(Configuration.State.RESOLVED));
     }
 
@@ -512,64 +515,6 @@ public void buildDependenciesDelegatesToInheritedConfigurations() {
         assertThat(configuration.getBuildDependencies().getDependencies(target), equalTo((Set) toSet(otherConfTaskMock)));
     }
 
-    @SuppressWarnings("unchecked")
-    @Test public void taskDependencyFromProjectDependencyUsingNeeded() {
-        Configuration superConfig = createNamedConfiguration("superConf");
-        configuration.extendsFrom(superConfig);
-
-        final ProjectDependency projectDependencyStub = context.mock(ProjectDependency.class);
-        superConfig.getDependencies().add(projectDependencyStub);
-
-        final Project projectStub = context.mock(Project.class);
-        final TaskContainer taskContainerStub = context.mock(TaskContainer.class);
-        final Task taskStub = context.mock(Task.class);
-        final String taskName = "testit";
-
-        context.checking(new Expectations() {{
-            allowing(projectDependencyStub).getDependencyProject(); will(returnValue(projectStub));
-            allowing(projectStub).getTasks(); will(returnValue(taskContainerStub));
-            allowing(taskContainerStub).findByName(taskName); will(returnValue(taskStub));
-        }});
-
-        TaskDependency td = configuration.getTaskDependencyFromProjectDependency(true, taskName);
-        Task unusedTask = context.mock(Task.class, "unused");
-
-        assertThat((Set<Task>) td.getDependencies(unusedTask), equalTo(toSet(taskStub)));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Test public void taskDependencyFromProjectDependencyUsingDependents() {
-        final String configName = configuration.getName();
-        final String taskName = "testit";
-        final Task tdTask = context.mock(Task.class, "tdTask");
-        final Project taskProject = context.mock(Project.class, "taskProject");
-        final Project rootProject = context.mock(Project.class, "rootProject");
-        final Project dependentProject = context.mock(Project.class, "dependentProject");
-        final Task desiredTask = context.mock(Task.class, "desiredTask");
-        final Set<Task> taskSet = toSet(desiredTask);
-        final ConfigurationContainer configurationContainer = context.mock(ConfigurationContainer.class);
-        final Configuration dependentConfig = context.mock(Configuration.class);
-        final ProjectDependency projectDependency = context.mock(ProjectDependency.class);
-        final Set<ProjectDependency> projectDependencies = toDomainObjectSet(ProjectDependency.class, projectDependency);
-        final DependencySet otherDependencies = context.mock(DependencySet.class);
-
-        context.checking(new Expectations() {{
-            allowing(tdTask).getProject(); will(returnValue(taskProject));
-            allowing(taskProject).getRootProject(); will(returnValue(rootProject));
-            allowing(rootProject).getTasksByName(taskName, true); will(returnValue(taskSet));
-            allowing(desiredTask).getProject(); will(returnValue(dependentProject));
-            allowing(dependentProject).getConfigurations(); will(returnValue(configurationContainer));
-            allowing(configurationContainer).findByName(configName); will(returnValue(dependentConfig));
-
-            allowing(dependentConfig).getAllDependencies(); will(returnValue(otherDependencies));
-            allowing(otherDependencies).withType(ProjectDependency.class); will(returnValue(projectDependencies));
-            allowing(projectDependency).getDependencyProject(); will(returnValue(taskProject));
-        }});
-
-        TaskDependency td = configuration.getTaskDependencyFromProjectDependency(false, taskName);
-        assertThat((Set<Task>) td.getDependencies(tdTask), equalTo(toSet(desiredTask)));
-    }
-
     @SuppressWarnings("unchecked")
     @Test public void taskDependencyFromProjectDependencyWithoutCommonConfiguration() {
         // This test exists because a NullPointerException was thrown by
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromDependentProjectsTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromDependentProjectsTest.groovy
new file mode 100644
index 000000000000..0f0bf22a0744
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromDependentProjectsTest.groovy
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+
+
+package org.gradle.api.internal.artifacts.configurations
+
+import org.gradle.api.internal.tasks.TaskDependencyResolveContext
+import org.gradle.util.TestUtil
+import spock.lang.Specification
+
+class TasksFromDependentProjectsTest extends Specification {
+
+    def context = Mock(TaskDependencyResolveContext)
+    def root = TestUtil.createRootProject()
+    def child1 = TestUtil.createChildProject(root, "child1")
+    def child2 = TestUtil.createChildProject(root, "child2")
+    def child3 = TestUtil.createChildProject(root, "child3")
+    def child4 = TestUtil.createChildProject(root, "child4")
+
+    def checker = Mock(TasksFromDependentProjects.TaskDependencyChecker)
+
+    def "provides all tasks from dependent projects"() {
+        def dep = new TasksFromDependentProjects("buildDependents", "testRuntime", checker)
+
+        [child1, child2, child3].each {
+            it.configurations.create "testRuntime"
+            it.configurations.create "conf"
+            it.tasks.create "buildDependents"
+            it.tasks.create "someTask"
+        }
+
+        when: dep.resolve(context)
+        then:
+        1 * context.getTask() >> child1.tasks["buildDependents"]
+        1 * checker.isDependent(child1, "testRuntime", child1) >> false
+        1 * checker.isDependent(child1, "testRuntime", child2) >> false
+        1 * checker.isDependent(child1, "testRuntime", child3) >> true
+        1 * context.add(child3.tasks["buildDependents"])
+        0 * _
+    }
+
+    def "knows which tasks come from dependent projects with specific configuration"() {
+        def checker = new TasksFromDependentProjects.TaskDependencyChecker()
+
+        child2.configurations.create "testRuntime"
+        child2.dependencies.add("testRuntime", child1) //good
+
+        child3.configurations.create "conf"
+        child3.configurations.create "testRuntime"
+        child3.dependencies.add("conf", child1) //different config dependency, no good
+
+        child4.configurations.create "conf"     //different config, no good
+
+        expect:
+        checker.isDependent(child1, "testRuntime", child2)
+        !checker.isDependent(child1, "testRuntime", child3)
+        !checker.isDependent(child1, "testRuntime", child4)
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromProjectDependenciesTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromProjectDependenciesTest.groovy
new file mode 100644
index 000000000000..57bb9241d9da
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/configurations/TasksFromProjectDependenciesTest.groovy
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+
+
+package org.gradle.api.internal.artifacts.configurations
+
+import org.gradle.api.artifacts.DependencySet
+import org.gradle.api.artifacts.ProjectDependency
+import org.gradle.api.internal.project.ProjectInternal
+import org.gradle.api.internal.tasks.TaskDependencyResolveContext
+import org.gradle.util.TestUtil
+import spock.lang.Specification
+
+class TasksFromProjectDependenciesTest extends Specification {
+
+    def dependencies = Mock(DependencySet)
+    def context = Mock(TaskDependencyResolveContext)
+    def project1 = TestUtil.createRootProject()
+    def project2 = TestUtil.createChildProject(project1, "project2")
+    def projectDep1 = Mock(ProjectDependency) { getDependencyProject() >> project1 }
+    def projectDep2 = Mock(ProjectDependency) { getDependencyProject() >> project2 }
+    def taskContainerDummy = project1.tasks
+
+    def "provides tasks from project dependencies"() {
+        def tasks = new TasksFromProjectDependencies("buildNeeded", dependencies)
+
+        project1.tasks.create "buildNeeded"
+        project2.tasks.create "foo"
+
+        when: tasks.resolveProjectDependencies(context, [projectDep1, projectDep2] as Set)
+
+        then:
+        1 * context.add(project1.tasks["buildNeeded"])
+        0 * context._
+    }
+
+    def "evaluates target project"() {
+        def tasks = new TasksFromProjectDependencies("buildNeeded", dependencies)
+
+        def project1 = Mock(ProjectInternal) { getTasks() >> taskContainerDummy }
+        def projectDep1 = Mock(ProjectDependency) { getDependencyProject() >> project1}
+
+        when: tasks.resolveProjectDependencies(context, [projectDep1] as Set)
+
+        then:
+        1 * project1.evaluate()
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandlerTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandlerTest.groovy
index 974615b15600..476f77bc1b49 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandlerTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/dsl/DefaultComponentMetadataHandlerTest.groovy
@@ -15,9 +15,12 @@
  */
 
 package org.gradle.api.internal.artifacts.dsl
-
+import org.gradle.api.GradleException
+import org.gradle.api.artifacts.ComponentMetadataDetails
+import org.gradle.api.artifacts.IvyModuleDescriptor
 import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionResolveException
+import org.gradle.api.internal.artifacts.metadata.IvyModuleVersionMetaData
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData
 import org.gradle.internal.reflect.DirectInstantiator
 import spock.lang.Specification
@@ -39,4 +42,165 @@ class DefaultComponentMetadataHandlerTest extends Specification {
         ModuleVersionResolveException e = thrown()
         e.message == /Unexpected status 'green' specified for group:module:version. Expected one of: [alpha, beta]/
     }
+
+    def "supports rule with untyped ComponentMetaDataDetails parameter"() {
+        def metadata = Stub(MutableModuleVersionMetaData) {
+            getId() >> new DefaultModuleVersionIdentifier("group", "module", "version")
+            getStatus() >> "integration"
+            getStatusScheme() >> ["integration", "release"]
+        }
+        def capturedDetails = null
+        handler.eachComponent { details ->
+            capturedDetails = details
+        }
+
+        when:
+        handler.process(metadata)
+
+        then:
+        noExceptionThrown()
+        capturedDetails instanceof ComponentMetadataDetails
+        with(capturedDetails) {
+            id.group == "group"
+            id.name == "module"
+            id.version == "version"
+            status == "integration"
+            statusScheme == ["integration", "release"]
+        }
+    }
+
+    def "supports rule with typed ComponentMetaDataDetails parameter"() {
+        def metadata = Stub(MutableModuleVersionMetaData) {
+            getId() >> new DefaultModuleVersionIdentifier("group", "module", "version")
+            getStatus() >> "integration"
+            getStatusScheme() >> ["integration", "release"]
+        }
+        def capturedDetails = null
+        handler.eachComponent { ComponentMetadataDetails details ->
+            capturedDetails = details
+        }
+
+        when:
+        handler.process(metadata)
+
+        then:
+        noExceptionThrown()
+        capturedDetails instanceof ComponentMetadataDetails
+        with(capturedDetails) {
+            id.group == "group"
+            id.name == "module"
+            id.version == "version"
+            status == "integration"
+            statusScheme == ["integration", "release"]
+        }
+    }
+
+    def "supports rule with typed IvyModuleDescriptor parameter"() {
+        def metadata = Stub(TestIvyMetaData) {
+            getId() >> new DefaultModuleVersionIdentifier("group", "module", "version")
+            getStatus() >> "integration"
+            getStatusScheme() >> ["integration", "release"]
+            getExtraInfo() >> [info1: "info1 value", info2: "info2 value"]
+        }
+        def capturedDescriptor = null
+        handler.eachComponent { details, IvyModuleDescriptor descriptor ->
+            capturedDescriptor = descriptor
+        }
+
+        when:
+        handler.process(metadata)
+
+        then:
+        noExceptionThrown()
+        capturedDescriptor instanceof IvyModuleDescriptor
+        with(capturedDescriptor) {
+            extraInfo == [info1: "info1 value", info2: "info2 value"]
+        }
+    }
+
+    def "rule with IvyModuleDescriptor parameter does not get invoked for non-Ivy components"() {
+        def metadata = Stub(MutableModuleVersionMetaData) {
+            getId() >> new DefaultModuleVersionIdentifier("group", "module", "version")
+            getStatus() >> "integration"
+            getStatusScheme() >> ["integration", "release"]
+        }
+
+        def invoked = false
+        handler.eachComponent { details, IvyModuleDescriptor descriptor ->
+            invoked = true
+        }
+
+        when:
+        handler.process(metadata)
+
+        then:
+        !invoked
+    }
+
+    def "complains if rule has unsupported parameter type"() {
+        def metadata = Stub(MutableModuleVersionMetaData) {
+            getId() >> new DefaultModuleVersionIdentifier("group", "module", "version")
+            getStatus() >> "integration"
+            getStatusScheme() >> ["integration", "release"]
+        }
+
+        def invoked = false
+        handler.eachComponent { details, String str ->
+            invoked = true
+        }
+
+        when:
+        handler.process(metadata)
+
+        then:
+        def e = thrown(GradleException)
+        e.message == "Unsupported parameter type for component metadata rule: java.lang.String"
+        !invoked
+    }
+
+    def "supports rule with multiple parameters in arbitrary order"() {
+        def metadata = Stub(TestIvyMetaData) {
+            getId() >> new DefaultModuleVersionIdentifier("group", "module", "version")
+            getStatus() >> "integration"
+            getStatusScheme() >> ["integration", "release"]
+            getExtraInfo() >> [info1: "info1 value", info2: "info2 value"]
+        }
+
+        def capturedDetails1 = null
+        def capturedDetails2 = null
+        def capturedDescriptor1 = null
+        def capturedDescriptor2 = null
+
+        handler.eachComponent { IvyModuleDescriptor descriptor1, details1, IvyModuleDescriptor descriptor2, ComponentMetadataDetails details2  ->
+            capturedDetails1 = details1
+            capturedDetails2 = details2
+            capturedDescriptor1 = descriptor1
+            capturedDescriptor2 = descriptor2
+        }
+
+        when:
+        handler.process(metadata)
+
+        then:
+        noExceptionThrown()
+        capturedDetails1 instanceof ComponentMetadataDetails
+        with(capturedDetails1) {
+            id.group == "group"
+            id.name == "module"
+            id.version == "version"
+            status == "integration"
+            statusScheme == ["integration", "release"]
+        }
+        capturedDetails2.is(capturedDetails1)
+        capturedDescriptor1 instanceof IvyModuleDescriptor
+        with(capturedDescriptor1) {
+            extraInfo == [info1: "info1 value", info2: "info2 value"]
+        }
+        capturedDescriptor2 instanceof IvyModuleDescriptor
+        with(capturedDescriptor2) {
+            extraInfo == [info1: "info1 value", info2: "info2 value"]
+        }
+    }
+
+    interface TestIvyMetaData extends IvyModuleVersionMetaData, MutableModuleVersionMetaData {}
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayoutTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayoutTest.groovy
index 037e189b07bf..5c0c18b76f0b 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayoutTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/CacheLayoutTest.groovy
@@ -46,9 +46,9 @@ class CacheLayoutTest extends Specification {
         CacheLayout cacheLayout = CacheLayout.META_DATA
 
         then:
-        cacheLayout.key == 'metadata-2.6'
-        cacheLayout.version == VersionNumber.parse("2.6.0")
-        cacheLayout.formattedVersion == '2.6'
-        cacheLayout.getPath(new File('some/dir')) == new File('some/dir/metadata-2.6')
+        cacheLayout.key == 'metadata-2.12'
+        cacheLayout.version == VersionNumber.parse("2.12.0")
+        cacheLayout.formattedVersion == '2.12'
+        cacheLayout.getPath(new File('some/dir')) == new File('some/dir/metadata-2.12')
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResultTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResultTest.groovy
index 8872dbe58f56..f37164bc7d94 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResultTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/DefaultBuildableArtifactResolveResultTest.groovy
@@ -15,14 +15,64 @@
  */
 
 package org.gradle.api.internal.artifacts.ivyservice
-
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ArtifactNotFoundException
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ArtifactResolveException
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactIdentifier
 import spock.lang.Specification
 
 class DefaultBuildableArtifactResolveResultTest extends Specification {
     final result = new DefaultBuildableArtifactResolveResult()
+    final artifactFile = Mock(File)
+    final artifactId = Mock(ComponentArtifactIdentifier)
+
+    def "has no result by default"() {
+        expect:
+        !result.hasResult()
+    }
+
+    def "can have artifact result"() {
+        when:
+        result.resolved(artifactFile)
+
+        then:
+        result.file == artifactFile
+        result.failure == null
+        result.hasResult()
+    }
+
+    def "can have missing result"() {
+        when:
+        result.notFound(artifactId)
+
+        then:
+        result.failure instanceof ArtifactNotFoundException
+        result.hasResult()
+
+        when:
+        result.file
+
+        then:
+        def e = thrown(ArtifactNotFoundException)
+        result.failure == e
+    }
+
+    def "can have failure result"() {
+        def failure = new ArtifactResolveException("broken")
+
+        when:
+        result.failed(failure)
+
+        then:
+        result.failure == failure
+        result.hasResult()
+
+        when:
+        result.file
+
+        then:
+        ArtifactResolveException e = thrown()
+        e == failure
+    }
 
     def "cannot get file when no result specified"() {
         when:
@@ -53,12 +103,4 @@ class DefaultBuildableArtifactResolveResultTest extends Specification {
         ArtifactResolveException e = thrown()
         e == failure
     }
-
-    def "fails with not found exception when artifact not found"() {
-        when:
-        result.notFound(Stub(ModuleVersionArtifactIdentifier))
-
-        then:
-        result.failure instanceof ArtifactNotFoundException
-    }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolverTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolverTest.groovy
index 1b72673a5f1e..946c450ebf3f 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolverTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/clientmodule/ClientModuleResolverTest.groovy
@@ -15,81 +15,90 @@
  */
 
 package org.gradle.api.internal.artifacts.ivyservice.clientmodule
-
 import org.apache.ivy.core.module.descriptor.DependencyDescriptor
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor
+import org.apache.ivy.core.module.id.ModuleRevisionId
+import org.gradle.api.artifacts.ClientModule
+import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.internal.artifacts.ivyservice.BuildableComponentResolveResult
 import org.gradle.api.internal.artifacts.ivyservice.DependencyToModuleVersionResolver
 import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionResolveException
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource
-import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.ClientModuleDependencyDescriptor
+import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.DependencyDescriptorFactory
+import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.EnhancedDependencyDescriptor
 import org.gradle.api.internal.artifacts.metadata.DependencyMetaData
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
+import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData
 import spock.lang.Specification
 
 import static org.gradle.api.internal.artifacts.DefaultModuleVersionSelector.newSelector
 
 class ClientModuleResolverTest extends Specification {
-    final ModuleSource moduleSource = Mock()
-    final ModuleVersionMetaData moduleMetaData = Mock()
-    final DependencyToModuleVersionResolver target = Mock()
-    final ClientModuleResolver resolver = new ClientModuleResolver(target)
+    final target = Mock(DependencyToModuleVersionResolver)
+    final dependencyDescriptorFactory = Mock(DependencyDescriptorFactory)
+    final ClientModuleResolver resolver = new ClientModuleResolver(target, dependencyDescriptorFactory)
+
+    def result = Mock(BuildableComponentResolveResult)
+    def metaData = Mock(MutableModuleVersionMetaData)
+    def descriptor = Mock(EnhancedDependencyDescriptor)
+    def dependency = Mock(DependencyMetaData) {
+        getDescriptor() >> descriptor
+    }
 
     def "replaces meta-data for a client module dependency"() {
-        ClientModuleDependencyDescriptor dependencyDescriptor = Mock()
-        DependencyMetaData dependencyMetaData = Mock()
-        BuildableComponentResolveResult result = Mock()
-        ModuleVersionMetaData resolvedMetaData = Mock()
-
-        given:
-
-        _ * dependencyMetaData.descriptor >> dependencyDescriptor
-        _ * dependencyDescriptor.getTargetModule() >> moduleMetaData
+        def clientModule = Mock(ClientModule)
+        def dep = Mock(ModuleDependency)
+        def moduleDescriptor = Mock(ModuleDescriptor)
+        def dependencyDescriptor = Mock(DependencyDescriptor)
+        def artifact = Mock(ModuleVersionArtifactMetaData)
 
         when:
-        resolver.resolve(dependencyMetaData, result)
+        resolver.resolve(dependency, result)
 
         then:
-        1 * target.resolve(dependencyMetaData, result)
-        1 * result.getMetaData() >> resolvedMetaData
-        1 * resolvedMetaData.getSource() >> moduleSource
-        1 * dependencyDescriptor.getTargetModule() >> moduleMetaData
-        1 * moduleMetaData.withSource(moduleSource) >> moduleMetaData
-        1 * result.setMetaData(moduleMetaData)
-        _ * result.failure >> null
-        0 * result._
+        1 * target.resolve(dependency, result)
+        1 * result.getFailure() >> null
+        1 * dependency.descriptor >> descriptor
+        1 * descriptor.moduleDependency >> clientModule
+        1 * result.getMetaData() >> metaData
+        1 * metaData.copy() >> metaData
+        1 * clientModule.getDependencies() >> ([dep] as Set)
+        1 * dep.getConfiguration() >> "config"
+        1 * metaData.getDescriptor() >> moduleDescriptor
+        1 * dependencyDescriptorFactory.createDependencyDescriptor("config", moduleDescriptor, dep) >> dependencyDescriptor
+        1 * dependencyDescriptor.getDependencyRevisionId() >> ModuleRevisionId.newInstance("org", "mod", "1.0")
+        1 * metaData.setDependencies({
+            it.size() == 1 && it[0].descriptor == dependencyDescriptor
+        })
+        1 * metaData.artifact('jar', 'jar', null) >> artifact
+        1 * metaData.setArtifacts({
+            (it as List) == [artifact]
+        })
+        1 * result.setMetaData(metaData)
+        0 * _
     }
 
-    def "does not replace meta-data for unknown module version"() {
-        DependencyDescriptor dependencyDescriptor = Mock()
-        DependencyMetaData dependencyMetaData = Mock()
-        BuildableComponentResolveResult result = Mock()
-
-        given:
-        _ * dependencyMetaData.descriptor >> dependencyDescriptor
+    def "does not replace meta-data when not client module"() {
+        def descriptor = Mock(EnhancedDependencyDescriptor)
+        def moduleDependency = Mock(ModuleDependency)
 
         when:
-        resolver.resolve(dependencyMetaData, result)
+        resolver.resolve(dependency, result)
 
         then:
-        1 * target.resolve(dependencyMetaData, result)
-        _ * result.failure >> null
-        0 * result._
+        1 * target.resolve(dependency, result)
+        1 * result.getFailure() >> null
+        1 * dependency.descriptor >> descriptor
+        1 * descriptor.moduleDependency >> moduleDependency
+        0 * _
     }
 
     def "does not replace meta-data for broken module version"() {
-        ClientModuleDependencyDescriptor dependencyDescriptor = Mock()
-        DependencyMetaData dependencyMetaData = Mock()
-        BuildableComponentResolveResult result = Mock()
-
-        given:
-        _ * dependencyMetaData.descriptor >> dependencyDescriptor
-
         when:
-        resolver.resolve(dependencyMetaData, result)
+        resolver.resolve(dependency, result)
 
         then:
-        1 * target.resolve(dependencyMetaData, result)
+        1 * target.resolve(dependency, result)
         _ * result.failure >> new ModuleVersionResolveException(newSelector("a", "b", "c"), "broken")
-        0 * result._
+        0 * _
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepositoryTest.groovy
new file mode 100644
index 000000000000..a52607b84fc2
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/BaseModuleComponentRepositoryTest.groovy
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
+
+import spock.lang.Specification
+
+class BaseModuleComponentRepositoryTest extends Specification {
+    final delegate = Mock(ModuleComponentRepository)
+    final localAccess = Mock(ModuleComponentRepositoryAccess)
+    final remoteAccess = Mock(ModuleComponentRepositoryAccess)
+
+    def "delegates id and name methods"() {
+        when:
+        final repository = new BaseModuleComponentRepository(delegate, localAccess, remoteAccess)
+        1 * delegate.id >> "id"
+        1 * delegate.name >> "name"
+
+        then:
+        repository.id == "id"
+        repository.name == "name"
+    }
+
+    def "delegates access methods"() {
+        when:
+        final repository = new BaseModuleComponentRepository(delegate)
+
+        then:
+        repository.localAccess == localAccess
+        repository.remoteAccess == remoteAccess
+
+        and:
+        1 * delegate.localAccess >> localAccess
+        1 * delegate.remoteAccess >> remoteAccess
+    }
+
+    def "returns supplied local and remote access"() {
+        when:
+        final repository = new BaseModuleComponentRepository(delegate, localAccess, remoteAccess)
+
+        then:
+        repository.localAccess == localAccess
+        repository.remoteAccess == remoteAccess
+
+        and:
+        0 * delegate._
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleComponentRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleComponentRepositoryTest.groovy
new file mode 100644
index 000000000000..95491cd5f744
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleComponentRepositoryTest.groovy
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
+
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
+import org.gradle.api.internal.artifacts.ModuleMetadataProcessor
+import org.gradle.api.internal.artifacts.configurations.dynamicversion.CachePolicy
+import org.gradle.api.internal.artifacts.ivyservice.ArtifactType
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.ComponentUsage
+import org.gradle.api.internal.artifacts.ivyservice.DefaultBuildableArtifactSetResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.dynamicversions.ModuleVersionsCache
+import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleArtifactsCache
+import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleMetaDataCache
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData
+import org.gradle.api.internal.artifacts.metadata.ComponentMetaData
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
+import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData
+import org.gradle.internal.resource.cached.CachedArtifactIndex
+import org.gradle.internal.resource.cached.ivy.ArtifactAtRepositoryKey
+import org.gradle.util.BuildCommencedTimeProvider
+import spock.lang.Specification
+import spock.lang.Unroll
+
+class CachingModuleComponentRepositoryTest extends Specification {
+    def realLocalAccess = Mock(ModuleComponentRepositoryAccess)
+    def realRemoteAccess = Mock(ModuleComponentRepositoryAccess)
+    def realRepo = Stub(ModuleComponentRepository) {
+        getId() >> "repo-id"
+        getLocalAccess() >> realLocalAccess
+        getRemoteAccess() >> realRemoteAccess
+    }
+    def moduleResolutionCache = Stub(ModuleVersionsCache)
+    def moduleDescriptorCache = Mock(ModuleMetaDataCache)
+    def moduleArtifactsCache = Mock(ModuleArtifactsCache)
+    def artifactAtRepositoryCache = Mock(CachedArtifactIndex)
+    def cachePolicy = Stub(CachePolicy)
+    def metadataProcessor = Stub(ModuleMetadataProcessor)
+    def repo = new CachingModuleComponentRepository(realRepo, moduleResolutionCache, moduleDescriptorCache, moduleArtifactsCache, artifactAtRepositoryCache,
+            cachePolicy, new BuildCommencedTimeProvider(), metadataProcessor)
+
+    @Unroll
+    def "artifact last modified date is cached - lastModified = #lastModified"() {
+        given:
+        def artifactId = Stub(ModuleVersionArtifactIdentifier)
+        def artifact = Stub(ModuleVersionArtifactMetaData) {
+            getId() >> artifactId
+        }
+
+        def file = new File("local")
+        def result = Stub(BuildableArtifactResolveResult) {
+            getFile() >> file
+            getFailure() >> null
+        }
+
+        def descriptorHash = 1234G
+        def moduleSource = Stub(CachingModuleComponentRepository.CachingModuleSource) {
+            getDescriptorHash() >> descriptorHash
+        }
+
+        ArtifactAtRepositoryKey atRepositoryKey = new ArtifactAtRepositoryKey("repo-id", artifactId)
+
+        when:
+        repo.remoteAccess.resolveArtifact(artifact, moduleSource, result)
+
+        then:
+        1 * artifactAtRepositoryCache.store(atRepositoryKey, file, descriptorHash)
+        0 * moduleDescriptorCache._
+
+        where:
+        lastModified << [new Date(), null]
+    }
+
+    def "does not use cache when module version listing can be determined locally"() {
+        def dependency = Mock(DependencyMetaData)
+        def result = new DefaultBuildableModuleVersionSelectionResolveResult()
+
+        when:
+        repo.localAccess.listModuleVersions(dependency, result)
+
+        then:
+        realLocalAccess.listModuleVersions(dependency, result) >> {
+            result.listed(Mock(ModuleVersionListing))
+        }
+        0 * _
+    }
+
+    def "does not use cache when component metadata can be determined locally"() {
+        def dependency = Mock(DependencyMetaData)
+        def componentId = Mock(ModuleComponentIdentifier)
+        def result = new DefaultBuildableModuleVersionMetaDataResolveResult()
+
+        when:
+        repo.localAccess.resolveComponentMetaData(dependency, componentId, result)
+
+        then:
+        realLocalAccess.resolveComponentMetaData(dependency, componentId, result) >> {
+            result.resolved(Mock(MutableModuleVersionMetaData), Mock(ModuleSource))
+        }
+        0 * _
+    }
+    def "does not use cache when artifacts for type can be determined locally"() {
+        def component = Mock(ComponentMetaData)
+        def source = Mock(ModuleSource)
+        def cachingSource = new CachingModuleComponentRepository.CachingModuleSource(BigInteger.ONE, false, source)
+        def artifactType = Mock(ArtifactType)
+        def result = new DefaultBuildableArtifactSetResolveResult()
+
+        when:
+        repo.localAccess.resolveModuleArtifacts(component, artifactType, result)
+
+        then:
+        1 * component.getSource() >> cachingSource
+        1 * component.withSource(source) >> component
+        realLocalAccess.resolveModuleArtifacts(component, artifactType, result) >> {
+            result.resolved([Mock(ComponentArtifactMetaData)])
+        }
+        0 * _
+    }
+
+    def "does not use cache when artifacts for usage can be determined locally"() {
+        def component = Mock(ComponentMetaData)
+        def source = Mock(ModuleSource)
+        def cachingSource = new CachingModuleComponentRepository.CachingModuleSource(BigInteger.ONE, false, source)
+        def componentUsage = Mock(ComponentUsage)
+        def result = new DefaultBuildableArtifactSetResolveResult()
+
+        when:
+        repo.localAccess.resolveModuleArtifacts(component, componentUsage, result)
+
+        then:
+        1 * component.getSource() >> cachingSource
+        1 * component.withSource(source) >> component
+        realLocalAccess.resolveModuleArtifacts(component, componentUsage, result) >> {
+            result.resolved([Mock(ComponentArtifactMetaData)])
+        }
+        0 * _
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleVersionRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleVersionRepositoryTest.groovy
deleted file mode 100644
index d6b959141d32..000000000000
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/CachingModuleVersionRepositoryTest.groovy
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
-import org.gradle.api.Transformer
-import org.gradle.api.internal.artifacts.ModuleMetadataProcessor
-import org.gradle.api.internal.artifacts.configurations.dynamicversion.CachePolicy
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.DefaultBuildableArtifactSetResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.dynamicversions.ModuleVersionsCache
-import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleArtifactsCache
-import org.gradle.api.internal.artifacts.ivyservice.modulecache.ModuleMetaDataCache
-import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData
-import org.gradle.api.internal.artifacts.metadata.ComponentMetaData
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
-import org.gradle.api.internal.externalresource.cached.CachedArtifactIndex
-import org.gradle.api.internal.externalresource.ivy.ArtifactAtRepositoryKey
-import org.gradle.util.BuildCommencedTimeProvider
-import spock.lang.Specification
-import spock.lang.Unroll
-
-class CachingModuleVersionRepositoryTest extends Specification {
-    def realRepo = Stub(LocalArtifactsModuleVersionRepository) {
-        getId() >> "repo-id"
-    }
-    def moduleResolutionCache = Stub(ModuleVersionsCache)
-    def moduleDescriptorCache = Mock(ModuleMetaDataCache)
-    def moduleArtifactsCache = Mock(ModuleArtifactsCache)
-    def artifactAtRepositoryCache = Mock(CachedArtifactIndex)
-    def cachePolicy = Stub(CachePolicy)
-    def metadataProcessor = Stub(ModuleMetadataProcessor)
-    def moduleExtractor = Mock(Transformer)
-    def repo = new CachingModuleVersionRepository(realRepo, moduleResolutionCache, moduleDescriptorCache, moduleArtifactsCache, artifactAtRepositoryCache,
-            cachePolicy, new BuildCommencedTimeProvider(), metadataProcessor, moduleExtractor)
-
-    @Unroll
-    def "last modified date is cached - lastModified = #lastModified"() {
-        given:
-        def artifactId = Stub(ModuleVersionArtifactIdentifier)
-        def artifact = Stub(ModuleVersionArtifactMetaData) {
-            getId() >> artifactId
-        }
-
-        def file = new File("local")
-        def result = Stub(BuildableArtifactResolveResult) {
-            getFile() >> file
-            getFailure() >> null
-        }
-
-        def descriptorHash = 1234G
-        def moduleSource = Stub(CachingModuleVersionRepository.CachingModuleSource) {
-            getDescriptorHash() >> descriptorHash
-        }
-
-        ArtifactAtRepositoryKey atRepositoryKey = new ArtifactAtRepositoryKey("repo-id", artifactId)
-
-        when:
-        repo.resolveArtifact(artifact, moduleSource, result)
-
-        then:
-        1 * artifactAtRepositoryCache.store(atRepositoryKey, file, descriptorHash)
-        0 * moduleDescriptorCache._
-
-        where:
-        lastModified << [new Date(), null]
-    }
-
-    def "does not use cache when artifact set can be determined locally"() {
-        def component = Mock(ComponentMetaData)
-        def source = Mock(ModuleSource)
-        def cachingSource = new CachingModuleVersionRepository.CachingModuleSource(BigInteger.ONE, false, source)
-        def context = Mock(ArtifactResolveContext)
-        def result = new DefaultBuildableArtifactSetResolveResult()
-
-        when:
-        repo.resolveModuleArtifacts(component, context, result)
-
-        then:
-        1 * component.getSource() >> cachingSource
-        1 * component.withSource(source) >> component
-        realRepo.localResolveModuleArtifacts(component, context, result) >> {
-            result.resolved([Mock(ComponentArtifactMetaData)])
-        }
-        0 * _
-    }
-}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResultTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResultTest.groovy
index 1388a953e5dc..aedabee9faf3 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResultTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionMetaDataResolveResultTest.groovy
@@ -29,6 +29,7 @@ class DefaultBuildableModuleVersionMetaDataResolveResultTest extends Specificati
     def "has unknown state by default"() {
         expect:
         descriptor.state == BuildableModuleVersionMetaDataResolveResult.State.Unknown
+        !descriptor.hasResult()
     }
 
     def "can mark as missing"() {
@@ -38,6 +39,7 @@ class DefaultBuildableModuleVersionMetaDataResolveResultTest extends Specificati
         then:
         descriptor.state == BuildableModuleVersionMetaDataResolveResult.State.Missing
         descriptor.failure == null
+        descriptor.hasResult()
     }
 
     def "can mark as probably missing"() {
@@ -47,6 +49,7 @@ class DefaultBuildableModuleVersionMetaDataResolveResultTest extends Specificati
         then:
         descriptor.state == BuildableModuleVersionMetaDataResolveResult.State.ProbablyMissing
         descriptor.failure == null
+        descriptor.hasResult()
     }
 
     def "can mark as failed"() {
@@ -58,6 +61,7 @@ class DefaultBuildableModuleVersionMetaDataResolveResultTest extends Specificati
         then:
         descriptor.state == BuildableModuleVersionMetaDataResolveResult.State.Failed
         descriptor.failure == failure
+        descriptor.hasResult()
     }
 
     def "can mark as resolved using meta-data"() {
@@ -71,9 +75,10 @@ class DefaultBuildableModuleVersionMetaDataResolveResultTest extends Specificati
         descriptor.failure == null
         descriptor.metaData == metaData
         descriptor.moduleSource == moduleSource
+        descriptor.hasResult()
     }
 
-    def "cannot get failure when not resolved"() {
+    def "cannot get failure when has no result"() {
         when:
         descriptor.failure
 
@@ -81,7 +86,7 @@ class DefaultBuildableModuleVersionMetaDataResolveResultTest extends Specificati
         thrown(IllegalStateException)
     }
 
-    def "cannot get meta-data when not resolved"() {
+    def "cannot get meta-data when has no result"() {
         when:
         descriptor.metaData
 
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResultTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResultTest.groovy
new file mode 100644
index 000000000000..3205ab6b6650
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/DefaultBuildableModuleVersionSelectionResolveResultTest.groovy
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
+import org.gradle.api.internal.artifacts.ivyservice.ModuleVersionResolveException
+import spock.lang.Specification
+
+import static org.gradle.api.internal.artifacts.DefaultModuleVersionSelector.newSelector
+import static org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult.State.*
+
+class DefaultBuildableModuleVersionSelectionResolveResultTest extends Specification {
+    def descriptor = new DefaultBuildableModuleVersionSelectionResolveResult()
+    def moduleSource = Stub(ModuleSource)
+    def listing = Mock(ModuleVersionListing)
+
+    def "has unknown state by default"() {
+        expect:
+        descriptor.state == Unknown
+        !descriptor.hasResult()
+    }
+
+    def "can mark as listed"() {
+        when:
+        descriptor.listed(listing)
+
+        then:
+        descriptor.state == Listed
+        descriptor.failure == null
+        descriptor.hasResult()
+    }
+
+    def "can mark as probably listed"() {
+        when:
+        descriptor.probablyListed(listing)
+
+        then:
+        descriptor.state == ProbablyListed
+        descriptor.failure == null
+        descriptor.hasResult()
+    }
+
+    def "can mark as failed"() {
+        def failure = new ModuleVersionResolveException(newSelector("a", "b", "c"), "broken")
+
+        when:
+        descriptor.failed(failure)
+
+        then:
+        descriptor.state == Failed
+        descriptor.failure == failure
+        descriptor.hasResult()
+    }
+
+    def "cannot get failure when has no result"() {
+        when:
+        descriptor.failure
+
+        then:
+        thrown(IllegalStateException)
+    }
+
+    def "cannot get listing when has no result"() {
+        when:
+        descriptor.versions
+
+        then:
+        thrown(IllegalStateException)
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolverTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolverTest.groovy
index 3cc195baf6e2..8a0c2232db77 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolverTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/ErrorHandlingArtifactResolverTest.groovy
@@ -15,11 +15,9 @@
  */
 
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
+
 import org.gradle.api.artifacts.component.ComponentIdentifier
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolver
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.*
 import org.gradle.api.internal.artifacts.metadata.ComponentArtifactIdentifier
 import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData
 import org.gradle.api.internal.artifacts.metadata.ComponentMetaData
@@ -28,7 +26,6 @@ import spock.lang.Specification
 class ErrorHandlingArtifactResolverTest extends Specification {
     def delegate = Mock(ArtifactResolver)
     def artifactResolver = new ErrorHandlingArtifactResolver(delegate)
-    def artifactSetResolveResult = Mock(BuildableArtifactSetResolveResult)
 
     def "wraps resolveArtifact exception as failure"() {
         def componentArtifactId = Stub(ComponentArtifactIdentifier) {
@@ -61,22 +58,35 @@ class ErrorHandlingArtifactResolverTest extends Specification {
         def component = Stub(ComponentMetaData) {
             getComponentId() >> componentId
         }
-        def context = Stub(ArtifactResolveContext) {
-            getId() >> "artifact-context"
-        }
         def result = Mock(BuildableArtifactSetResolveResult)
         def failure = new RuntimeException("foo")
 
         when:
-        delegate.resolveModuleArtifacts(component, context, result) >> { throw failure }
+        def artifactType = Mock(ArtifactType)
+        delegate.resolveModuleArtifacts(component, artifactType, result) >> { throw failure }
+
+        and:
+        artifactResolver.resolveModuleArtifacts(component, artifactType, result)
+
+        then:
+        1 * result.failed(_ as ArtifactResolveException) >> { ArtifactResolveException e ->
+            assert e.message == "Could not determine artifacts for component 'component'"
+            assert e.cause == failure
+        }
+        0 * _._
+
+        when:
+        def componentUsage = Mock(ComponentUsage)
+        delegate.resolveModuleArtifacts(component, componentUsage, result) >> { throw failure }
 
         and:
-        artifactResolver.resolveModuleArtifacts(component, context, result)
+        artifactResolver.resolveModuleArtifacts(component, componentUsage, result)
 
         then:
         1 * result.failed(_ as ArtifactResolveException) >> { ArtifactResolveException e ->
             assert e.message == "Could not determine artifacts for component 'component'"
             assert e.cause == failure
         }
+        0 * _._
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleVersionRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleComponentRepositoryAccessTest.groovy
similarity index 74%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleVersionRepositoryTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleComponentRepositoryAccessTest.groovy
index 3433bd729e95..ed60da15963a 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleVersionRepositoryTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/IvyDynamicResolveModuleComponentRepositoryAccessTest.groovy
@@ -17,17 +17,19 @@
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
 
 import org.apache.ivy.core.module.descriptor.DependencyDescriptor
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.IvyUtil
 import org.gradle.api.internal.artifacts.metadata.DependencyMetaData
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData
 import spock.lang.Specification
 
-class IvyDynamicResolveModuleVersionRepositoryTest extends Specification {
-    final target = Mock(LocalAwareModuleVersionRepository)
+class IvyDynamicResolveModuleComponentRepositoryAccessTest extends Specification {
+    final target = Mock(ModuleComponentRepositoryAccess)
     final metaData = Mock(MutableModuleVersionMetaData)
     final requestedDependency = Mock(DependencyMetaData)
+    final moduleComponentId = Mock(ModuleComponentIdentifier)
     final result = Mock(BuildableModuleVersionMetaDataResolveResult)
-    final repository = new IvyDynamicResolveModuleVersionRepository(target)
+    final ModuleComponentRepositoryAccess access = new IvyDynamicResolveModuleComponentRepositoryAccess(target)
 
     def "replaces each dependency version with revConstraint"() {
         def original = dependency('1.2+')
@@ -38,10 +40,10 @@ class IvyDynamicResolveModuleVersionRepositoryTest extends Specification {
         result.metaData >> metaData
 
         when:
-        repository.getLocalDependency(requestedDependency, result)
+        access.resolveComponentMetaData(requestedDependency, moduleComponentId, result)
 
         then:
-        1 * target.getLocalDependency(requestedDependency, result)
+        1 * target.resolveComponentMetaData(requestedDependency, moduleComponentId, result)
 
         and:
         1 * metaData.dependencies >> [original]
@@ -51,10 +53,10 @@ class IvyDynamicResolveModuleVersionRepositoryTest extends Specification {
 
     def "does nothing when dependency has not been resolved"() {
         when:
-        repository.getLocalDependency(requestedDependency, result)
+        access.resolveComponentMetaData(requestedDependency, moduleComponentId, result)
 
         then:
-        1 * target.getLocalDependency(requestedDependency, result)
+        1 * target.resolveComponentMetaData(requestedDependency, moduleComponentId, result)
         _ * result.state >> BuildableModuleVersionMetaDataResolveResult.State.Missing
         0 * result._
     }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LazyDependencyToModuleResolverTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LazyDependencyToModuleResolverTest.groovy
index e768248ae794..7634a85f676b 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LazyDependencyToModuleResolverTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/LazyDependencyToModuleResolverTest.groovy
@@ -24,8 +24,8 @@ import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
 import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
 import org.gradle.api.internal.artifacts.ivyservice.*
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionMatcher
+import org.gradle.api.internal.artifacts.metadata.DefaultIvyModuleVersionMetaData
 import org.gradle.api.internal.artifacts.metadata.DependencyMetaData
-import org.gradle.api.internal.artifacts.metadata.ModuleDescriptorAdapter
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
 import spock.lang.Specification
@@ -215,7 +215,7 @@ class LazyDependencyToModuleResolverTest extends Specification {
 
     def module() {
         ModuleRevisionId id = IvyUtil.createModuleRevisionId("group", "module", "1.0")
-        return new ModuleDescriptorAdapter(new DefaultModuleDescriptor(id, "release", new Date()))
+        return new DefaultIvyModuleVersionMetaData(new DefaultModuleDescriptor(id, "release", new Date()))
     }
 
     def dependency() {
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NewestVersionComponentChooserTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NewestVersionComponentChooserTest.groovy
new file mode 100644
index 000000000000..13c76601154b
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/NewestVersionComponentChooserTest.groovy
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor
+import org.gradle.api.artifacts.ModuleVersionSelector
+import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
+import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionMatcher
+import org.gradle.api.internal.artifacts.metadata.ComponentMetaData
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData
+import spock.lang.Specification
+
+class NewestVersionComponentChooserTest extends Specification {
+    def versionMatcher = Mock(VersionMatcher)
+    def latestStrategy = Mock(LatestStrategy)
+
+    def chooser = new NewestVersionComponentChooser(latestStrategy, versionMatcher)
+
+    def "uses version matcher to determine if selector can select multiple components"() {
+        def selector = Mock(ModuleVersionSelector)
+        when:
+        1 * selector.version >> "foo"
+        versionMatcher.isDynamic("foo") >> false
+
+        then:
+        !chooser.canSelectMultipleComponents(selector)
+
+        when:
+        1 * selector.version >> "bar"
+        versionMatcher.isDynamic("bar") >> true
+
+        then:
+        chooser.canSelectMultipleComponents(selector)
+    }
+
+    def "chooses latest version for component meta data"() {
+        def one = Stub(ComponentMetaData) {
+            getId() >> DefaultModuleVersionIdentifier.newId("group", "name", "1.0")
+        }
+        def two = Stub(ComponentMetaData) {
+            getId() >> DefaultModuleVersionIdentifier.newId("group", "name", "1.1")
+        }
+
+        when:
+        1 * latestStrategy.compare({it.version == "1.0"} as Versioned, {it.version == "1.1"} as Versioned) >> -1
+
+        then:
+        chooser.choose(one, two) == two
+
+        when:
+        1 * latestStrategy.compare({it.version == "1.0"} as Versioned, {it.version == "1.1"} as Versioned) >> 1
+
+        then:
+        chooser.choose(one, two) == one
+    }
+
+    def "chooses non-generated descriptor over generated"() {
+        def descriptorOne = Mock(ModuleDescriptor)
+        def one = Stub(ComponentMetaData) {
+            getId() >> DefaultModuleVersionIdentifier.newId("group", "name", "1.0")
+            getDescriptor() >> descriptorOne
+        }
+        def descriptorTwo = Mock(ModuleDescriptor)
+        def two = Stub(ComponentMetaData) {
+            getId() >> DefaultModuleVersionIdentifier.newId("group", "name", "1.1")
+            getDescriptor() >> descriptorTwo
+        }
+
+        when:
+        1 * latestStrategy.compare({it.version == "1.0"} as Versioned, {it.version == "1.1"} as Versioned) >> 0
+        1 * descriptorOne.default >> true
+        1 * descriptorTwo.default >> false
+
+        then:
+        chooser.choose(one, two) == two
+
+        when:
+        1 * latestStrategy.compare({it.version == "1.0"} as Versioned, {it.version == "1.1"} as Versioned) >> 0
+        1 * descriptorOne.default >> false
+
+        then:
+        chooser.choose(one, two) == one
+    }
+
+    def "chooses newest matching version without requiring metadata"() {
+        given:
+        def selector = new DefaultModuleVersionSelector("group", "name", "1.+")
+        def listing = Mock(ModuleVersionListing)
+        def dependency = Mock(DependencyMetaData)
+        def repo = Mock(ModuleComponentRepositoryAccess)
+        def versions = [new VersionInfo("1.2"), new VersionInfo("1.3"), new VersionInfo("2.0")]
+
+        when:
+        _ * dependency.getRequested() >> selector
+        1 * versionMatcher.needModuleMetadata("1.+") >> false
+        1 * listing.versions >> (versions as Set)
+        1 * latestStrategy.sort(_) >> versions
+        1 * versionMatcher.accept("1.+", "2.0") >> false
+        1 * versionMatcher.accept("1.+", "1.3") >> true
+        0 * _
+
+        then:
+        chooser.choose(listing, dependency, repo) == DefaultModuleComponentIdentifier.newId("group", "name", "1.3")
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolverTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolverTest.groovy
new file mode 100644
index 000000000000..4ff4ec281351
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainArtifactResolverTest.groovy
@@ -0,0 +1,127 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
+
+import org.gradle.api.internal.artifacts.ivyservice.ComponentUsage
+import org.gradle.api.internal.artifacts.ivyservice.DefaultBuildableArtifactResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.DefaultBuildableArtifactSetResolveResult
+import org.gradle.api.internal.artifacts.metadata.ComponentArtifactMetaData
+import org.gradle.api.internal.artifacts.metadata.ComponentMetaData
+import spock.lang.Specification
+
+class RepositoryChainArtifactResolverTest extends Specification {
+    final artifact = Mock(ComponentArtifactMetaData)
+    final component = Mock(ComponentMetaData)
+    final originalSource = Mock(ModuleSource)
+    final result = new DefaultBuildableArtifactResolveResult()
+    final artifactSetResult = new DefaultBuildableArtifactSetResolveResult()
+
+    def repo1 = Stub(ModuleComponentRepository) {
+        getId() >> "repo1"
+    }
+    def localAccess2 = Mock(ModuleComponentRepositoryAccess)
+    def remoteAccess2 = Mock(ModuleComponentRepositoryAccess)
+    def repo2 = Mock(ModuleComponentRepository) {
+        getLocalAccess() >> localAccess2
+        getRemoteAccess() >> remoteAccess2
+        getId() >> "repo2"
+    }
+    def repo2Source = new RepositoryChainModuleSource("repo2", originalSource)
+
+    final RepositoryChainArtifactResolver resolver = new RepositoryChainArtifactResolver()
+
+    def setup() {
+        resolver.add(repo1)
+        resolver.add(repo2)
+    }
+
+    def "uses module artifacts from local access to repository defined by module source"() {
+        def usage = Mock(ComponentUsage)
+        def artifact = Mock(ComponentArtifactMetaData)
+        when:
+        resolver.resolveModuleArtifacts(component, usage, artifactSetResult)
+
+        then:
+        _ * component.getSource() >> repo2Source
+        1 * component.withSource(originalSource) >> component
+        1 * repo2.getLocalAccess() >> localAccess2
+        1 * localAccess2.resolveModuleArtifacts(component, usage, artifactSetResult) >> {
+            it[2].resolved([artifact])
+        }
+        0 * _._
+
+        and:
+        artifactSetResult.artifacts == [artifact] as Set
+    }
+
+    def "uses module artifacts from remote access to repository defined by module source"() {
+        def usage = Mock(ComponentUsage)
+        def artifact = Mock(ComponentArtifactMetaData)
+        when:
+        resolver.resolveModuleArtifacts(component, usage, artifactSetResult)
+
+        then:
+        _ * component.getSource() >> repo2Source
+        1 * component.withSource(originalSource) >> component
+        1 * repo2.getLocalAccess() >> localAccess2
+        1 * localAccess2.resolveModuleArtifacts(component, usage, artifactSetResult)
+        1 * repo2.getRemoteAccess() >> remoteAccess2
+        1 * remoteAccess2.resolveModuleArtifacts(component, usage, artifactSetResult) >> {
+            it[2].resolved([artifact])
+        }
+        0 * _._
+
+        and:
+        artifactSetResult.artifacts == [artifact] as Set
+    }
+
+    def "locates artifact with local access in repository defined by module source"() {
+        def artifactFile = Mock(File)
+        def artifact = Mock(ComponentArtifactMetaData)
+        when:
+        resolver.resolveArtifact(artifact, repo2Source, result)
+
+        then:
+        1 * repo2.getLocalAccess() >> localAccess2
+        1 * localAccess2.resolveArtifact(artifact, originalSource, result) >> {
+            it[2].resolved(artifactFile)
+        }
+        0 * _._
+
+        and:
+        result.file == artifactFile
+    }
+
+    def "locates artifact with remote access in repository defined by module source"() {
+        def artifactFile = Mock(File)
+        def artifact = Mock(ComponentArtifactMetaData)
+        when:
+        resolver.resolveArtifact(artifact, repo2Source, result)
+
+        then:
+        1 * repo2.getLocalAccess() >> localAccess2
+        1 * localAccess2.resolveArtifact(artifact, originalSource, result)
+        1 * repo2.getRemoteAccess() >> remoteAccess2
+        1 * remoteAccess2.resolveArtifact(artifact, originalSource, result) >> {
+            it[2].resolved(artifactFile)
+        }
+        0 * _._
+
+        and:
+        result.file == artifactFile
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolverTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolverTest.groovy
index b4aa7d3bce7d..49c6ab58bd16 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolverTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/RepositoryChainDependencyResolverTest.groovy
@@ -15,39 +15,37 @@
  */
 
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve
-
 import org.apache.ivy.core.module.descriptor.DependencyDescriptor
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor
 import org.gradle.api.Transformer
 import org.gradle.api.artifacts.ModuleVersionIdentifier
 import org.gradle.api.artifacts.ModuleVersionSelector
 import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.BuildableComponentResolveResult
 import org.gradle.api.internal.artifacts.ivyservice.IvyUtil
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestStrategy
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionMatcher
 import org.gradle.api.internal.artifacts.metadata.DependencyMetaData
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData
 import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData
-import spock.lang.Ignore
 import spock.lang.Specification
 
 class RepositoryChainDependencyResolverTest extends Specification {
     final metaData = metaData("1.2")
-    final dependencyId = Stub(ModuleVersionSelector)
+    final moduleComponentId = DefaultModuleComponentIdentifier.newId("group", "project", "1.0")
     final dependency = Stub(DependencyMetaData)
+    final selector = Stub(ModuleVersionSelector)
     final dependencyDescriptor = Stub(DependencyDescriptor)
-    final matcher = Stub(VersionMatcher)
-    final latestStrategy = Stub(LatestStrategy) {
-        compare(_, _) >> { a, b ->
-            a.version.compareTo(b.version)
-        }
-    }
+
     final Transformer<ModuleVersionMetaData, RepositoryChainModuleResolution> transformer = Mock(Transformer)
     final result = Mock(BuildableComponentResolveResult)
     final moduleSource = Mock(ModuleSource)
+    def localAccess = Mock(ModuleComponentRepositoryAccess)
+    def remoteAccess = Mock(ModuleComponentRepositoryAccess)
+    def localAccess2 = Mock(ModuleComponentRepositoryAccess)
+    def remoteAccess2 = Mock(ModuleComponentRepositoryAccess)
 
-    final RepositoryChainDependencyResolver resolver = new RepositoryChainDependencyResolver(matcher, latestStrategy, transformer)
+    final ComponentChooser componentSelectionStrategy = Mock(ComponentChooser)
+    final RepositoryChainDependencyResolver resolver = new RepositoryChainDependencyResolver(componentSelectionStrategy, transformer)
 
     ModuleVersionIdentifier moduleVersionIdentifier(ModuleDescriptor moduleDescriptor) {
         def moduleRevId = moduleDescriptor.moduleRevisionId
@@ -55,23 +53,40 @@ class RepositoryChainDependencyResolverTest extends Specification {
     }
 
     def setup() {
-        _ * dependencyId.group >> "group"
-        _ * dependencyId.name >> "project"
-        _ * dependencyId.version >> "1.0"
-        _ * dependency.requested >> dependencyId
+        _ * selector.group >> moduleComponentId.group
+        _ * selector.name >> moduleComponentId.module
+        _ * selector.version >> moduleComponentId.version
+        _ * dependency.requested >> selector
         _ * dependency.descriptor >> dependencyDescriptor
     }
 
+    def addRepo1() {
+        addModuleComponentRepository("repo1", localAccess, remoteAccess)
+    }
+
+    def addRepo2() {
+        addModuleComponentRepository("repo2", localAccess2, remoteAccess2)
+    }
+
+    def addModuleComponentRepository(def name, def repoLocalAccess, def repoRemoteAccess) {
+        def repo = Stub(ModuleComponentRepository) {
+            getLocalAccess() >> repoLocalAccess
+            getRemoteAccess() >> repoRemoteAccess
+            getName() >> name
+        }
+        resolver.add(repo)
+        repo
+    }
+
     def "uses local dependency when available"() {
         given:
-        def repo = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo)
+        def repo = addRepo1()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -85,22 +100,33 @@ class RepositoryChainDependencyResolverTest extends Specification {
         }
 
         and:
-        _ * repo.name >> "repo"
-        0 * repo._
+        0 * localAccess._
+        0 * remoteAccess._
         0 * result._
     }
 
-    def "attempts to find remote dependency when local dependency is unknown"() {
+    def "chooses best component from single repository for dynamic dependency"() {
         given:
-        def repo = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo)
+        def repo = addRepo1()
+
+        and:
+        def dynamicDependency = Mock(DependencyMetaData)
+        def dynamicSelector = Mock(ModuleVersionSelector)
+        final versionListing = new DefaultModuleVersionListing("1.1")
+        final selectedId = DefaultModuleComponentIdentifier.newId("group", "name", "1.1")
 
         when:
-        resolver.resolve(dependency, result)
+        resolver.resolve(dynamicDependency, result)
 
         then:
-        1 * repo.getLocalDependency(dependency, _)
-        1 * repo.getDependency(dependency, _) >> { dep, result ->
+        _ * dynamicDependency.getRequested() >> dynamicSelector
+        1 * componentSelectionStrategy.canSelectMultipleComponents(dynamicSelector) >> true
+        1 * localAccess.listModuleVersions(dynamicDependency, _) >> { dep, result ->
+            result.listed(versionListing)
+        }
+        _ * componentSelectionStrategy.choose(versionListing, dynamicDependency, localAccess) >> selectedId
+        1 * dynamicDependency.withRequestedVersion("1.1") >> dependency
+        1 * localAccess.resolveComponentMetaData(dependency, selectedId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -112,31 +138,48 @@ class RepositoryChainDependencyResolverTest extends Specification {
         1 * result.resolved(_) >> { ModuleVersionMetaData metaData ->
             assert metaData == this.metaData
         }
+
         and:
-        _ * repo.name >> "repo"
-        0 * repo._
+        0 * localAccess._
+        0 * remoteAccess._
         0 * result._
     }
 
-    def "attempts to find remote dependency when local dependency is probably missing"() {
+    def "chooses best component from multiple repositories for dynamic dependency"() {
         given:
-        def repo = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
+
+        and:
+        def dynamicDependency = Mock(DependencyMetaData)
+        def dynamicSelector = Mock(ModuleVersionSelector)
+        final versionListing1 = Mock(ModuleVersionListing)
+        final versionListing2 = new DefaultModuleVersionListing("1.1")
+        final selectedId = DefaultModuleComponentIdentifier.newId("group", "name", "1.1")
 
         when:
-        resolver.resolve(dependency, result)
+        resolver.resolve(dynamicDependency, result)
 
         then:
-        1 * repo.getLocalDependency(dependency, _) >> { dep, result ->
-            result.probablyMissing()
+        _ * dynamicDependency.getRequested() >> dynamicSelector
+        1 * componentSelectionStrategy.canSelectMultipleComponents(dynamicSelector) >> true
+        1 * localAccess.listModuleVersions(dynamicDependency, _) >> { dep, result ->
+            result.listed(versionListing1)
         }
-        1 * repo.getDependency(dependency, _) >> { dep, result ->
+        1 * componentSelectionStrategy.choose(versionListing1, dynamicDependency, localAccess) >> null
+
+        1 * localAccess2.listModuleVersions(dynamicDependency, _) >> { dep, result ->
+            result.listed(versionListing2)
+        }
+        1 * componentSelectionStrategy.choose(versionListing2, dynamicDependency, localAccess2) >> selectedId
+        1 * dynamicDependency.withRequestedVersion("1.1") >> dependency
+        1 * localAccess2.resolveComponentMetaData(dependency, selectedId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
             assert it.module == metaData
             assert it.moduleSource == moduleSource
-            assert it.repository == repo
+            assert it.repository == repo2
             metaData
         }
         1 * result.resolved(_) >> { ModuleVersionMetaData metaData ->
@@ -144,111 +187,122 @@ class RepositoryChainDependencyResolverTest extends Specification {
         }
 
         and:
-        _ * repo.name >> "repo"
-        0 * repo._
+        0 * localAccess._
+        0 * remoteAccess._
         0 * result._
     }
 
-    def "fails with not found when local dependency is marked as missing"() {
+    def "attempts to find remote dependency when local dependency is unknown"() {
         given:
-        def repo = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo)
+        def repo = addRepo1()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo.getLocalDependency(dependency, _) >> { dep, result ->
-            result.missing()
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _)
+        1 * remoteAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
+            result.resolved(metaData, moduleSource)
+        }
+        1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
+            assert it.module == metaData
+            assert it.moduleSource == moduleSource
+            assert it.repository == repo
+            metaData
+        }
+        1 * result.resolved(_) >> { ModuleVersionMetaData metaData ->
+            assert metaData == this.metaData
         }
-        1 * result.notFound(dependencyId)
-
         and:
-        _ * repo.name >> "repo"
-        0 * repo._
+        0 * localAccess._
+        0 * remoteAccess._
         0 * result._
     }
 
-    def "fails with not found when local and remote dependency marked as missing"() {
+    def "attempts to find remote dependency when local dependency is probably missing"() {
         given:
-        def repo = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo)
+        def repo = addRepo1()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.probablyMissing()
         }
-        1 * repo.getDependency(dependency, _) >> { dep, result ->
-            result.missing()
+        1 * remoteAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
+            result.resolved(metaData, moduleSource)
+        }
+        1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
+            assert it.module == metaData
+            assert it.moduleSource == moduleSource
+            assert it.repository == repo
+            metaData
+        }
+        1 * result.resolved(_) >> { ModuleVersionMetaData metaData ->
+            assert metaData == this.metaData
         }
-        1 * result.notFound(dependencyId)
 
         and:
-        _ * repo.name >> "repo"
-        0 * repo._
+        0 * localAccess._
+        0 * remoteAccess._
         0 * result._
     }
 
-    // TODO:DAZ Add more tests for dynamic versions and fix this
-    @Ignore
-    def "searches all repositories for a dynamic version"() {
+    def "fails with not found when local dependency is marked as missing"() {
         given:
-        _ * matcher.isDynamic(_) >> true
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        def repo3 = Mock(LocalAwareModuleVersionRepository)
-        def version2 = metaData("1.2")
-        resolver.add(repo1)
-        resolver.add(repo2)
-        resolver.add(repo3)
+        def repo = addRepo1()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
-            result.resolved(metaData("1.1"), null)
-        }
-        1 * repo2.getLocalDependency(dependency, _) >> { dep, result ->
-            result.resolved(version2, moduleSource)
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
+            result.missing()
         }
-        1 * repo3.getLocalDependency(dependency, _) >> { dep, result ->
-            result.resolved(metaData("1.0"), null)
+        1 * result.notFound(selector)
+
+        and:
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * result._
+    }
+
+    def "fails with not found when local and remote dependency marked as missing"() {
+        given:
+        addRepo1()
+
+        when:
+        resolver.resolve(dependency, result)
+
+        then:
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
+            result.probablyMissing()
         }
-        1 * result.resolved(_, _) >> { metaData, source ->
-            assert metaData == version2
-            assert source.delegate == repo2
-            assert source.moduleSource == moduleSource
+        1 * remoteAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
+            result.missing()
         }
+        1 * result.notFound(selector)
 
         and:
-        _ * repo1.name >> "repo1"
-        _ * repo2.name >> "repo2"
-        _ * repo3.name >> "repo3"
-        0 * repo1._
-        0 * repo2._
-        0 * repo3._
+        0 * localAccess._
+        0 * remoteAccess._
         0 * result._
     }
 
     def "stops on first available local dependency for static version"() {
         given:
-        _ * matcher.isDynamic(_) >> false
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        def repo3 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
+        def repo1 = addRepo1()
+        def repo2 = Mock(ModuleComponentRepository)
         resolver.add(repo2)
+        def repo3 = Mock(ModuleComponentRepository)
         resolver.add(repo3)
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -262,30 +316,26 @@ class RepositoryChainDependencyResolverTest extends Specification {
         }
 
         and:
-        _ * repo1.name >> "repo1"
-        _ * repo2.name >> "repo2"
-        _ * repo3.name >> "repo3"
-        0 * repo1._
         0 * repo2._
         0 * repo3._
+        0 * localAccess._
+        0 * remoteAccess._
         0 * result._
     }
 
     def "uses local dependency when available in one repository and missing from all other repositories"() {
         given:
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.missing()
         }
-        1 * repo2.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -299,28 +349,26 @@ class RepositoryChainDependencyResolverTest extends Specification {
         }
 
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "uses local dependency when available in one repository and probably missing in all other repositories"() {
         given:
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.probablyMissing()
         }
-        1 * repo2.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -333,29 +381,27 @@ class RepositoryChainDependencyResolverTest extends Specification {
             assert metaData == this.metaData
         }
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "uses remote dependency when local dependency is unknown for a given repository and probably missing in other repositories"() {
         given:
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.probablyMissing()
         }
-        1 * repo2.getLocalDependency(dependency, _)
-        1 * repo2.getDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _)
+        1 * remoteAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -369,34 +415,32 @@ class RepositoryChainDependencyResolverTest extends Specification {
         }
 
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "attempts to find remote dependency when local dependency is probably missing in all repositories"() {
         given:
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.probablyMissing()
         }
-        1 * repo2.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.probablyMissing()
         }
-        1 * repo1.getDependency(dependency, _) >> { dep, result ->
+        1 * remoteAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.missing()
         }
-        1 * repo2.getDependency(dependency, _) >> { dep, result ->
+        1 * remoteAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -409,31 +453,29 @@ class RepositoryChainDependencyResolverTest extends Specification {
             assert metaData == this.metaData
         }
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "does not attempt to resolve remote dependency when local dependency is missing"() {
         given:
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.missing()
         }
-        1 * repo2.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.probablyMissing()
         }
-        1 * repo2.getDependency(dependency, _) >> { dep, result ->
+        1 * remoteAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -447,32 +489,30 @@ class RepositoryChainDependencyResolverTest extends Specification {
         }
 
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "attempts to find remote dependency when local dependency is missing or unknown in all repositories"() {
         given:
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.probablyMissing()
         }
-        1 * repo2.getLocalDependency(dependency, _)
-        1 * repo2.getDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _)
+        1 * remoteAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.missing()
         }
-        1 * repo1.getDependency(dependency, _) >> { dep, result ->
+        1 * remoteAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -485,28 +525,26 @@ class RepositoryChainDependencyResolverTest extends Specification {
             assert metaData == this.metaData
         }
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "ignores failure to resolve local dependency when available in another repository"() {
         given:
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             throw new RuntimeException("broken")
         }
-        1 * repo2.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -520,30 +558,28 @@ class RepositoryChainDependencyResolverTest extends Specification {
         }
 
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "ignores failure to resolve remote dependency when available in another repository"() {
         given:
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _)
-        1 * repo1.getDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _)
+        1 * remoteAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             throw new RuntimeException("broken")
         }
-        1 * repo2.getLocalDependency(dependency, _)
-        1 * repo2.getDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _)
+        1 * remoteAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.resolved(metaData, moduleSource)
         }
         1 * transformer.transform(_) >> { RepositoryChainModuleResolution it ->
@@ -557,69 +593,65 @@ class RepositoryChainDependencyResolverTest extends Specification {
         }
 
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "rethrows failure to resolve local dependency when not available in any repository"() {
         given:
         def failure = new RuntimeException("broken")
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             throw failure
         }
-        1 * repo2.getLocalDependency(dependency, _)
-        1 * repo2.getDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _)
+        1 * remoteAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.missing()
         }
         1 * result.failed({ it.cause == failure })
 
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
     def "rethrows failure to resolve remote dependency when not available in any repository"() {
         given:
         def failure = new RuntimeException("broken")
-        def repo1 = Mock(LocalAwareModuleVersionRepository)
-        def repo2 = Mock(LocalAwareModuleVersionRepository)
-        resolver.add(repo1)
-        resolver.add(repo2)
+        def repo1 = addRepo1()
+        def repo2 = addRepo2()
 
         when:
         resolver.resolve(dependency, result)
 
         then:
-        1 * repo1.getLocalDependency(dependency, _)
-        1 * repo1.getDependency(dependency, _) >> { dep, result ->
+        1 * localAccess.resolveComponentMetaData(dependency, moduleComponentId, _)
+        1 * remoteAccess.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             throw failure
         }
-        1 * repo2.getLocalDependency(dependency, _)
-        1 * repo2.getDependency(dependency, _) >> { dep, result ->
+        1 * localAccess2.resolveComponentMetaData(dependency, moduleComponentId, _)
+        1 * remoteAccess2.resolveComponentMetaData(dependency, moduleComponentId, _) >> { dep, id, result ->
             result.missing()
         }
         1 * result.failed({ it.cause == failure })
 
         and:
-        _ * repo1.name >> "repo"
-        _ * repo2.name >> "repo"
-        0 * repo1._
-        0 * repo2._
+        0 * localAccess._
+        0 * remoteAccess._
+        0 * localAccess2._
+        0 * remoteAccess2._
         0 * result._
     }
 
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepositoryTest.groovy
deleted file mode 100644
index 5e9b8984dd7a..000000000000
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/CachedRepositoryTest.groovy
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache
-import org.gradle.api.internal.artifacts.ivyservice.ArtifactResolveContext
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionMetaDataResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.LocalAwareModuleVersionRepository
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource
-import org.gradle.api.internal.artifacts.metadata.DependencyMetaData
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData
-import spock.lang.Specification
-
-import static org.gradle.api.internal.artifacts.DefaultModuleVersionSelector.newSelector
-
-class CachedRepositoryTest extends Specification {
-
-    def stats = new DependencyMetadataCacheStats()
-    def cache = Mock(DependencyMetadataCache)
-    def delegate = Mock(LocalAwareModuleVersionRepository)
-    def repo = new CachedRepository(cache, delegate, stats)
-
-    def lib = newSelector("org", "lib", "1.0")
-    def dep = Stub(DependencyMetaData) { getRequested() >> lib }
-    def listingResult = Mock(BuildableModuleVersionSelectionResolveResult)
-    def metaDataResult = Mock(BuildableModuleVersionMetaDataResolveResult)
-
-    def "delegates"() {
-        when:
-        def id = repo.getId()
-        def name = repo.getName()
-
-        then:
-        id == "x"
-        name == "localRepo"
-        1 * delegate.getId() >> "x"
-        1 * delegate.getName() >> "localRepo"
-    }
-
-    def "retrieves and caches module version listings"() {
-        when:
-        repo.localListModuleVersions(dep, listingResult)
-
-        then:
-        1 * cache.supplyLocalModuleVersions(lib, listingResult) >> false
-        1 * delegate.localListModuleVersions(dep, listingResult)
-        1 * cache.newLocalModuleVersions(lib, listingResult)
-        0 * _
-
-        when:
-        repo.listModuleVersions(dep, listingResult)
-
-        then:
-        1 * cache.supplyModuleVersions(lib, listingResult) >> false
-        1 * delegate.listModuleVersions(dep, listingResult)
-        1 * cache.newModuleVersions(lib, listingResult)
-        0 * _
-    }
-
-    def "uses module version listings from cache"() {
-        when:
-        repo.localListModuleVersions(dep, listingResult)
-
-        then:
-        1 * cache.supplyLocalModuleVersions(lib, listingResult) >> true
-        0 * _
-
-        when:
-        repo.listModuleVersions(dep, listingResult)
-
-        then:
-        1 * cache.supplyModuleVersions(lib, listingResult) >> true
-        0 * _
-    }
-
-    def "retrieves and caches local dependencies"() {
-        when:
-        repo.getLocalDependency(dep, metaDataResult)
-
-        then:
-        1 * cache.supplyLocalMetaData(lib, metaDataResult) >> false
-        1 * delegate.getLocalDependency(dep, metaDataResult)
-        1 * cache.newLocalDependencyResult(lib, metaDataResult)
-        0 * _
-    }
-
-    def "uses local dependencies from cache"() {
-        when:
-        repo.getLocalDependency(dep, metaDataResult)
-
-        then:
-        1 * cache.supplyLocalMetaData(lib, metaDataResult) >> true
-        0 * _
-    }
-
-    def "retrieves and caches dependencies"() {
-        when:
-        repo.getDependency(dep, metaDataResult)
-
-        then:
-        1 * cache.supplyMetaData(lib, metaDataResult) >> false
-        1 * delegate.getDependency(dep, metaDataResult)
-        1 * cache.newDependencyResult(lib, metaDataResult)
-        0 * _
-    }
-
-    def "uses dependencies from cache"() {
-        when:
-        repo.getDependency(dep, metaDataResult)
-
-        then:
-        1 * cache.supplyMetaData(lib, metaDataResult) >> true
-        0 * _
-    }
-
-    def "delegates request for module artifacts"() {
-        def moduleMetaData = Stub(ModuleVersionMetaData)
-        def context = Stub(ArtifactResolveContext)
-        def result = Mock(BuildableArtifactSetResolveResult)
-
-        when:
-        repo.resolveModuleArtifacts(moduleMetaData, context, result)
-
-        then:
-        1 * delegate.resolveModuleArtifacts(moduleMetaData, context, result)
-        0 * _
-    }
-
-    def "retrieves and caches artifacts"() {
-        def result = Mock(BuildableArtifactResolveResult)
-        def artifactId = Stub(ModuleVersionArtifactIdentifier)
-        def artifact = Stub(ModuleVersionArtifactMetaData) {
-            getId() >> artifactId
-        }
-        def moduleSource = Mock(ModuleSource)
-
-        when:
-        repo.resolveArtifact(artifact, moduleSource, result)
-
-        then:
-        1 * cache.supplyArtifact(artifactId, result) >> false
-        1 * delegate.resolveArtifact(artifact, moduleSource, result)
-        1 * cache.newArtifact(artifactId, result)
-        0 * _
-    }
-
-    def "uses artifacts from cache"() {
-        def result = Mock(BuildableArtifactResolveResult)
-        def artifactId = Stub(ModuleVersionArtifactIdentifier)
-        def artifact = Stub(ModuleVersionArtifactMetaData) {
-            getId() >> artifactId
-        }
-        def moduleSource = Mock(ModuleSource)
-
-        when:
-        repo.resolveArtifact(artifact, moduleSource, result)
-
-        then:
-        1 * cache.supplyArtifact(artifactId, result) >> true
-        0 * _
-    }
-}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheTest.groovy
deleted file mode 100644
index e04bf6268c9e..000000000000
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/DependencyMetadataCacheTest.groovy
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache
-import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ArtifactResolveException
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionMetaDataResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionListing
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
-import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData
-import spock.lang.Specification
-
-import static org.gradle.api.internal.artifacts.DefaultModuleVersionSelector.newSelector
-
-class DependencyMetadataCacheTest extends Specification {
-
-    def stats = new DependencyMetadataCacheStats()
-    def cache = new DependencyMetadataCache(stats)
-
-    def "caches and supplies local and remote module versions"() {
-        def remoteListing = Mock(ModuleVersionListing)
-        def localListing = Mock(ModuleVersionListing)
-        def result = Mock(BuildableModuleVersionSelectionResolveResult)
-        def missingResult = Mock(BuildableModuleVersionSelectionResolveResult)
-
-        given:
-        cache.newModuleVersions(newSelector("org", "foo-remote", "1.0"), Stub(BuildableModuleVersionSelectionResolveResult) {
-            getState() >> BuildableModuleVersionSelectionResolveResult.State.Listed
-            getVersions() >> remoteListing
-        })
-        cache.newLocalModuleVersions(newSelector("org", "foo-local", "1.0"), Stub(BuildableModuleVersionSelectionResolveResult) {
-            getState() >> BuildableModuleVersionSelectionResolveResult.State.Listed
-            getVersions() >> localListing
-        })
-
-        when:
-        def local = cache.supplyLocalModuleVersions(newSelector("org", "foo-local", "1.0"), result)
-        def missingLocal = cache.supplyLocalModuleVersions(newSelector("org", "foo-remote", "1.0"), missingResult)
-
-        then:
-        local
-        1 * result.listed(localListing)
-
-        and:
-        !missingLocal
-        0 * missingResult._
-
-        when:
-        def remote = cache.supplyModuleVersions(newSelector("org", "foo-remote", "1.0"), result)
-        def missingRemote = cache.supplyModuleVersions(newSelector("org", "foo-local", "1.0"), missingResult)
-
-        then:
-        remote
-        1 * result.listed(remoteListing)
-
-        and:
-        !missingRemote
-        0 * missingResult._
-    }
-
-    def "does not cache failed module version listing"() {
-        def failedResult = Stub(BuildableModuleVersionSelectionResolveResult) {
-            getState() >> BuildableModuleVersionSelectionResolveResult.State.Failed
-        }
-        cache.newModuleVersions(newSelector("org", "lib", "1.0"), failedResult)
-        cache.newLocalModuleVersions(newSelector("org", "lib", "1.0"), failedResult)
-
-        def result = Mock(BuildableModuleVersionSelectionResolveResult)
-
-        when:
-        def remoteFromCache = cache.supplyModuleVersions(newSelector("org", "lib", "1.0"), result)
-        def localFromCache = cache.supplyLocalModuleVersions(newSelector("org", "lib", "1.0"), result)
-
-        then:
-        !remoteFromCache
-        !localFromCache
-        0 * result._
-    }
-
-    def "caches and supplies remote metadata"() {
-        def suppliedMetaData = Stub(MutableModuleVersionMetaData)
-        def cachedCopy = Stub(MutableModuleVersionMetaData)
-        def originalMetaData = Stub(MutableModuleVersionMetaData)
-        def source = Stub(ModuleSource)
-        def resolvedResult = Mock(BuildableModuleVersionMetaDataResolveResult.class) {
-            getState() >> BuildableModuleVersionMetaDataResolveResult.State.Resolved
-            getMetaData() >> originalMetaData
-            getModuleSource() >> source
-        }
-        def result = Mock(BuildableModuleVersionMetaDataResolveResult.class)
-
-        given:
-        _ * originalMetaData.copy() >> cachedCopy
-        cache.newDependencyResult(newSelector("org", "foo", "1.0"), resolvedResult)
-
-        when:
-        def local = cache.supplyLocalMetaData(newSelector("org", "foo", "1.0"), result)
-        def differentSelector = cache.supplyMetaData(newSelector("org", "XXX", "1.0"), result)
-
-        then:
-        !local
-        !differentSelector
-        stats.metadataServed == 0
-        0 * result._
-
-        when:
-        def match = cache.supplyMetaData(newSelector("org", "foo", "1.0"), result)
-
-        then:
-        match
-        stats.metadataServed == 1
-        _ * cachedCopy.copy() >> suppliedMetaData
-        1 * result.resolved(suppliedMetaData, source)
-    }
-
-    def "caches and supplies remote and local metadata"() {
-        def localSource = Stub(ModuleSource)
-        def localMetaData = Stub(MutableModuleVersionMetaData)
-        _ * localMetaData.copy() >> localMetaData
-        def remoteSource = Stub(ModuleSource)
-        def remoteMetaData = Stub(MutableModuleVersionMetaData)
-        _ * remoteMetaData.copy() >> remoteMetaData
-        def resolvedLocal = Mock(BuildableModuleVersionMetaDataResolveResult.class) {
-            getMetaData() >> localMetaData
-            getModuleSource() >> localSource
-            getState() >> BuildableModuleVersionMetaDataResolveResult.State.Resolved
-        }
-        def resolvedRemote = Mock(BuildableModuleVersionMetaDataResolveResult.class) {
-            getMetaData() >> remoteMetaData
-            getModuleSource() >> remoteSource
-            getState() >> BuildableModuleVersionMetaDataResolveResult.State.Resolved
-        }
-
-        cache.newDependencyResult(newSelector("org", "remote", "1.0"), resolvedRemote)
-        cache.newLocalDependencyResult(newSelector("org", "local", "1.0"), resolvedLocal)
-
-        def result = Mock(BuildableModuleVersionMetaDataResolveResult.class)
-
-        when:
-        def local = cache.supplyLocalMetaData(newSelector("org", "local", "1.0"), result)
-
-        then:
-        local
-        stats.metadataServed == 1
-        1 * result.resolved(localMetaData, localSource)
-
-        when:
-        def remote = cache.supplyMetaData(newSelector("org", "remote", "1.0"), result)
-
-        then:
-        remote
-        stats.metadataServed == 2
-        1 * result.resolved(remoteMetaData, remoteSource)
-    }
-
-    def "does not cache failed resolves"() {
-        def failedResult = Mock(BuildableModuleVersionMetaDataResolveResult.class) { getState() >> BuildableModuleVersionMetaDataResolveResult.State.Failed }
-        cache.newDependencyResult(newSelector("org", "lib", "1.0"), failedResult)
-
-        def result = Mock(BuildableModuleVersionMetaDataResolveResult.class)
-
-        when:
-        def fromCache = cache.supplyMetaData(newSelector("org", "lib", "1.0"), result)
-
-        then:
-        !fromCache
-        0 * result._
-    }
-
-    def "caches and supplies artifacts"() {
-        def fooId = Stub(ModuleVersionArtifactIdentifier)
-        def fooFile = new File("foo")
-        def fooResult = Mock(BuildableArtifactResolveResult) { getFile() >> fooFile }
-        def anotherFooResult = Mock(BuildableArtifactResolveResult)
-
-        def differentId = Stub(ModuleVersionArtifactIdentifier)
-        def differentResult = Mock(BuildableArtifactResolveResult)
-
-        cache.newArtifact(fooId, fooResult)
-
-        when:
-        def differentCached = cache.supplyArtifact(differentId, differentResult )
-
-        then:
-        !differentCached
-        0 * differentResult._
-
-        when:
-        def fooCached = cache.supplyArtifact(fooId, anotherFooResult )
-
-        then:
-        fooCached
-        1 * anotherFooResult.resolved(fooFile)
-    }
-
-    def "does not cache failed artifact resolves"() {
-        def artifactId = Stub(ModuleVersionArtifactIdentifier)
-        def failedResult = Stub(BuildableArtifactResolveResult) { getFailure() >> new ArtifactResolveException("bad") }
-        cache.newArtifact(artifactId, failedResult)
-
-        def result = Mock(BuildableArtifactResolveResult)
-
-        when:
-        def fromCache = cache.supplyArtifact(artifactId, result)
-
-        then:
-        !fromCache
-        0 * result._
-    }
-}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryArtifactsCacheTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryArtifactsCacheTest.groovy
new file mode 100644
index 000000000000..8def71e83008
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryArtifactsCacheTest.groovy
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.DefaultBuildableArtifactResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ArtifactResolveException
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
+import spock.lang.Specification
+
+class InMemoryArtifactsCacheTest extends Specification {
+
+    def stats = new InMemoryCacheStats()
+    def cache = new InMemoryArtifactsCache(stats)
+
+    static componentId(String group, String module, String version) {
+        return DefaultModuleComponentIdentifier.newId(group, module, version)
+    }
+
+    def "caches and supplies artifacts"() {
+        def artifactId = Stub(ModuleVersionArtifactIdentifier)
+        def artifactFile = new File("foo")
+
+        given:
+        def originalResult = new DefaultBuildableArtifactResolveResult()
+        originalResult.resolved(artifactFile)
+        cache.newArtifact(artifactId, originalResult)
+
+        def differentIdResult = Mock(BuildableArtifactResolveResult)
+        def sameIdResult = Mock(BuildableArtifactResolveResult)
+
+        when:
+        def differentId = Stub(ModuleVersionArtifactIdentifier)
+        def differentIdFound = cache.supplyArtifact(differentId, differentIdResult)
+
+        then:
+        !differentIdFound
+        0 * differentIdResult._
+
+        when:
+        def sameIdFound = cache.supplyArtifact(artifactId, sameIdResult)
+
+        then:
+        sameIdFound
+        1 * sameIdResult.resolved(artifactFile)
+    }
+
+    def "does not cache failed artifact resolves"() {
+        def artifactId = Stub(ModuleVersionArtifactIdentifier)
+        def failedResult = Stub(BuildableArtifactResolveResult) { getFailure() >> new ArtifactResolveException("bad") }
+        cache.newArtifact(artifactId, failedResult)
+
+        def result = Mock(BuildableArtifactResolveResult)
+
+        when:
+        def fromCache = cache.supplyArtifact(artifactId, result)
+
+        then:
+        !fromCache
+        0 * result._
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedModuleComponentRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedModuleComponentRepositoryTest.groovy
new file mode 100644
index 000000000000..2b4c58663337
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedModuleComponentRepositoryTest.groovy
@@ -0,0 +1,230 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
+import org.gradle.api.internal.artifacts.ivyservice.ArtifactType
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactSetResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.ComponentUsage
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.*
+import org.gradle.api.internal.artifacts.metadata.DependencyMetaData
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
+import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData
+import spock.lang.Specification
+
+import static org.gradle.api.internal.artifacts.DefaultModuleVersionSelector.newSelector
+
+class InMemoryCachedModuleComponentRepositoryTest extends Specification {
+
+    def stats = new InMemoryCacheStats()
+    def localArtifactsCache = Mock(InMemoryArtifactsCache)
+    def remoteArtifactsCache = Mock(InMemoryArtifactsCache)
+    def localMetaDataCache = Mock(InMemoryMetaDataCache)
+    def remoteMetaDataCache = Mock(InMemoryMetaDataCache)
+    def caches = new InMemoryModuleComponentRepositoryCaches(localArtifactsCache, remoteArtifactsCache, localMetaDataCache, remoteMetaDataCache, stats);
+    def localDelegate = Mock(ModuleComponentRepositoryAccess)
+    def remoteDelegate = Mock(ModuleComponentRepositoryAccess)
+    def delegate = Mock(ModuleComponentRepository) {
+        getLocalAccess() >> localDelegate
+        getRemoteAccess() >> remoteDelegate
+    }
+    def repo = new InMemoryCachedModuleComponentRepository(caches, delegate)
+    def lib = Mock(ModuleComponentIdentifier)
+    def selector = newSelector("org", "lib", "1.0")
+    def dep = Stub(DependencyMetaData) { getRequested() >> selector }
+
+    def listingResult = Mock(BuildableModuleVersionSelectionResolveResult)
+    def metaDataResult = Mock(BuildableModuleVersionMetaDataResolveResult)
+
+    def "delegates"() {
+        when:
+        def id = repo.getId()
+        def name = repo.getName()
+
+        then:
+        id == "x"
+        name == "localRepo"
+        1 * delegate.getId() >> "x"
+        1 * delegate.getName() >> "localRepo"
+    }
+
+    def "retrieves and caches module version listings"() {
+        when:
+        repo.localAccess.listModuleVersions(dep, listingResult)
+
+        then:
+        1 * localMetaDataCache.supplyModuleVersions(selector, listingResult) >> false
+        1 * localDelegate.listModuleVersions(dep, listingResult)
+        1 * localMetaDataCache.newModuleVersions(selector, listingResult)
+        0 * _
+
+        when:
+        repo.remoteAccess.listModuleVersions(dep, listingResult)
+
+        then:
+        1 * remoteMetaDataCache.supplyModuleVersions(selector, listingResult) >> false
+        1 * remoteDelegate.listModuleVersions(dep, listingResult)
+        1 * remoteMetaDataCache.newModuleVersions(selector, listingResult)
+        0 * _
+    }
+
+    def "uses module version listings from cache"() {
+        when:
+        repo.localAccess.listModuleVersions(dep, listingResult)
+
+        then:
+        1 * localMetaDataCache.supplyModuleVersions(selector, listingResult) >> true
+        0 * _
+
+        when:
+        repo.remoteAccess.listModuleVersions(dep, listingResult)
+
+        then:
+        1 * remoteMetaDataCache.supplyModuleVersions(selector, listingResult) >> true
+        0 * _
+    }
+
+    def "retrieves and caches local dependencies"() {
+        when:
+        repo.localAccess.resolveComponentMetaData(dep, lib, metaDataResult)
+
+        then:
+        1 * localMetaDataCache.supplyMetaData(lib, metaDataResult) >> false
+        1 * localDelegate.resolveComponentMetaData(dep, lib, metaDataResult)
+        1 * localMetaDataCache.newDependencyResult(lib, metaDataResult)
+        0 * _
+    }
+
+    def "uses local dependencies from cache"() {
+        when:
+        repo.localAccess.resolveComponentMetaData(dep, lib, metaDataResult)
+
+        then:
+        1 * localMetaDataCache.supplyMetaData(lib, metaDataResult) >> true
+        0 * _
+    }
+
+    def "retrieves and caches dependencies"() {
+        when:
+        repo.remoteAccess.resolveComponentMetaData(dep, lib, metaDataResult)
+
+        then:
+        1 * remoteMetaDataCache.supplyMetaData(lib, metaDataResult) >> false
+        1 * remoteDelegate.resolveComponentMetaData(dep, lib, metaDataResult)
+        1 * remoteMetaDataCache.newDependencyResult(lib, metaDataResult)
+        0 * _
+    }
+
+    def "uses dependencies from cache"() {
+        when:
+        repo.remoteAccess.resolveComponentMetaData(dep, lib, metaDataResult)
+
+        then:
+        1 * remoteMetaDataCache.supplyMetaData(lib, metaDataResult) >> true
+        0 * _
+    }
+
+    def "delegates request for module artifacts by type"() {
+        def moduleMetaData = Stub(ModuleVersionMetaData)
+        def artifactType = Stub(ArtifactType)
+        def result = Mock(BuildableArtifactSetResolveResult)
+
+        when:
+        repo.localAccess.resolveModuleArtifacts(moduleMetaData, artifactType, result)
+
+        then:
+        1 * localDelegate.resolveModuleArtifacts(moduleMetaData, artifactType, result)
+        0 * _
+
+        when:
+        repo.remoteAccess.resolveModuleArtifacts(moduleMetaData, artifactType, result)
+
+        then:
+        1 * remoteDelegate.resolveModuleArtifacts(moduleMetaData, artifactType, result)
+        0 * _
+    }
+
+    def "delegates request for module artifacts for usage"() {
+        def moduleMetaData = Stub(ModuleVersionMetaData)
+        def componentUsage = Stub(ComponentUsage)
+        def result = Mock(BuildableArtifactSetResolveResult)
+
+        when:
+        repo.localAccess.resolveModuleArtifacts(moduleMetaData, componentUsage, result)
+
+        then:
+        1 * localDelegate.resolveModuleArtifacts(moduleMetaData, componentUsage, result)
+        0 * _
+
+        when:
+        repo.remoteAccess.resolveModuleArtifacts(moduleMetaData, componentUsage, result)
+
+        then:
+        1 * remoteDelegate.resolveModuleArtifacts(moduleMetaData, componentUsage, result)
+        0 * _
+    }
+
+    def "retrieves and caches artifacts"() {
+        def result = Mock(BuildableArtifactResolveResult)
+        def artifactId = Stub(ModuleVersionArtifactIdentifier)
+        def artifact = Stub(ModuleVersionArtifactMetaData) {
+            getId() >> artifactId
+        }
+        def moduleSource = Mock(ModuleSource)
+
+        when:
+        repo.localAccess.resolveArtifact(artifact, moduleSource, result)
+
+        then:
+        1 * localArtifactsCache.supplyArtifact(artifactId, result) >> false
+        1 * localDelegate.resolveArtifact(artifact, moduleSource, result)
+        1 * localArtifactsCache.newArtifact(artifactId, result)
+        0 * _
+
+        when:
+        repo.remoteAccess.resolveArtifact(artifact, moduleSource, result)
+
+        then:
+        1 * remoteArtifactsCache.supplyArtifact(artifactId, result) >> false
+        1 * remoteDelegate.resolveArtifact(artifact, moduleSource, result)
+        1 * remoteArtifactsCache.newArtifact(artifactId, result)
+        0 * _
+    }
+
+    def "uses artifacts from cache"() {
+        def result = Mock(BuildableArtifactResolveResult)
+        def artifactId = Stub(ModuleVersionArtifactIdentifier)
+        def artifact = Stub(ModuleVersionArtifactMetaData) {
+            getId() >> artifactId
+        }
+        def moduleSource = Mock(ModuleSource)
+
+        when:
+        repo.localAccess.resolveArtifact(artifact, moduleSource, result)
+
+        then:
+        1 * localArtifactsCache.supplyArtifact(artifactId, result) >> true
+        0 * _
+
+        when:
+        repo.remoteAccess.resolveArtifact(artifact, moduleSource, result)
+
+        then:
+        1 * remoteArtifactsCache.supplyArtifact(artifactId, result) >> true
+        0 * _
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCacheTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedRepositoryFactoryTest.groovy
similarity index 52%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCacheTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedRepositoryFactoryTest.groovy
index fe3067b5a482..e2bfd1b6ca96 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryDependencyMetadataCacheTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryCachedRepositoryFactoryTest.groovy
@@ -14,25 +14,21 @@
  * limitations under the License.
  */
 
-
-
-
-
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache
 
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.LocalAwareModuleVersionRepository
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository
 import org.gradle.util.SetSystemProperties
 import org.junit.Rule
 import spock.lang.Specification
 
-class InMemoryDependencyMetadataCacheTest extends Specification {
+class InMemoryCachedRepositoryFactoryTest extends Specification {
 
     @Rule SetSystemProperties sysProp = new SetSystemProperties()
-    def cache = new InMemoryDependencyMetadataCache()
+    def cache = new InMemoryCachedRepositoryFactory()
 
     def "can be turned off via system property"() {
-        System.properties.setProperty(InMemoryDependencyMetadataCache.TOGGLE_PROPERTY, "false")
-        def repo = Mock(LocalAwareModuleVersionRepository) { getId() >> "mavenCentral" }
+        System.properties.setProperty(InMemoryCachedRepositoryFactory.TOGGLE_PROPERTY, "false")
+        def repo = Mock(ModuleComponentRepository) { getId() >> "mavenCentral" }
 
         when:
         def out = cache.cached(repo)
@@ -42,22 +38,27 @@ class InMemoryDependencyMetadataCacheTest extends Specification {
     }
 
     def "wraps repositories"() {
-        def repo1 = Mock(LocalAwareModuleVersionRepository) { getId() >> "mavenCentral" }
-        def repo2 = Mock(LocalAwareModuleVersionRepository) { getId() >> "localRepo" }
-        def repo3 = Mock(LocalAwareModuleVersionRepository) { getId() >> "mavenCentral" }
+        def repo1 = Mock(ModuleComponentRepository) { getId() >> "mavenCentral" }
+        def repo2 = Mock(ModuleComponentRepository) { getId() >> "localRepo" }
+        def repo3 = Mock(ModuleComponentRepository) { getId() >> "mavenCentral" }
 
         when:
-        CachedRepository c1 = cache.cached(repo1)
-        CachedRepository c2 = cache.cached(repo2)
-        CachedRepository c3 = cache.cached(repo3)
+        ModuleComponentRepository c1 = cache.cached(repo1)
+        ModuleComponentRepository c2 = cache.cached(repo2)
+        ModuleComponentRepository c3 = cache.cached(repo3)
 
         then:
         c1.delegate == repo1
         c2.delegate == repo2
         c3.delegate == repo3
 
-        c1.cache == c3.cache //same repo id, same cache
-        c2.cache != c1.cache
+        // Caches are shared for same repository id
+        c1.localAccess.artifactsCache == c3.localAccess.artifactsCache
+        c1.localAccess.metaDataCache == c3.localAccess.metaDataCache
+        c1.remoteAccess.artifactsCache == c3.remoteAccess.artifactsCache
+        c1.remoteAccess.metaDataCache == c3.remoteAccess.metaDataCache
+
+        c2.localAccess.artifactsCache != c1.localAccess.artifactsCache
 
         cache.stats.reposWrapped == 3
         cache.stats.cacheInstances == 2
@@ -67,7 +68,7 @@ class InMemoryDependencyMetadataCacheTest extends Specification {
 
     def "cleans cache on close"() {
         when:
-        cache.cached(Mock(LocalAwareModuleVersionRepository) { getId() >> "x"} )
+        cache.cached(Mock(ModuleComponentRepository) { getId() >> "x"} )
         cache.stop()
 
         then:
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryMetaDataCacheTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryMetaDataCacheTest.groovy
new file mode 100644
index 000000000000..1b3135dd48f6
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/memcache/InMemoryMetaDataCacheTest.groovy
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.memcache
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionMetaDataResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.BuildableModuleVersionSelectionResolveResult
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleSource
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionListing
+import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData
+import spock.lang.Specification
+
+import static org.gradle.api.internal.artifacts.DefaultModuleVersionSelector.newSelector
+
+class InMemoryMetaDataCacheTest extends Specification {
+
+    def stats = new InMemoryCacheStats()
+    def cache = new InMemoryMetaDataCache(stats)
+
+    static componentId(String group, String module, String version) {
+        return DefaultModuleComponentIdentifier.newId(group, module, version)
+    }
+
+    def "caches and supplies module versions"() {
+        def listing = Mock(ModuleVersionListing)
+        def result = Mock(BuildableModuleVersionSelectionResolveResult)
+        def missingResult = Mock(BuildableModuleVersionSelectionResolveResult)
+
+        given:
+        cache.newModuleVersions(newSelector("org", "foo-remote", "1.0"), Stub(BuildableModuleVersionSelectionResolveResult) {
+            getState() >> BuildableModuleVersionSelectionResolveResult.State.Listed
+            getVersions() >> listing
+        })
+
+        when:
+        def found = cache.supplyModuleVersions(newSelector("org", "foo-remote", "1.0"), result)
+        def missing = cache.supplyModuleVersions(newSelector("org", "foo-local", "1.0"), missingResult)
+
+        then:
+        found
+        1 * result.listed(listing)
+
+        and:
+        !missing
+        0 * missingResult._
+    }
+
+    def "does not cache failed module version listing"() {
+        def failedResult = Stub(BuildableModuleVersionSelectionResolveResult) {
+            getState() >> BuildableModuleVersionSelectionResolveResult.State.Failed
+        }
+        cache.newModuleVersions(newSelector("org", "lib", "1.0"), failedResult)
+
+        def result = Mock(BuildableModuleVersionSelectionResolveResult)
+
+        when:
+        def foundInCache = cache.supplyModuleVersions(newSelector("org", "lib", "1.0"), result)
+
+        then:
+        !foundInCache
+        0 * result._
+    }
+
+    def "caches and supplies remote metadata"() {
+        def suppliedMetaData = Stub(MutableModuleVersionMetaData)
+        def cachedCopy = Stub(MutableModuleVersionMetaData)
+        def originalMetaData = Stub(MutableModuleVersionMetaData)
+        def source = Stub(ModuleSource)
+        def resolvedResult = Mock(BuildableModuleVersionMetaDataResolveResult.class) {
+            getState() >> BuildableModuleVersionMetaDataResolveResult.State.Resolved
+            getMetaData() >> originalMetaData
+            getModuleSource() >> source
+        }
+        def result = Mock(BuildableModuleVersionMetaDataResolveResult.class)
+
+        given:
+        _ * originalMetaData.copy() >> cachedCopy
+        cache.newDependencyResult(componentId("org", "foo", "1.0"), resolvedResult)
+
+        when:
+        def differentSelector = cache.supplyMetaData(componentId("org", "XXX", "1.0"), result)
+
+        then:
+        !differentSelector
+        stats.metadataServed == 0
+        0 * result._
+
+        when:
+        def match = cache.supplyMetaData(componentId("org", "foo", "1.0"), result)
+
+        then:
+        match
+        stats.metadataServed == 1
+        _ * cachedCopy.copy() >> suppliedMetaData
+        1 * result.resolved(suppliedMetaData, source)
+    }
+
+    def "caches and supplies remote and local metadata"() {
+        def moduleSource = Stub(ModuleSource)
+        def moduleMetaData = Stub(MutableModuleVersionMetaData)
+        _ * moduleMetaData.copy() >> moduleMetaData
+        def resolvedResult = Mock(BuildableModuleVersionMetaDataResolveResult.class) {
+            getMetaData() >> moduleMetaData
+            getModuleSource() >> moduleSource
+            getState() >> BuildableModuleVersionMetaDataResolveResult.State.Resolved
+        }
+        def result = Mock(BuildableModuleVersionMetaDataResolveResult.class)
+
+        given:
+        cache.newDependencyResult(componentId("org", "remote", "1.0"), resolvedResult)
+
+        when:
+        def found = cache.supplyMetaData(componentId("org", "remote", "1.0"), result)
+
+        then:
+        found
+        stats.metadataServed == 1
+        1 * result.resolved(moduleMetaData, moduleSource)
+    }
+
+    def "does not cache failed resolves"() {
+        def failedResult = Mock(BuildableModuleVersionMetaDataResolveResult.class) { getState() >> BuildableModuleVersionMetaDataResolveResult.State.Failed }
+        cache.newDependencyResult(componentId("org", "lib", "1.0"), failedResult)
+
+        def result = Mock(BuildableModuleVersionMetaDataResolveResult.class)
+
+        when:
+        def fromCache = cache.supplyMetaData(componentId("org", "lib", "1.0"), result)
+
+        then:
+        !fromCache
+        0 * result._
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractPomReaderTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractPomReaderTest.groovy
index d7f16f98de3a..2a83e3660ce2 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractPomReaderTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/AbstractPomReaderTest.groovy
@@ -18,8 +18,8 @@ package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser
 
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.MavenDependencyKey
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.PomDependencyMgt
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource
+import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource
+import org.gradle.internal.resource.LocallyAvailableExternalResource
 import org.gradle.internal.resource.local.DefaultLocallyAvailableResource
 import org.gradle.internal.resource.local.LocallyAvailableResource
 import org.gradle.test.fixtures.file.TestFile
@@ -37,7 +37,7 @@ abstract class AbstractPomReaderTest extends Specification {
         pomFile = tmpDir.file('pom.xml')
         pomFile.createFile()
         LocallyAvailableResource locallyAvailableResource = new DefaultLocallyAvailableResource(pomFile)
-        locallyAvailableExternalResource = new DefaultLocallyAvailableExternalResource(pomFile.toURI().toURL().toString(), locallyAvailableResource)
+        locallyAvailableExternalResource = new DefaultLocallyAvailableExternalResource(pomFile.toURI(), locallyAvailableResource)
     }
 
     protected void assertResolvedPomDependency(MavenDependencyKey key, String version) {
@@ -65,7 +65,7 @@ abstract class AbstractPomReaderTest extends Specification {
         pomFile.createFile()
         pomFile << pomDefinition
         LocallyAvailableResource locallyAvailableResource = new DefaultLocallyAvailableResource(pomFile)
-        LocallyAvailableExternalResource locallyAvailableExternalResource = new DefaultLocallyAvailableExternalResource(pomFile.toURI().toURL().toString(), locallyAvailableResource)
+        LocallyAvailableExternalResource locallyAvailableExternalResource = new DefaultLocallyAvailableExternalResource(pomFile.toURI(), locallyAvailableResource)
         return new PomReader(locallyAvailableExternalResource)
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParserTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParserTest.groovy
index b6ac55ff61bd..83f2338dbdbe 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParserTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/DisconnectedIvyXmlModuleDescriptorParserTest.groovy
@@ -18,8 +18,8 @@ package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser
 
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy
-import org.gradle.api.internal.externalresource.ExternalResource
-import org.gradle.api.internal.externalresource.LocallyAvailableExternalResource
+import org.gradle.internal.resource.ExternalResource
+import org.gradle.internal.resource.LocallyAvailableExternalResource
 import org.gradle.internal.resource.local.LocallyAvailableResource
 import spock.lang.Specification
 
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserProfileTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserProfileTest.groovy
index e19dbfa81331..c6eccddde962 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserProfileTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserProfileTest.groovy
@@ -16,8 +16,8 @@
 
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser
 
-import org.gradle.api.internal.artifacts.resolution.MavenPomArtifact
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource
+import org.gradle.api.internal.artifacts.result.metadata.MavenPomArtifact
+import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource
 import org.gradle.internal.resource.local.DefaultLocallyAvailableResource
 
 import static org.gradle.api.internal.artifacts.ivyservice.IvyUtil.createModuleId
@@ -53,7 +53,6 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 0
     }
 
@@ -95,7 +94,6 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 1
         descriptor.dependencies.first().dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
         hasDefaultDependencyArtifact(descriptor.dependencies.first())
@@ -149,7 +147,7 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact.class) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact.class) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -224,8 +222,8 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -345,7 +343,7 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -423,8 +421,8 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -494,7 +492,7 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI().toURL().toString(), new DefaultLocallyAvailableResource(imported)) }
+        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI(), new DefaultLocallyAvailableResource(imported)) }
 
         when:
         def descriptor = parsePom()
@@ -539,7 +537,6 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 1
         descriptor.dependencies.first().dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
         hasDefaultDependencyArtifact(descriptor.dependencies.first())
@@ -587,7 +584,7 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -656,8 +653,8 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -742,8 +739,8 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -812,7 +809,832 @@ class GradlePomModuleDescriptorParserProfileTest extends AbstractGradlePomModule
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI().toURL().toString(), new DefaultLocallyAvailableResource(imported)) }
+        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI(), new DefaultLocallyAvailableResource(imported)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', '1.2')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "pom with project coordinates defined by profile activated by absence of system property"() {
+        given:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>\${some.group}</groupId>
+    <artifactId>\${some.artifact}</artifactId>
+    <version>\${some.version}</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!somePrpperty</name>
+                </property>
+            </activation>
+            <properties>
+                <some.group>group-one</some.group>
+                <some.artifact>artifact-one</some.artifact>
+                <some.version>version-one</some.version>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
+        descriptor.dependencies.length == 0
+    }
+
+    def "pom with dependency coordinates defined by profile activated by absence of system property"() {
+        given:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>\${some.group}</groupId>
+            <artifactId>\${some.artifact}</artifactId>
+            <version>\${some.version}</version>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <properties>
+                <some.group>group-two</some.group>
+                <some.artifact>artifact-two</some.artifact>
+                <some.version>version-two</some.version>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
+        descriptor.dependencies.length == 1
+        descriptor.dependencies.first().dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
+        hasDefaultDependencyArtifact(descriptor.dependencies.first())
+    }
+
+    def "uses parent properties from activated by absence of system property to provide default values for a dependency"() {
+        given:
+        def parent = tmpDir.file("parent.xml") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <properties>
+                <some.group>group-two</some.group>
+                <some.artifact>artifact-two</some.artifact>
+                <some.version>version-two</some.version>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>group-one</groupId>
+        <artifactId>parent</artifactId>
+        <version>version-one</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>\${some.group}</groupId>
+            <artifactId>\${some.artifact}</artifactId>
+            <version>\${some.version}</version>
+        </dependency>
+    </dependencies>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact.class) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "uses grand parent properties from profile activated by absence of system property to provide default values for a dependency"() {
+        given:
+        def grandParent = tmpDir.file("grandparent.xml") << """
+<project>
+    <groupId>different-group</groupId>
+    <artifactId>grandparent</artifactId>
+    <version>different-version</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <properties>
+                <some.group>group-two</some.group>
+                <some.artifact>artifact-two</some.artifact>
+                <some.version>version-two</some.version>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        def parent = tmpDir.file("parent.xml") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>different-group</groupId>
+        <artifactId>grandparent</artifactId>
+        <version>different-version</version>
+    </parent>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>group-one</groupId>
+        <artifactId>parent</artifactId>
+        <version>version-one</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>\${some.group}</groupId>
+            <artifactId>\${some.artifact}</artifactId>
+            <version>\${some.version}</version>
+        </dependency>
+    </dependencies>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "uses dependency management section in profile activated by absence of system property to provide default values for a dependency"() {
+        given:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>group-two</groupId>
+            <artifactId>artifact-two</artifactId>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>1.2</version>
+                        <scope>test</scope>
+                        <exclusions>
+                            <exclusion>
+                                <groupId>group-three</groupId>
+                                <artifactId>artifact-three</artifactId>
+                            </exclusion>
+                        </exclusions>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', '1.2')
+        dep.moduleConfigurations == ['test']
+        dep.allExcludeRules.length == 1
+        dep.allExcludeRules.first().id.moduleId == createModuleId('group-three', 'artifact-three')
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "uses parent pom dependency management section in profile activated by absence of system property to provide default values for a dependency"() {
+        given:
+        def parent = tmpDir.file("parent.xml") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>1.2</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>group-one</groupId>
+        <artifactId>parent</artifactId>
+        <version>version-one</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>group-two</groupId>
+            <artifactId>artifact-two</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', '1.2')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "uses grand parent pom dependency management section in profile activated by absence of system property to provide default values for a dependency"() {
+        given:
+        def grandParent = tmpDir.file("grandparent.xml") << """
+<project>
+    <groupId>different-group</groupId>
+    <artifactId>grandparent</artifactId>
+    <version>different-version</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>1.2</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        def parent = tmpDir.file("parent.xml") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>different-group</groupId>
+        <artifactId>grandparent</artifactId>
+        <version>different-version</version>
+    </parent>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>group-one</groupId>
+        <artifactId>parent</artifactId>
+        <version>version-one</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>group-two</groupId>
+            <artifactId>artifact-two</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', '1.2')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "uses dependency management section from imported POM in profile activated by absence of system property to define defaults for main POM body dependency"() {
+        given:
+        def imported = tmpDir.file("imported.xml") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>different-group</groupId>
+    <artifactId>imported</artifactId>
+    <version>different-version</version>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>group-two</groupId>
+                <artifactId>artifact-two</artifactId>
+                <version>1.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <dependencies>
+        <dependency>
+            <groupId>group-two</groupId>
+            <artifactId>artifact-two</artifactId>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>different-group</groupId>
+                        <artifactId>imported</artifactId>
+                        <version>different-version</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI(), new DefaultLocallyAvailableResource(imported)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', '1.2')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "pom with dependency defined in profile activated by absence of system property"() {
+        given:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>group-two</groupId>
+                    <artifactId>artifact-two</artifactId>
+                    <version>version-two</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
+        descriptor.dependencies.length == 1
+        descriptor.dependencies.first().dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
+        hasDefaultDependencyArtifact(descriptor.dependencies.first())
+    }
+
+    def "uses parent dependency from profile activated by absence of system property"() {
+        given:
+        def parent = tmpDir.file("parent.xlm") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>group-two</groupId>
+                    <artifactId>artifact-two</artifactId>
+                    <version>version-two</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>group-one</groupId>
+        <artifactId>parent</artifactId>
+        <version>version-one</version>
+    </parent>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "uses grand parent dependency from profile activated by absence of system property"() {
+        given:
+        def grandParent = tmpDir.file("grandparent.xml") << """
+<project>
+    <groupId>different-group</groupId>
+    <artifactId>grandparent</artifactId>
+    <version>different-version</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>group-two</groupId>
+                    <artifactId>artifact-two</artifactId>
+                    <version>1.2</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        def parent = tmpDir.file("parent.xml") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>different-group</groupId>
+        <artifactId>grandparent</artifactId>
+        <version>different-version</version>
+    </parent>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>group-one</groupId>
+        <artifactId>parent</artifactId>
+        <version>version-one</version>
+    </parent>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', '1.2')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "uses parent dependency over grand parent dependency with same groupId and artifactId from profile activated by absence of system property"() {
+        given:
+        def grandParent = tmpDir.file("grandparent.xml") << """
+<project>
+    <groupId>different-group</groupId>
+    <artifactId>grandparent</artifactId>
+    <version>different-version</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>group-two</groupId>
+                    <artifactId>artifact-two</artifactId>
+                    <version>1.2</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        def parent = tmpDir.file("parent.xml") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>different-group</groupId>
+        <artifactId>grandparent</artifactId>
+        <version>different-version</version>
+    </parent>
+
+    <profiles>
+        <profile>
+            <id>profile-2</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>group-two</groupId>
+                    <artifactId>artifact-two</artifactId>
+                    <version>1.3</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>group-one</groupId>
+        <artifactId>parent</artifactId>
+        <version>version-one</version>
+    </parent>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
+
+        when:
+        def descriptor = parsePom()
+
+        then:
+        descriptor.dependencies.length == 1
+        def dep = descriptor.dependencies.first()
+        dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', '1.3')
+        dep.moduleConfigurations == ['compile', 'runtime']
+        hasDefaultDependencyArtifact(dep)
+    }
+
+    def "uses dependency management section from imported POM in profile activated by absence of system property to define defaults for profile dependency"() {
+        given:
+        def imported = tmpDir.file("imported.xml") << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>different-group</groupId>
+    <artifactId>imported</artifactId>
+    <version>different-version</version>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>group-two</groupId>
+                <artifactId>artifact-two</artifactId>
+                <version>1.2</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
+"""
+
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!someProperty</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>different-group</groupId>
+                        <artifactId>imported</artifactId>
+                        <version>different-version</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-two</groupId>
+                    <artifactId>artifact-two</artifactId>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+        and:
+        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI(), new DefaultLocallyAvailableResource(imported)) }
 
         when:
         def descriptor = parsePom()
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserTest.groovy
index 274f3e8431d6..4aa541b8a03b 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/GradlePomModuleDescriptorParserTest.groovy
@@ -15,8 +15,9 @@
  */
 package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser
 
-import org.gradle.api.internal.artifacts.resolution.MavenPomArtifact
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource
+import org.gradle.api.internal.artifacts.metadata.MavenModuleVersionMetaData
+import org.gradle.api.internal.artifacts.result.metadata.MavenPomArtifact
+import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource
 import org.gradle.internal.resource.local.DefaultLocallyAvailableResource
 import spock.lang.Issue
 
@@ -44,12 +45,14 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
 
+
         when:
-        def descriptor = parsePom()
+        def metaData = parseMetaData()
+        def descriptor = metaData.descriptor
 
         then:
+        metaData instanceof MavenModuleVersionMetaData
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 1
         descriptor.dependencies.first().dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
         hasDefaultDependencyArtifact(descriptor.dependencies.first())
@@ -127,7 +130,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -238,7 +241,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         parsePom()
@@ -293,7 +296,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -359,7 +362,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -446,8 +449,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI().toURL().toString(), new DefaultLocallyAvailableResource(imported)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI(), new DefaultLocallyAvailableResource(imported)) }
 
         when:
         def descriptor = parsePom()
@@ -515,7 +518,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI().toURL().toString(), new DefaultLocallyAvailableResource(imported)) }
+        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI(), new DefaultLocallyAvailableResource(imported)) }
 
         when:
         def descriptor = parsePom()
@@ -570,7 +573,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -627,7 +630,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -707,8 +710,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -783,8 +786,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -864,8 +867,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -926,7 +929,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -1008,8 +1011,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -1110,9 +1113,9 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI().toURL().toString(), new DefaultLocallyAvailableResource(imported)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI(), new DefaultLocallyAvailableResource(imported)) }
 
         when:
         def descriptor = parsePom()
@@ -1151,7 +1154,6 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 1
         descriptor.dependencies.first().dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
         hasDependencyArtifact(descriptor.dependencies.first(), 'artifact-two', 'jar', 'jar', 'classifier-two')
@@ -1183,7 +1185,6 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 1
         descriptor.dependencies.first().dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
         hasDefaultDependencyArtifact(descriptor.dependencies.first())
@@ -1207,7 +1208,6 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'eclipse-plugin', 'jar')
         descriptor.dependencies.length == 0
     }
 
@@ -1268,7 +1268,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.allArtifacts.length == 0
-        metaData.metaDataOnly //flag to indicate that there may not actually be any artifacts
+        metaData.packaging == 'pom'
     }
 
     def "pom with project coordinates defined by custom properties"() {
@@ -1292,7 +1292,6 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 0
     }
 
@@ -1325,7 +1324,6 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 1
         descriptor.dependencies.first().dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
         hasDefaultDependencyArtifact(descriptor.dependencies.first())
@@ -1387,8 +1385,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -1454,8 +1452,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -1526,8 +1524,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(grandParent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'grandparent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(grandParent.toURI(), new DefaultLocallyAvailableResource(grandParent)) }
 
         when:
         def descriptor = parsePom()
@@ -1607,8 +1605,8 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
-        parseContext.getMetaDataArtifact({ it.name == 'relocated' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(relocated.toURI().toURL().toString(), new DefaultLocallyAvailableResource(relocated)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'relocated' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(relocated.toURI(), new DefaultLocallyAvailableResource(relocated)) }
 
 
         when:
@@ -1681,7 +1679,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -1748,7 +1746,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact({ it.name == 'parent' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         parsePom()
@@ -1800,7 +1798,6 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 1
         def dep = descriptor.dependencies[0]
         dep.dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-four')
@@ -1860,7 +1857,6 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 5
         def defDep = descriptor.dependencies[0]
         defDep.dependencyRevisionId == moduleId('group-two', 'artifact-two', 'version-two')
@@ -1931,7 +1927,6 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 
         then:
         descriptor.moduleRevisionId == moduleId('group-one', 'artifact-one', 'version-one')
-        hasArtifact(descriptor, 'artifact-one', 'jar', 'jar')
         descriptor.dependencies.length == 2
         def defDep = descriptor.dependencies[0]
         defDep.dependencyRevisionId == moduleId('group-one', 'artifact-two', 'version-one')
@@ -1998,7 +1993,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI().toURL().toString(), new DefaultLocallyAvailableResource(parent)) }
+        parseContext.getMetaDataArtifact(_, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(parent.toURI(), new DefaultLocallyAvailableResource(parent)) }
 
         when:
         def descriptor = parsePom()
@@ -2072,7 +2067,7 @@ class GradlePomModuleDescriptorParserTest extends AbstractGradlePomModuleDescrip
 </project>
 """
         and:
-        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI().toURL().toString(), new DefaultLocallyAvailableResource(imported)) }
+        parseContext.getMetaDataArtifact({ it.name == 'imported' }, MavenPomArtifact) >> { new DefaultLocallyAvailableExternalResource(imported.toURI(), new DefaultLocallyAvailableResource(imported)) }
 
         when:
         def descriptor = parsePom()
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParserTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParserTest.groovy
index f4568d26d91a..3309ae540a43 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParserTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParserTest.groovy
@@ -21,8 +21,8 @@ import org.apache.ivy.plugins.matcher.GlobPatternMatcher
 import org.apache.ivy.plugins.matcher.PatternMatcher
 import org.apache.ivy.plugins.matcher.RegexpPatternMatcher
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy
-import org.gradle.api.internal.artifacts.resolution.IvyDescriptorArtifact
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource
+import org.gradle.api.internal.artifacts.result.metadata.IvyDescriptorArtifact
+import org.gradle.internal.resource.DefaultLocallyAvailableExternalResource
 import org.gradle.internal.resource.local.DefaultLocallyAvailableResource
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.Resources
@@ -244,7 +244,7 @@ class IvyXmlModuleDescriptorParserTest extends Specification {
 </ivy-module>
 """
         and:
-        parseContext.getMetaDataArtifact(_, IvyDescriptorArtifact.class) >> new DefaultLocallyAvailableExternalResource(parentFile.toURI().toString(), new DefaultLocallyAvailableResource(parentFile))
+        parseContext.getMetaDataArtifact(_, IvyDescriptorArtifact.class) >> new DefaultLocallyAvailableExternalResource(parentFile.toURI(), new DefaultLocallyAvailableResource(parentFile))
 
         when:
         ModuleDescriptor md = parser.parseMetaData(parseContext, file, true).descriptor
@@ -280,13 +280,13 @@ class IvyXmlModuleDescriptorParserTest extends Specification {
                 </configurations>
                 <publications/>
                 <dependencies defaultconfmapping="myconf->default">
-                    <dependency name="mymodule2"/>
+                    <dependency name="mymodule2" rev="1.2"/>
                 </dependencies>
             </ivy-module>
         """
 
         when:
-        def descriptor = parser.parseMetaData(parseContext, file, false).descriptor
+        def descriptor = parser.parseMetaData(parseContext, file, true).descriptor
         def dependency = descriptor.dependencies.first()
 
         then:
@@ -309,25 +309,25 @@ class IvyXmlModuleDescriptorParserTest extends Specification {
                 </configurations>
                 <publications/>
                 <dependencies>
-                    <dependency name="mymodule2" conf="a"/>
-                    <dependency name="mymodule2" conf="a->other"/>
-                    <dependency name="mymodule2" conf="*->@"/>
-                    <dependency name="mymodule2" conf="a->other;%->@"/>
-                    <dependency name="mymodule2" conf="*,!a->@"/>
-                    <dependency name="mymodule2" conf="a->*"/>
-                    <dependency name="mymodule2" conf="a->one,two;a,b->three;*->four;%->none"/>
-                    <dependency name="mymodule2" conf="a->#"/>
-                    <dependency name="mymodule2" conf="a->a;%->@"/>
-                    <dependency name="mymodule2" conf="a->a;*,!a->b"/>
-                    <dependency name="mymodule2" conf="*->*"/>
-                    <dependency name="mymodule2" conf=""/>
-                    <dependency name="mymodule2"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->other"/>
+                    <dependency name="mymodule2" rev="1.2" conf="*->@"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->other;%->@"/>
+                    <dependency name="mymodule2" rev="1.2" conf="*,!a->@"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->*"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->one,two;a,b->three;*->four;%->none"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->#"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->a;%->@"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->a;*,!a->b"/>
+                    <dependency name="mymodule2" rev="1.2" conf="*->*"/>
+                    <dependency name="mymodule2" rev="1.2" conf=""/>
+                    <dependency name="mymodule2" rev="1.2"/>
                 </dependencies>
             </ivy-module>
         """
 
         when:
-        def descriptor = parser.parseMetaData(parseContext, file, false).descriptor
+        def descriptor = parser.parseMetaData(parseContext, file, true).descriptor
 
         then:
         def dependency1 = descriptor.dependencies[0]
@@ -419,20 +419,20 @@ class IvyXmlModuleDescriptorParserTest extends Specification {
                 </configurations>
                 <publications/>
                 <dependencies defaultconf="a" defaultconfmapping="a->a1;b->b1,b2">
-                    <dependency name="mymodule2"/>
-                    <dependency name="mymodule2" conf=""/>
-                    <dependency name="mymodule2" conf="a"/>
-                    <dependency name="mymodule2" conf="b"/>
-                    <dependency name="mymodule2" conf="a->other"/>
-                    <dependency name="mymodule2" conf="*->@"/>
-                    <dependency name="mymodule2" conf="c->other"/>
-                    <dependency name="mymodule2" conf="a->"/>
+                    <dependency name="mymodule2" rev="1.2"/>
+                    <dependency name="mymodule2" rev="1.2" conf=""/>
+                    <dependency name="mymodule2" rev="1.2" conf="a"/>
+                    <dependency name="mymodule2" rev="1.2" conf="b"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->other"/>
+                    <dependency name="mymodule2" rev="1.2" conf="*->@"/>
+                    <dependency name="mymodule2" rev="1.2" conf="c->other"/>
+                    <dependency name="mymodule2" rev="1.2" conf="a->"/>
                 </dependencies>
             </ivy-module>
         """
 
         when:
-        def descriptor = parser.parseMetaData(parseContext, file, false).descriptor
+        def descriptor = parser.parseMetaData(parseContext, file, true).descriptor
 
         then:
         def dependency1 = descriptor.dependencies[0]
@@ -500,7 +500,7 @@ class IvyXmlModuleDescriptorParserTest extends Specification {
         """
 
         when:
-        def descriptor = parser.parseMetaData(parseContext, file, false).descriptor
+        def descriptor = parser.parseMetaData(parseContext, file, true).descriptor
 
         then:
         descriptor.allArtifacts.length == 3
@@ -519,6 +519,36 @@ class IvyXmlModuleDescriptorParserTest extends Specification {
         descriptor.getArtifacts("d")*.name == ['mymodule', 'art2']
     }
 
+    def "parses extra attributes and extra info"() {
+        given:
+        def file = temporaryFolder.createFile("ivy.xml")
+        file.text = """
+           <ivy-module version="2.0" xmlns:b="namespace-b" xmlns:c="namespace-c">
+                <info organisation="myorg"
+                      module="mymodule"
+                      revision="myrev"
+                      b:a="1"
+                      b:b="2"
+                      c:a="3">
+                    <b:a>info 1</b:a>
+                    <c:a>info 2</c:a>
+                </info>
+            </ivy-module>
+        """
+
+        when:
+        def descriptor = parser.parseMetaData(parseContext, file, true).descriptor
+
+        then:
+        descriptor.moduleRevisionId.qualifiedExtraAttributes.size() == 3
+        descriptor.moduleRevisionId.qualifiedExtraAttributes['b:a'] == "1"
+        descriptor.moduleRevisionId.qualifiedExtraAttributes['b:b'] == "2"
+        descriptor.moduleRevisionId.qualifiedExtraAttributes['c:a'] == "3"
+        descriptor.extraInfo.size() == 2
+        descriptor.extraInfo['b:a'] == "info 1"
+        descriptor.extraInfo['c:a'] == "info 2"
+    }
+
     def verifyFullDependencies(DependencyDescriptor[] dependencies) {
         // no conf def => equivalent to *->*
         DependencyDescriptor dd = getDependency(dependencies, "mymodule2")
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderProfileTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderProfileTest.groovy
index f040a30bedf2..489a6566e1df 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderProfileTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/PomReaderProfileTest.groovy
@@ -18,6 +18,7 @@ package org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser
 
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.MavenDependencyKey
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.data.PomProfile
+import org.gradle.internal.id.UUIDGenerator
 
 class PomReaderProfileTest extends AbstractPomReaderTest {
     def "parse POM without active profile"() {
@@ -1563,4 +1564,757 @@ class PomReaderProfileTest extends AbstractPomReaderTest {
         pomReader.getDependencies().size() == 1
         assertResolvedPomDependency(key, 'version-three')
     }
+
+    def "cannot use POM property to control profile property activation"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+        System.properties[customPropertyName] = 'BLUE'
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <properties>
+        <activate.profile>BLUE</activate.profile>
+    </properties>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>${customPropertyName}</name>
+                    <value>\${activate.profile}</value>
+                </property>
+            </activation>
+            <properties>
+                <groupId.prop>group-two</groupId.prop>
+                <artifactId.prop>artifact-two</artifactId.prop>
+                <version.prop>version-two</version.prop>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 0
+        !pomReader.properties.containsKey('groupId.prop')
+        !pomReader.properties.containsKey('artifactId.prop')
+        !pomReader.properties.containsKey('version.prop')
+
+        cleanup:
+        System.clearProperty(customPropertyName)
+    }
+
+    def "does not activate profile for a matching system property value"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+        System.properties[customPropertyName] = 'BLUE'
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>${customPropertyName}</name>
+                    <value>BLUE</value>
+                </property>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-two</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-three</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 0
+        !pomReader.properties.containsKey('prop1')
+        !pomReader.dependencyMgt.containsKey(new MavenDependencyKey('group-two', 'artifact-two', 'jar', null))
+
+        cleanup:
+        System.clearProperty(customPropertyName)
+    }
+
+    def "does not activate multiple profiles for a matching same system property with the same value"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+        System.properties[customPropertyName] = 'BLUE'
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>${customPropertyName}</name>
+                    <value>BLUE</value>
+                </property>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+        </profile>
+        <profile>
+            <id>profile-2</id>
+            <activation>
+                <property>
+                    <name>${customPropertyName}</name>
+                    <value>BLUE</value>
+                </property>
+            </activation>
+            <properties>
+                <prop2>myproperty2</prop2>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 0
+        !pomReader.properties.containsKey('prop1')
+        !pomReader.properties.containsKey('prop2')
+
+        cleanup:
+        System.clearProperty(customPropertyName)
+    }
+
+    def "does not activate multiple profiles for a matching different system property with different values"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+        String someOtherPropertyName = new UUIDGenerator().generateId()
+        System.properties[customPropertyName] = 'BLUE'
+        System.properties[someOtherPropertyName] = 'GREEN'
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>${customPropertyName}</name>
+                    <value>BLUE</value>
+                </property>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+        </profile>
+        <profile>
+            <id>profile-2</id>
+            <activation>
+                <property>
+                    <name>${someOtherPropertyName}</name>
+                    <value>GREEN</value>
+                </property>
+            </activation>
+            <properties>
+                <prop2>myproperty2</prop2>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 0
+        !pomReader.properties.containsKey('prop1')
+        !pomReader.properties.containsKey('prop2')
+
+        cleanup:
+        System.clearProperty(customPropertyName)
+        System.clearProperty(someOtherPropertyName)
+    }
+
+    def "does not activate profile if system property value is not matching"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+        System.properties[customPropertyName] = 'GREEN'
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>${customPropertyName}</name>
+                    <value>BLUE</value>
+                </property>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-two</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-three</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 0
+        !pomReader.properties.containsKey('prop1')
+        !pomReader.dependencyMgt.containsKey(new MavenDependencyKey('group-two', 'artifact-two', 'jar', null))
+        !pomReader.dependencies.containsKey(new MavenDependencyKey('group-three', 'artifact-three', 'jar', null))
+
+        cleanup:
+        System.clearProperty(customPropertyName)
+    }
+
+    def "activates profile by the absence of a property"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!${customPropertyName}</name>
+                </property>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-two</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-three</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 1
+        activePomProfiles[0].id == 'profile-1'
+        pomReader.properties['prop1'] == 'myproperty1'
+        pomReader.dependencyMgt.containsKey(new MavenDependencyKey('group-two', 'artifact-two', 'jar', null))
+        assertResolvedPomDependency(new MavenDependencyKey('group-three', 'artifact-three', 'jar', null), 'version-three')
+    }
+
+    def "activates profile for negated property if system property is provided"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+        System.properties[customPropertyName] = 'BLUE'
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!${customPropertyName}</name>
+                </property>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-two</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-three</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 1
+        activePomProfiles[0].id == 'profile-1'
+        pomReader.properties['prop1'] == 'myproperty1'
+        pomReader.dependencyMgt.containsKey(new MavenDependencyKey('group-two', 'artifact-two', 'jar', null))
+        assertResolvedPomDependency(new MavenDependencyKey('group-three', 'artifact-three', 'jar', null), 'version-three')
+
+        cleanup:
+        System.clearProperty(customPropertyName)
+    }
+
+    def "does not activate profile if property value is not declared and system property is not set"() {
+        given:
+        String customPropertyName = new UUIDGenerator().generateId()
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>${customPropertyName}</name>
+                </property>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-two</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-three</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 0
+        !pomReader.properties.containsKey('prop1')
+        !pomReader.dependencyMgt.containsKey(new MavenDependencyKey('group-two', 'artifact-two', 'jar', null))
+        !pomReader.dependencies.containsKey(new MavenDependencyKey('group-three', 'artifact-three', 'jar', null))
+    }
+
+    def "does not activate profile if property value is not declared and system property is set with any value"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+        System.properties[customPropertyName] = 'BLUE'
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>${customPropertyName}</name>
+                </property>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-two</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-three</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 0
+        !pomReader.properties.containsKey('prop1')
+        !pomReader.dependencyMgt.containsKey(new MavenDependencyKey('group-two', 'artifact-two', 'jar', null))
+        !pomReader.dependencies.containsKey(new MavenDependencyKey('group-three', 'artifact-three', 'jar', null))
+
+        cleanup:
+        System.clearProperty(customPropertyName)
+    }
+
+    def "system property activation removes all other profiles that are active by default"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <prop1>myproperty1</prop1>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-one</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-one</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>profile-2</id>
+            <activation>
+                <property>
+                    <name>!${customPropertyName}</name>
+                </property>
+            </activation>
+            <properties>
+                <prop2>myproperty2</prop2>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-two</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-two</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>profile-3</id>
+            <activation>
+                <property>
+                    <name>!${customPropertyName}</name>
+                </property>
+            </activation>
+            <properties>
+                <prop3>myproperty3</prop3>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-three</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-three</version>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>profile-4</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <prop4>myproperty4</prop4>
+            </properties>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-four</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+            <dependencies>
+                <dependency>
+                    <groupId>group-three</groupId>
+                    <artifactId>artifact-three</artifactId>
+                    <version>version-four</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        List<PomProfile> activePomProfiles = pomReader.parseActivePomProfiles()
+        activePomProfiles.size() == 2
+        activePomProfiles[0].id == 'profile-2'
+        activePomProfiles[1].id == 'profile-3'
+        !pomReader.properties.containsKey('prop1')
+        !pomReader.properties.containsKey('prop4')
+        pomReader.properties['prop2'] == 'myproperty2'
+        pomReader.properties['prop3'] == 'myproperty3'
+        !pomReader.dependencyMgt.containsKey(new MavenDependencyKey('group-two', 'artifact-one', 'jar', null))
+        !pomReader.dependencyMgt.containsKey(new MavenDependencyKey('group-two', 'artifact-four', 'jar', null))
+        assertResolvedPomDependencyManagement(new MavenDependencyKey('group-two', 'artifact-two', 'jar', null), 'version-three')
+        assertResolvedPomDependency(new MavenDependencyKey('group-three', 'artifact-three', 'jar', null), 'version-three')
+    }
+
+    def "parse POM with multiple active profiles activated by absence of system property"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+
+        when:
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+    <name>Test Artifact One</name>
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                 <property>
+                    <name>!${customPropertyName}</name>
+                </property>
+            </activation>
+            <properties>
+                <groupId.prop>group-two</groupId.prop>
+                <artifactId.prop>artifact-two</artifactId.prop>
+                <version.prop>version-two</version.prop>
+            </properties>
+        </profile>
+        <profile>
+            <id>profile-2</id>
+            <activation>
+                 <property>
+                    <name>!${customPropertyName}</name>
+                </property>
+            </activation>
+            <properties>
+                <groupId.prop>group-two</groupId.prop>
+                <artifactId.prop>artifact-two</artifactId.prop>
+                <version.prop>version-two</version.prop>
+            </properties>
+        </profile>
+    </profiles>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+
+        then:
+        pomReader.parseActivePomProfiles().size() == 2
+        pomReader.properties.size() == 7
+        pomReader.properties['groupId.prop'] == 'group-two'
+        pomReader.properties['artifactId.prop'] == 'artifact-two'
+        pomReader.properties['version.prop'] == 'version-two'
+    }
+
+    def "finds dependency default if declared in parent POM profile activated by absence of system property"() {
+        setup:
+        String customPropertyName = new UUIDGenerator().generateId()
+
+        when:
+        String parentPom = """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-two</groupId>
+    <artifactId>artifact-two</artifactId>
+    <version>version-two</version>
+
+    <profiles>
+        <profile>
+            <id>profile-1</id>
+            <activation>
+                <property>
+                    <name>!${customPropertyName}</name>
+                </property>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>group-two</groupId>
+                        <artifactId>artifact-two</artifactId>
+                        <version>version-two</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
+    </profiles>
+</project>
+"""
+        PomReader parentPomReader = createPomReader('parent-pom.xml', parentPom)
+        pomFile << """
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>group-one</groupId>
+    <artifactId>artifact-one</artifactId>
+    <version>version-one</version>
+
+    <parent>
+        <groupId>group-two</groupId>
+        <artifactId>artifact-two</artifactId>
+        <version>version-two</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>group-four</groupId>
+            <artifactId>artifact-four</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>group-five</groupId>
+            <artifactId>artifact-five</artifactId>
+        </dependency>
+    </dependencies>
+</project>
+"""
+        pomReader = new PomReader(locallyAvailableExternalResource)
+        pomReader.setPomParent(parentPomReader)
+        MavenDependencyKey keyGroupTwo = new MavenDependencyKey('group-two', 'artifact-two', 'jar', null)
+        MavenDependencyKey keyGroupThree = new MavenDependencyKey('group-two', 'artifact-three', 'jar', null)
+
+        then:
+        pomReader.getDependencyMgt().size() == 1
+        assertResolvedPomDependencyManagement(keyGroupTwo, 'version-two')
+        pomReader.findDependencyDefaults(keyGroupTwo) == pomReader.dependencyMgt[keyGroupTwo]
+        !pomReader.findDependencyDefaults(keyGroupThree)
+    }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStoreTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStoreTest.groovy
index 2ed8810acf12..1bfe74590314 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStoreTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/modulecache/ModuleDescriptorStoreTest.groovy
@@ -18,12 +18,12 @@ package org.gradle.api.internal.artifacts.ivyservice.modulecache
 
 import org.apache.ivy.core.module.descriptor.ModuleDescriptor
 import org.apache.ivy.core.module.id.ModuleRevisionId
-import org.gradle.api.artifacts.ModuleVersionIdentifier
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.DependencyToModuleVersionResolver
 import org.gradle.api.internal.artifacts.ivyservice.IvyModuleDescriptorWriter
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleVersionRepository
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ModuleComponentRepository
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.IvyXmlModuleDescriptorParser
-import org.gradle.api.internal.filestore.PathKeyFileStore
+import org.gradle.internal.resource.local.PathKeyFileStore
 import org.gradle.internal.resource.local.LocallyAvailableResource
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
@@ -35,20 +35,20 @@ class ModuleDescriptorStoreTest extends Specification {
     ModuleDescriptorStore store
     PathKeyFileStore pathKeyFileStore = Mock()
     ModuleRevisionId moduleRevisionId = Mock()
-    ModuleVersionRepository repository = Mock()
+    ModuleComponentRepository repository = Mock()
     LocallyAvailableResource fileStoreEntry = Mock()
     ModuleDescriptor moduleDescriptor = Mock()
     IvyModuleDescriptorWriter ivyModuleDescriptorWriter = Mock()
     IvyXmlModuleDescriptorParser ivyXmlModuleDescriptorParser = Mock()
-    ModuleVersionIdentifier moduleVersionIdentifier = Mock()
+    ModuleComponentIdentifier moduleComponentIdentifier = Mock()
     def resolver = Mock(DependencyToModuleVersionResolver)
 
     def setup() {
         store = new ModuleDescriptorStore(pathKeyFileStore, ivyModuleDescriptorWriter, ivyXmlModuleDescriptorParser);
         _ * repository.getId() >> "repositoryId"
-        _ * moduleVersionIdentifier.group >> "org.test"
-        _ * moduleVersionIdentifier.name >> "testArtifact"
-        _ * moduleVersionIdentifier.version >> "1.0"
+        _ * moduleComponentIdentifier.group >> "org.test"
+        _ * moduleComponentIdentifier.module >> "testArtifact"
+        _ * moduleComponentIdentifier.version >> "1.0"
         _ * moduleDescriptor.getModuleRevisionId() >> moduleRevisionId
     }
 
@@ -56,12 +56,12 @@ class ModuleDescriptorStoreTest extends Specification {
         when:
         pathKeyFileStore.get("org.test/testArtifact/1.0/repositoryId/ivy.xml") >> null
         then:
-        null == store.getModuleDescriptor(repository, moduleVersionIdentifier)
+        null == store.getModuleDescriptor(repository, moduleComponentIdentifier)
     }
 
     def "getModuleDescriptorFile uses PathKeyFileStore to get file"() {
         when:
-        store.getModuleDescriptor(repository, moduleVersionIdentifier);
+        store.getModuleDescriptor(repository, moduleComponentIdentifier);
         then:
         1 * pathKeyFileStore.get("org.test/testArtifact/1.0/repositoryId/ivy.xml") >> null
     }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactoryTest.java b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactoryTest.java
deleted file mode 100644
index 9a812398a749..000000000000
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/ClientModuleIvyDependencyDescriptorFactoryTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
-
-import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.gradle.api.artifacts.ClientModule;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.artifacts.ProjectDependency;
-import org.gradle.api.internal.artifacts.dependencies.DefaultClientModule;
-import org.gradle.api.internal.artifacts.ivyservice.IvyUtil;
-import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-import org.gradle.util.WrapUtil;
-import org.hamcrest.Matchers;
-import org.jmock.Expectations;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.*;
-
-public class ClientModuleIvyDependencyDescriptorFactoryTest extends AbstractDependencyDescriptorFactoryInternalTest {
-    private JUnit4Mockery context = new JUnit4Mockery();
-
-    private ClientModuleMetaDataFactory clientModuleMetaDataFactory = context.mock(ClientModuleMetaDataFactory.class);
-    private ClientModuleIvyDependencyDescriptorFactory clientModuleDependencyDescriptorFactory = new ClientModuleIvyDependencyDescriptorFactory(
-            excludeRuleConverterStub,
-            clientModuleMetaDataFactory
-    );
-
-    @Test
-    public void canConvert() {
-        assertThat(clientModuleDependencyDescriptorFactory.canConvert(context.mock(ProjectDependency.class)), Matchers.equalTo(false));
-        assertThat(clientModuleDependencyDescriptorFactory.canConvert(context.mock(ClientModule.class)), Matchers.equalTo(true));
-    }
-
-    @Test
-    public void testAddDependencyDescriptorForClientModule() {
-        final ModuleDependency dependencyDependency = context.mock(ModuleDependency.class, "dependencyDependency");
-        final DefaultClientModule clientModule = new DefaultClientModule("org.gradle", "gradle-core", "1.0", TEST_DEP_CONF);
-        final ModuleRevisionId testModuleRevisionId = IvyUtil.createModuleRevisionId(clientModule);
-
-        setUpDependency(clientModule);
-        clientModule.addDependency(dependencyDependency);
-        final MutableModuleVersionMetaData moduleVersionMetaData = context.mock(MutableModuleVersionMetaData.class);
-        context.checking(new Expectations() {{
-            allowing(clientModuleMetaDataFactory).createModuleDescriptor(
-                    testModuleRevisionId,
-                    WrapUtil.toSet(dependencyDependency)
-            );
-            will(returnValue(moduleVersionMetaData));
-        }});
-
-        DefaultDependencyDescriptor dependencyDescriptor = clientModuleDependencyDescriptorFactory.createDependencyDescriptor(TEST_CONF, clientModule, moduleDescriptor);
-        assertDependencyDescriptorHasCommonFixtureValues(dependencyDescriptor);
-        assertEquals(testModuleRevisionId, dependencyDescriptor.getDependencyRevisionId());
-        assertFalse(dependencyDescriptor.isChanging());
-    }
-
-    @Test
-    public void testAddWithNullGroupAndNullVersionShouldHaveEmptyStringModuleRevisionValues() {
-        final ClientModule clientModule = new DefaultClientModule(null, "gradle-core", null, TEST_DEP_CONF);
-        final ModuleRevisionId testModuleRevisionId = IvyUtil.createModuleRevisionId(clientModule);
-        final MutableModuleVersionMetaData moduleVersionMetaData = context.mock(MutableModuleVersionMetaData.class);
-        context.checking(new Expectations() {{
-            allowing(clientModuleMetaDataFactory).createModuleDescriptor(
-                    testModuleRevisionId,
-                    WrapUtil.<ModuleDependency>toSet()
-            );
-            will(returnValue(moduleVersionMetaData));
-        }});
-
-        DefaultDependencyDescriptor dependencyDescriptor = clientModuleDependencyDescriptorFactory.createDependencyDescriptor(TEST_CONF, clientModule, moduleDescriptor);
-        assertThat(dependencyDescriptor.getDependencyRevisionId(), equalTo(testModuleRevisionId));
-    }
-}
\ No newline at end of file
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactoryTest.java b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactoryTest.java
deleted file mode 100644
index bacaee716a87..000000000000
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultClientModuleMetaDataFactoryTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
-
-import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
-import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
-import org.apache.ivy.core.module.descriptor.ModuleDescriptor;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.internal.artifacts.ivyservice.IvyUtil;
-import org.gradle.api.internal.artifacts.metadata.MutableModuleVersionMetaData;
-import org.gradle.util.WrapUtil;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-public class DefaultClientModuleMetaDataFactoryTest {
-    private JUnit4Mockery context = new JUnit4Mockery();
-
-    @Test
-    public void testCreateModuleDescriptor() {
-        DependencyDescriptor dependencyDescriptorDummy = context.mock(DependencyDescriptor.class);
-        DependencyDescriptorFactorySpy dependencyDescriptorFactorySpy = new DependencyDescriptorFactorySpy(dependencyDescriptorDummy);
-        DefaultClientModuleMetaDataFactory clientModuleDescriptorFactory =
-                new DefaultClientModuleMetaDataFactory();
-        clientModuleDescriptorFactory.setDependencyDescriptorFactory(dependencyDescriptorFactorySpy);
-        ModuleDependency dependencyMock = context.mock(ModuleDependency.class);
-        final ModuleRevisionId moduleRevisionId = IvyUtil.createModuleRevisionId("org", "name", "version");
-
-        MutableModuleVersionMetaData metaData = clientModuleDescriptorFactory.createModuleDescriptor(
-                moduleRevisionId,
-                WrapUtil.toSet(dependencyMock));
-
-        ModuleDescriptor moduleDescriptor = metaData.getDescriptor();
-        assertThat(moduleDescriptor.getModuleRevisionId(), equalTo(moduleRevisionId));
-        assertThatDescriptorHasOnlyDefaultConfiguration(moduleDescriptor);
-        assertCorrectCallToDependencyDescriptorFactory(dependencyDescriptorFactorySpy, Dependency.DEFAULT_CONFIGURATION, moduleDescriptor, dependencyMock);
-    }
-
-    private void assertThatDescriptorHasOnlyDefaultConfiguration(ModuleDescriptor moduleDescriptor) {
-        assertThat(moduleDescriptor.getConfigurations().length, equalTo(1));
-        assertThat(moduleDescriptor.getConfigurationsNames()[0], equalTo(Dependency.DEFAULT_CONFIGURATION));
-    }
-
-    private void assertCorrectCallToDependencyDescriptorFactory(DependencyDescriptorFactorySpy dependencyDescriptorFactorySpy,
-                                                                String configuration,
-                                                                ModuleDescriptor parent,
-                                                                Dependency dependency) {
-        assertThat(dependencyDescriptorFactorySpy.configuration, equalTo(configuration));
-        assertThat(dependencyDescriptorFactorySpy.parent, equalTo(parent));
-        assertThat(dependencyDescriptorFactorySpy.dependency, equalTo(dependency));
-    }
-
-    private static class DependencyDescriptorFactorySpy implements DependencyDescriptorFactory {
-        DependencyDescriptor dependencyDescriptor;
-
-        String configuration;
-        ModuleDescriptor parent;
-        Dependency dependency;
-
-        private DependencyDescriptorFactorySpy(DependencyDescriptor dependencyDescriptor) {
-            this.dependencyDescriptor = dependencyDescriptor;
-        }
-
-        public void addDependencyDescriptor(String configuration, DefaultModuleDescriptor moduleDescriptor,
-                                            ModuleDependency dependency) {
-            this.configuration = configuration;
-            this.parent = moduleDescriptor;
-            this.dependency = dependency;
-        }
-
-    }
-}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverterTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverterTest.groovy
new file mode 100644
index 000000000000..37d1508e63a3
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverterTest.groovy
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies
+import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor
+import org.apache.ivy.core.module.descriptor.DependencyDescriptor
+import org.gradle.api.artifacts.Configuration
+import org.gradle.api.artifacts.DependencySet
+import org.gradle.api.artifacts.ExcludeRule
+import org.gradle.api.artifacts.ModuleDependency
+import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.ExcludeRuleConverter
+import spock.lang.Specification
+
+import static org.gradle.util.WrapUtil.toDomainObjectSet
+
+public class DefaultDependenciesToModuleDescriptorConverterTest extends Specification {
+
+    def dependencyDescriptorFactory = Mock(DependencyDescriptorFactory)
+    def excludeRuleConverter = Mock(ExcludeRuleConverter)
+    def converter = new DefaultDependenciesToModuleDescriptorConverter(dependencyDescriptorFactory, excludeRuleConverter)
+
+    def descriptor = Mock(DefaultModuleDescriptor)
+    def configuration = Mock(Configuration)
+    def dependencySet = Mock(DependencySet.class);
+
+    def "ignores configuration with no dependencies or exclude rules"() {
+        when:
+        converter.addDependencyDescriptors(descriptor, [configuration])
+
+        then:
+        1 * configuration.dependencies >> dependencySet
+        1 * dependencySet.withType(ModuleDependency) >> toDomainObjectSet(ModuleDependency)
+        1 * configuration.excludeRules >> ([] as Set)
+        0 * _
+    }
+
+    def "adds dependencies from configuration"() {
+        def dependencyDescriptor = Mock(DependencyDescriptor)
+        def dependency = Mock(ModuleDependency)
+
+        when:
+        converter.addDependencyDescriptors(descriptor, [configuration])
+
+        then:
+        1 * configuration.dependencies >> dependencySet
+        1 * dependencySet.withType(ModuleDependency) >> toDomainObjectSet(ModuleDependency, dependency)
+        1 * configuration.name >> "config"
+        1 * dependencyDescriptorFactory.createDependencyDescriptor("config", descriptor, dependency) >> dependencyDescriptor
+        1 * descriptor.addDependency(dependencyDescriptor)
+        1 * configuration.excludeRules >> ([] as Set)
+        0 * _
+    }
+
+    def "adds exclude rule from configuration"() {
+        def excludeRule = Mock(ExcludeRule)
+        def ivyExcludeRule = Mock(org.apache.ivy.core.module.descriptor.ExcludeRule)
+
+        when:
+        converter.addDependencyDescriptors(descriptor, [configuration])
+
+        then:
+        1 * configuration.dependencies >> dependencySet
+        1 * dependencySet.withType(ModuleDependency) >> toDomainObjectSet(ModuleDependency)
+
+        1 * configuration.excludeRules >> ([excludeRule] as Set)
+        1 * configuration.getName() >> "config"
+        1 * excludeRuleConverter.createExcludeRule("config", excludeRule) >> ivyExcludeRule
+        1 * descriptor.addExcludeRule(ivyExcludeRule)
+        0 * _
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverterTest.java b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverterTest.java
deleted file mode 100644
index 1ac36a0826c4..000000000000
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependenciesToModuleDescriptorConverterTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies;
-
-import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.DependencySet;
-import org.gradle.api.artifacts.ExcludeRule;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.internal.artifacts.DefaultExcludeRule;
-import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency;
-import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.ExcludeRuleConverter;
-import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.IvyConverterTestUtil;
-import org.gradle.util.TestUtil;
-import org.gradle.util.JUnit4GroovyMockery;
-import org.gradle.util.WrapUtil;
-import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collections;
-
-import static org.gradle.util.WrapUtil.*;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
-
-@RunWith(JMock.class)
-public class DefaultDependenciesToModuleDescriptorConverterTest {
-    private JUnit4Mockery context = new JUnit4GroovyMockery();
-
-    private static final ExcludeRule GRADLE_EXCLUDE_RULE_DUMMY_1 = new DefaultExcludeRule("testOrg", null);
-    private static final ExcludeRule GRADLE_EXCLUDE_RULE_DUMMY_2 = new DefaultExcludeRule(null, "testModule");
-
-    private ModuleDependency dependencyDummy1 = context.mock(ModuleDependency.class, "dep1");
-    private ModuleDependency dependencyDummy2 = context.mock(ModuleDependency.class, "dep2");
-    private ModuleDependency similarDependency1 = createDependency("group", "name", "version");
-    private ModuleDependency similarDependency2 = createDependency("group", "name", "version");
-    private ModuleDependency similarDependency3 = createDependency("group", "name", "version");
-    private org.apache.ivy.core.module.descriptor.ExcludeRule ivyExcludeRuleStub1 = context.mock(org.apache.ivy.core.module.descriptor.ExcludeRule.class, "rule1");
-    private org.apache.ivy.core.module.descriptor.ExcludeRule ivyExcludeRuleStub2 = context.mock(org.apache.ivy.core.module.descriptor.ExcludeRule.class, "rule2");
-
-    private DependencyDescriptorFactory dependencyDescriptorFactoryStub = context.mock(DependencyDescriptorFactory.class);
-    private ExcludeRuleConverter excludeRuleConverterStub = context.mock(ExcludeRuleConverter.class);
-
-    @Test
-    public void testAddDependencyDescriptors() {
-        DefaultDependenciesToModuleDescriptorConverter converter = new DefaultDependenciesToModuleDescriptorConverter(
-                dependencyDescriptorFactoryStub, excludeRuleConverterStub);
-        Configuration configurationStub1 = createNamedConfigurationStubWithDependenciesAndExcludeRules("conf1", GRADLE_EXCLUDE_RULE_DUMMY_1, dependencyDummy1, similarDependency1);
-        Configuration configurationStub2 = createNamedConfigurationStubWithDependenciesAndExcludeRules("conf2", GRADLE_EXCLUDE_RULE_DUMMY_2, dependencyDummy2, similarDependency2);
-        Configuration configurationStub3 = createNamedConfigurationStubWithDependenciesAndExcludeRules("conf3", null, similarDependency3);
-        final DefaultModuleDescriptor moduleDescriptor = TestUtil.createModuleDescriptor(toSet(configurationStub1.getName(),
-                configurationStub2.getName()));
-        associateDependencyWithDescriptor(dependencyDummy1, moduleDescriptor, configurationStub1);
-        associateDependencyWithDescriptor(dependencyDummy2, moduleDescriptor, configurationStub2);
-        associateDependencyWithDescriptor(similarDependency1, moduleDescriptor, configurationStub1);
-        associateDependencyWithDescriptor(similarDependency2, moduleDescriptor, configurationStub2);
-        associateDependencyWithDescriptor(similarDependency3, moduleDescriptor, configurationStub3);
-        associateGradleExcludeRuleWithIvyExcludeRule(GRADLE_EXCLUDE_RULE_DUMMY_1, ivyExcludeRuleStub1, configurationStub1);
-        associateGradleExcludeRuleWithIvyExcludeRule(GRADLE_EXCLUDE_RULE_DUMMY_2, ivyExcludeRuleStub2, configurationStub2);
-
-        converter.addDependencyDescriptors(moduleDescriptor, toSet(configurationStub1, configurationStub2, configurationStub3));
-
-        assertThat(moduleDescriptor.getExcludeRules(toArray(configurationStub1.getName())), equalTo(toArray(
-                ivyExcludeRuleStub1)));
-        assertThat(moduleDescriptor.getExcludeRules(toArray(configurationStub2.getName())), equalTo(toArray(
-                ivyExcludeRuleStub2)));
-
-    }
-
-    private void associateGradleExcludeRuleWithIvyExcludeRule(final ExcludeRule gradleExcludeRule,
-                                                              final org.apache.ivy.core.module.descriptor.ExcludeRule ivyExcludeRule,
-                                                              final Configuration configuration) {
-        final String expectedConfigurationName = configuration.getName();
-        context.checking(new Expectations() {{
-            allowing(excludeRuleConverterStub).createExcludeRule(expectedConfigurationName, gradleExcludeRule);
-            will(returnValue(ivyExcludeRule));
-
-            allowing(ivyExcludeRule).getConfigurations();
-            will(returnValue(WrapUtil.toArray(configuration.getName())));
-        }});
-    }
-
-    private void associateDependencyWithDescriptor(final ModuleDependency dependency, final DefaultModuleDescriptor parent,
-                                                   final Configuration configuration) {
-        context.checking(new Expectations() {{
-            allowing(dependencyDescriptorFactoryStub).addDependencyDescriptor(with(equal(configuration.getName())),
-                    with(equal(parent)), with(sameInstance(dependency)));
-        }});
-    }
-    
-    private Configuration createNamedConfigurationStubWithDependenciesAndExcludeRules(final String name, final ExcludeRule excludeRule,
-                                                                                      final ModuleDependency... dependencies) {
-        final Configuration configurationStub = IvyConverterTestUtil.createNamedConfigurationStub(name, context);
-        final DependencySet dependencySet = context.mock(DependencySet.class);
-
-        context.checking(new Expectations() {{
-            allowing(configurationStub).getDependencies();
-            will(returnValue(dependencySet));
-
-            allowing(dependencySet).withType(ModuleDependency.class);
-            will(returnValue(toDomainObjectSet(ModuleDependency.class, dependencies)));
-
-            allowing(configurationStub).getExcludeRules();
-            will(returnValue(excludeRule == null ? Collections.emptySet() : toSet(excludeRule)));
-        }});
-        return configurationStub;
-    }
-
-    ModuleDependency createDependency(String group, String name, String version) {
-        return new DefaultExternalModuleDependency(group, name, version);
-    }
-}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactoryTest.groovy
index 367df6628ea0..705a7e4244ec 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactoryTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/moduleconverter/dependencies/DefaultDependencyDescriptorFactoryTest.groovy
@@ -20,27 +20,30 @@ import org.gradle.api.artifacts.ProjectDependency
 import spock.lang.Specification
 
 public class DefaultDependencyDescriptorFactoryTest extends Specification {
-    def configurationName = "conf";
-    def moduleDescriptor = Mock(DefaultModuleDescriptor);
-    def projectDependency = Mock(ProjectDependency);
+    def configurationName = "conf"
+    def moduleDescriptor = Mock(DefaultModuleDescriptor)
+    def projectDependency = Mock(ProjectDependency)
     def dependencyDescriptor = Mock(EnhancedDependencyDescriptor)
 
     def "delegates to internal factory"() {
         given:
-        def ivyDependencyDescriptorFactory1 = Mock(IvyDependencyDescriptorFactory);
-        def ivyDependencyDescriptorFactory2 = Mock(IvyDependencyDescriptorFactory);
+        def ivyDependencyDescriptorFactory1 = Mock(IvyDependencyDescriptorFactory)
+        def ivyDependencyDescriptorFactory2 = Mock(IvyDependencyDescriptorFactory)
+
 
         when:
+        def dependencyDescriptorFactory = new DefaultDependencyDescriptorFactory(
+                ivyDependencyDescriptorFactory1, ivyDependencyDescriptorFactory2
+        );
+        def created = dependencyDescriptorFactory.createDependencyDescriptor(configurationName, moduleDescriptor, projectDependency)
+
+        then:
+        created == dependencyDescriptor
+
+        and:
         1 * ivyDependencyDescriptorFactory1.canConvert(projectDependency) >> false
         1 * ivyDependencyDescriptorFactory2.canConvert(projectDependency) >> true
         1 * ivyDependencyDescriptorFactory2.createDependencyDescriptor(configurationName, projectDependency, moduleDescriptor) >> dependencyDescriptor
-        1 * moduleDescriptor.addDependency(dependencyDescriptor)
-
-        then:
-        DefaultDependencyDescriptorFactory dependencyDescriptorFactory = new DefaultDependencyDescriptorFactory(
-                ivyDependencyDescriptorFactory1, ivyDependencyDescriptorFactory2
-        );
-        dependencyDescriptorFactory.addDependencyDescriptor(configurationName, moduleDescriptor, projectDependency);
     }
 
     def "fails where no internal factory can handle dependency type"() {
@@ -50,10 +53,10 @@ public class DefaultDependencyDescriptorFactoryTest extends Specification {
         ivyDependencyDescriptorFactory1.canConvert(projectDependency) >> false
 
         and:
-        DefaultDependencyDescriptorFactory dependencyDescriptorFactory = new DefaultDependencyDescriptorFactory(
+        def dependencyDescriptorFactory = new DefaultDependencyDescriptorFactory(
                 ivyDependencyDescriptorFactory1
         );
-        dependencyDescriptorFactory.addDependencyDescriptor(configurationName, moduleDescriptor, projectDependency);
+        dependencyDescriptorFactory.createDependencyDescriptor(configurationName, moduleDescriptor, projectDependency)
 
         then:
         thrown InvalidUserDataException
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicySpec.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicySpec.groovy
index 8a703689c774..2624244bb8c2 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicySpec.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolutionstrategy/DefaultCachePolicySpec.groovy
@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.ivyservice.resolutionstrategy;
-
+package org.gradle.api.internal.artifacts.ivyservice.resolutionstrategy
 
 import org.gradle.api.Action
 import org.gradle.api.artifacts.ModuleVersionIdentifier
@@ -24,7 +23,7 @@ import org.gradle.api.artifacts.cache.DependencyResolutionControl
 import org.gradle.api.artifacts.cache.ModuleResolutionControl
 import org.gradle.api.internal.artifacts.DefaultArtifactIdentifier
 import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
-import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
 import spock.lang.Specification
 
 import java.util.concurrent.TimeUnit
@@ -133,7 +132,7 @@ public class DefaultCachePolicySpec extends Specification {
                 t.refresh()
             }
         })
-        cachePolicy.mustRefreshModule(moduleIdentifier('g', 'n', 'v'), moduleVersion('group', 'name', 'version'), null, 0)
+        cachePolicy.mustRefreshModule(moduleComponent('g', 'n', 'v'), moduleVersion('group', 'name', 'version'), 0)
     }
 
     def "provides details of cached changing module"() {
@@ -146,7 +145,7 @@ public class DefaultCachePolicySpec extends Specification {
                 t.refresh()
             }
         })
-        cachePolicy.mustRefreshChangingModule(moduleIdentifier('g', 'n', 'v'), moduleVersion('group', 'name', 'version'), 0)
+        cachePolicy.mustRefreshChangingModule(moduleComponent('g', 'n', 'v'), moduleVersion('group', 'name', 'version'), 0)
     }
 
     def "provides details of cached artifact"() {
@@ -219,26 +218,29 @@ public class DefaultCachePolicySpec extends Specification {
     }
 
     private def hasChangingModuleTimeout(int timeout) {
+        def id = moduleComponent('group', 'name', 'version')
         def module = moduleVersion('group', 'name', 'version')
-        assert !cachePolicy.mustRefreshChangingModule(null, module, timeout - 1)
-        assert !cachePolicy.mustRefreshChangingModule(null, module, timeout);
-        cachePolicy.mustRefreshChangingModule(null, module, timeout + 1)
+        assert !cachePolicy.mustRefreshChangingModule(id, module, timeout - 1)
+        assert !cachePolicy.mustRefreshChangingModule(id, module, timeout);
+        cachePolicy.mustRefreshChangingModule(id, module, timeout + 1)
     }
 
     private def hasModuleTimeout(int timeout) {
+        def id = moduleComponent('group', 'name', 'version')
         def module = moduleVersion('group', 'name', 'version')
-        assert !cachePolicy.mustRefreshModule(null, module, null, timeout);
-        assert !cachePolicy.mustRefreshModule(null, module, null, timeout - 1)
+        assert !cachePolicy.mustRefreshModule(id, module, timeout);
+        assert !cachePolicy.mustRefreshModule(id, module, timeout - 1)
         if (timeout == FOREVER) {
             return true
         }
-        cachePolicy.mustRefreshModule(null, module, timeout + 1)
+        cachePolicy.mustRefreshModule(id, module, timeout + 1)
     }
 
     private def hasMissingModuleTimeout(int timeout) {
-        assert !cachePolicy.mustRefreshModule(null, null, null, timeout);
-        assert !cachePolicy.mustRefreshModule(null, null, null, timeout - 1)
-        cachePolicy.mustRefreshModule(null, null, null, timeout + 1)
+        def id = moduleComponent('group', 'name', 'version')
+        assert !cachePolicy.mustRefreshModule(id, null, timeout);
+        assert !cachePolicy.mustRefreshModule(id, null, timeout - 1)
+        cachePolicy.mustRefreshModule(id, null, timeout + 1)
     }
 
     private def hasChangingArtifactTimeout(int timeout){
@@ -257,8 +259,8 @@ public class DefaultCachePolicySpec extends Specification {
         assert moduleId.version == version
     }
 
-    private def moduleSelector(String group, String name, String version) {
-        new DefaultModuleVersionSelector(group, name, version)
+    private def moduleComponent(String group, String name, String version) {
+        new DefaultModuleComponentIdentifier(group, name, version)
     }
 
     private def moduleIdentifier(String group, String name, String version) {
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy
index c9b42b84b725..a0e5b126f14c 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy
@@ -26,13 +26,14 @@ import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentif
 import org.gradle.api.internal.artifacts.configurations.ConfigurationInternal
 import org.gradle.api.internal.artifacts.ivyservice.*
 import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.EnhancedDependencyDescriptor
+import org.gradle.api.internal.artifacts.ivyservice.resolveengine.graph.DependencyGraphBuilder
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.DefaultResolvedConfigurationBuilder
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.TransientConfigurationResultsBuilder
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.DummyBinaryStore
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.DummyStore
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.ResolutionResultBuilder
 import org.gradle.api.internal.artifacts.ivyservice.resolveengine.result.VersionSelectionReasons
-import org.gradle.api.internal.artifacts.metadata.ModuleDescriptorAdapter
+import org.gradle.api.internal.artifacts.metadata.DefaultIvyModuleVersionMetaData
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionMetaData
 import org.gradle.api.specs.Spec
 import spock.lang.Specification
@@ -58,7 +59,7 @@ class DependencyGraphBuilderTest extends Specification {
         _ * configuration.path >> 'root'
         _ * moduleResolver.resolve(_, _, _) >> { it[2].resolved(root) }
 
-        _ * artifactResolver.resolveModuleArtifacts(_, _, _,) >> { ModuleVersionMetaData module, ArtifactResolveContext context, BuildableArtifactSetResolveResult result ->
+        _ * artifactResolver.resolveModuleArtifacts(_, _, _,) >> { ModuleVersionMetaData module, ComponentUsage context, BuildableArtifactSetResolveResult result ->
             result.resolved(module.artifacts)
         }
     }
@@ -846,7 +847,7 @@ class DependencyGraphBuilderTest extends Specification {
 
     def revision(String name, String revision = '1.0') {
         DefaultModuleDescriptor descriptor = new DefaultModuleDescriptor(createModuleRevisionId("group", name, revision), "release", new Date())
-        ModuleVersionMetaData metaData = new ModuleDescriptorAdapter(descriptor)
+        ModuleVersionMetaData metaData = new DefaultIvyModuleVersionMetaData(descriptor)
         config(metaData, 'default')
         descriptor.addArtifact('default', new DefaultArtifact(descriptor.moduleRevisionId, new Date(), "art1", "art", "zip"))
         return metaData
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapterTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleVersionMetaDataTest.groovy
similarity index 81%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapterTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleVersionMetaDataTest.groovy
index de16c666a04d..b36755f6beae 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/ModuleDescriptorAdapterTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/AbstractModuleVersionMetaDataTest.groovy
@@ -14,21 +14,25 @@
  * limitations under the License.
  */
 
-
-
 package org.gradle.api.internal.artifacts.metadata
-
 import org.apache.ivy.core.module.descriptor.*
 import org.gradle.api.artifacts.ModuleVersionIdentifier
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
-import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.IvyUtil
 import spock.lang.Specification
 
-class ModuleDescriptorAdapterTest extends Specification {
+abstract class AbstractModuleVersionMetaDataTest extends Specification {
+
     def id = Stub(ModuleVersionIdentifier)
+    def componentId = Stub(ModuleComponentIdentifier)
     def moduleDescriptor = Mock(ModuleDescriptor)
-    def metaData = new ModuleDescriptorAdapter(id, moduleDescriptor)
+    def metaData
+
+    def setup() {
+        metaData = createMetaData(id, moduleDescriptor, componentId)
+    }
+
+    abstract AbstractModuleVersionMetaData createMetaData(ModuleVersionIdentifier id, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier);
 
     def "has useful string representation"() {
         given:
@@ -132,7 +136,9 @@ class ModuleDescriptorAdapterTest extends Specification {
         def artifact2 = artifact("two")
 
         given:
-        moduleDescriptor.getAllArtifacts() >> ([artifact1, artifact2] as Artifact[])
+        moduleDescriptor.allArtifacts >> ([artifact1, artifact2] as Artifact[])
+        moduleDescriptor.configurationsNames >> ["conf1"]
+        moduleDescriptor.getArtifacts("conf1") >> ([artifact1, artifact2] as Artifact[])
 
         when:
         def artifacts = metaData.artifacts
@@ -159,9 +165,10 @@ class ModuleDescriptorAdapterTest extends Specification {
         def config = Stub(Configuration)
 
         given:
-        moduleDescriptor.getConfiguration("conf") >> config
         moduleDescriptor.allArtifacts >> ([artifact1, artifact2] as Artifact[])
+        moduleDescriptor.configurationsNames >> ["conf"]
         moduleDescriptor.getArtifacts("conf") >> ([artifact1, artifact2] as Artifact[])
+        moduleDescriptor.getConfiguration("conf") >> config
 
         when:
         def artifacts = metaData.getConfiguration("conf").artifacts
@@ -195,6 +202,7 @@ class ModuleDescriptorAdapterTest extends Specification {
         def artifact3 = artifact("three")
 
         given:
+        moduleDescriptor.configurationsNames >> ["conf", "super"]
         moduleDescriptor.getConfiguration("conf") >> config
         moduleDescriptor.getConfiguration("super") >> parent
         config.extends >> ["super"]
@@ -250,47 +258,4 @@ class ModuleDescriptorAdapterTest extends Specification {
         and:
         0 * moduleDescriptor._
     }
-
-    def "can make a copy"() {
-        def dependency1 = Stub(DependencyMetaData)
-        def dependency2 = Stub(DependencyMetaData)
-
-        given:
-        metaData.changing = true
-        metaData.metaDataOnly = true
-        metaData.dependencies = [dependency1, dependency2]
-        metaData.status = 'a'
-        metaData.statusScheme = ['a', 'b', 'c']
-
-        when:
-        def copy = metaData.copy()
-
-        then:
-        copy != metaData
-        copy.descriptor == moduleDescriptor
-        copy.changing
-        copy.metaDataOnly
-        copy.dependencies == [dependency1, dependency2]
-        copy.status == 'a'
-        copy.statusScheme == ['a', 'b', 'c']
-    }
-
-    def "creates ModuleComponentIdentifier as component ID if not provided in constructor"() {
-        when:
-        ModuleVersionIdentifier moduleVersionIdentifier = new DefaultModuleVersionIdentifier('group', 'name', 'version')
-        def metaData = new ModuleDescriptorAdapter(moduleVersionIdentifier, moduleDescriptor)
-
-        then:
-        metaData.componentId == new DefaultModuleComponentIdentifier('group', 'name', 'version')
-    }
-
-    def "uses component ID if provided in constructor"() {
-        when:
-        def moduleVersionIdentifier = new DefaultModuleVersionIdentifier('group', 'name', 'version')
-        def componentIdentifier = new DefaultModuleComponentIdentifier('group', 'override', '1.2')
-        def metaData = new ModuleDescriptorAdapter(moduleVersionIdentifier, moduleDescriptor, componentIdentifier)
-
-        then:
-        metaData.componentId == componentIdentifier
-    }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaDataTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaDataTest.groovy
index d181764defc9..da399a1713ff 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaDataTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultDependencyMetaDataTest.groovy
@@ -22,7 +22,9 @@ import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor
 import org.gradle.api.artifacts.component.ComponentSelector
 import org.gradle.api.artifacts.component.ModuleComponentSelector
 import org.gradle.api.artifacts.component.ProjectComponentSelector
+import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
 import org.gradle.api.internal.artifacts.DefaultModuleVersionSelector
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
 import org.gradle.api.internal.artifacts.dependencies.DefaultProjectDependency
 import org.gradle.api.internal.artifacts.ivyservice.IvyUtil
 import org.gradle.api.internal.artifacts.ivyservice.moduleconverter.dependencies.ProjectDependencyDescriptor
@@ -33,7 +35,7 @@ import spock.lang.Specification
 class DefaultDependencyMetaDataTest extends Specification {
     final requestedModuleId = IvyUtil.createModuleRevisionId("org", "module", "1.2+")
 
-    def "constructs selector from descriptor"() {
+    def "constructs meta-data from ivy descriptor"() {
         def descriptor = new DefaultDependencyDescriptor(requestedModuleId, false)
         def metaData = new DefaultDependencyMetaData(descriptor)
 
@@ -41,6 +43,24 @@ class DefaultDependencyMetaDataTest extends Specification {
         metaData.requested == DefaultModuleVersionSelector.newSelector("org", "module", "1.2+")
     }
 
+    def "constructs meta-data from component id"() {
+        def id = new DefaultModuleComponentIdentifier("org", "module", "1.1")
+        def metaData = new DefaultDependencyMetaData(id, false)
+
+        expect:
+        metaData.descriptor.dependencyRevisionId == IvyUtil.createModuleRevisionId("org", "module", "1.1")
+        metaData.requested == DefaultModuleVersionSelector.newSelector("org", "module", "1.1")
+    }
+
+    def "constructs meta-data from module version id"() {
+        def id = new DefaultModuleVersionIdentifier("org", "module", "1.1")
+        def metaData = new DefaultDependencyMetaData(id, false)
+
+        expect:
+        metaData.descriptor.dependencyRevisionId == IvyUtil.createModuleRevisionId("org", "module", "1.1")
+        metaData.requested == DefaultModuleVersionSelector.newSelector("org", "module", "1.1")
+    }
+
     def "creates a copy with new requested version"() {
         def descriptor = new DefaultDependencyDescriptor(requestedModuleId, false)
         def metaData = new DefaultDependencyMetaData(descriptor)
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyModuleVersionMetaDataTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyModuleVersionMetaDataTest.groovy
new file mode 100644
index 000000000000..7c6a5436958b
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultIvyModuleVersionMetaDataTest.groovy
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.metadata
+
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor
+import org.gradle.api.artifacts.ModuleVersionIdentifier
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
+
+class DefaultIvyModuleVersionMetaDataTest extends AbstractModuleVersionMetaDataTest {
+
+    @Override
+    AbstractModuleVersionMetaData createMetaData(ModuleVersionIdentifier id, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier) {
+        return new DefaultIvyModuleVersionMetaData(id, moduleDescriptor, componentId)
+    }
+
+    def "can make a copy"() {
+        def dependency1 = Stub(DependencyMetaData)
+        def dependency2 = Stub(DependencyMetaData)
+
+        given:
+        metaData.changing = true
+        metaData.dependencies = [dependency1, dependency2]
+        metaData.status = 'a'
+        metaData.statusScheme = ['a', 'b', 'c']
+
+        when:
+        def copy = metaData.copy()
+
+        then:
+        copy != metaData
+        copy.descriptor == moduleDescriptor
+        copy.changing
+        copy.dependencies == [dependency1, dependency2]
+        copy.status == 'a'
+        copy.statusScheme == ['a', 'b', 'c']
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultMavenModuleVersionMetaDataTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultMavenModuleVersionMetaDataTest.groovy
new file mode 100644
index 000000000000..788861871701
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/metadata/DefaultMavenModuleVersionMetaDataTest.groovy
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+
+package org.gradle.api.internal.artifacts.metadata
+
+import org.apache.ivy.core.module.descriptor.ModuleDescriptor
+import org.gradle.api.artifacts.ModuleVersionIdentifier
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier
+
+class DefaultMavenModuleVersionMetaDataTest extends AbstractModuleVersionMetaDataTest {
+
+    @Override
+    AbstractModuleVersionMetaData createMetaData(ModuleVersionIdentifier id, ModuleDescriptor moduleDescriptor, ModuleComponentIdentifier componentIdentifier) {
+        return new DefaultMavenModuleVersionMetaData(id, moduleDescriptor, componentId, "pom", false)
+    }
+
+    def "can make a copy"() {
+        def dependency1 = Stub(DependencyMetaData)
+        def dependency2 = Stub(DependencyMetaData)
+
+        given:
+        metaData.changing = true
+        metaData.dependencies = [dependency1, dependency2]
+        metaData.status = 'a'
+        metaData.statusScheme = ['a', 'b', 'c']
+
+        when:
+        def copy = metaData.copy()
+
+        then:
+        copy != metaData
+        copy.descriptor == moduleDescriptor
+        copy.changing
+        copy.dependencies == [dependency1, dependency2]
+        copy.status == 'a'
+        copy.statusScheme == ['a', 'b', 'c']
+        copy.packaging == "pom"
+        !copy.relocated
+    }
+
+    def "recognises pom packaging"() {
+        when:
+        def metaData = new DefaultMavenModuleVersionMetaData(id, moduleDescriptor, componentId, packaging, false)
+
+        then:
+        metaData.packaging == packaging
+        metaData.isPomPackaging() == isPom
+        metaData.isKnownJarPackaging() == isJar
+
+        where:
+        packaging      | isPom | isJar
+        "pom"          | true  | false
+        "jar"          | false | true
+        "war"          | false | false
+        "maven-plugin" | false | true
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactoryTest.groovy
index f1e72ddf85ca..444dbbfb6141 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactoryTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultBaseRepositoryFactoryTest.groovy
@@ -25,8 +25,9 @@ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.Resolver
 import org.gradle.api.internal.artifacts.mvnsettings.LocalMavenRepositoryLocator
 import org.gradle.api.internal.artifacts.repositories.legacy.LegacyDependencyResolverRepositoryFactory
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder
 import org.gradle.api.internal.file.FileResolver
+import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore
 import org.gradle.internal.reflect.DirectInstantiator
 import org.gradle.logging.ProgressLoggerFactory
 import spock.lang.Specification
@@ -40,11 +41,12 @@ class DefaultBaseRepositoryFactoryTest extends Specification {
     final LocallyAvailableResourceFinder locallyAvailableResourceFinder = Mock()
     final ProgressLoggerFactory progressLoggerFactory = Mock()
     final LegacyDependencyResolverRepositoryFactory legacyDependencyResolverRepositoryFactory = Mock()
+    final ArtifactIdentifierFileStore artifactIdentifierFileStore = Stub()
     final ResolverStrategy resolverStrategy = Mock()
 
     final DefaultBaseRepositoryFactory factory = new DefaultBaseRepositoryFactory(
             localMavenRepoLocator, fileResolver, new DirectInstantiator(), transportFactory, locallyAvailableResourceFinder,
-            legacyDependencyResolverRepositoryFactory, resolverStrategy
+            legacyDependencyResolverRepositoryFactory, resolverStrategy, artifactIdentifierFileStore
     )
 
     def testCreateResolverWithStringDescription() {
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepositoryTest.groovy
index d05e927ac9e4..3f7a8d04cc6a 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepositoryTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultFlatDirArtifactRepositoryTest.groovy
@@ -21,10 +21,11 @@ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.Resolver
 import org.gradle.api.internal.artifacts.repositories.resolver.IvyResolver
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder
+import org.gradle.internal.resource.transport.ExternalResourceRepository
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.api.internal.file.collections.SimpleFileCollection
+import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore
 import spock.lang.Specification
 
 class DefaultFlatDirArtifactRepositoryTest extends Specification {
@@ -34,9 +35,9 @@ class DefaultFlatDirArtifactRepositoryTest extends Specification {
     final RepositoryTransportFactory transportFactory = Mock()
     final LocallyAvailableResourceFinder<ArtifactRevisionId> locallyAvailableResourceFinder = Mock()
     final ResolverStrategy resolverStrategy = Stub()
+    final ArtifactIdentifierFileStore artifactIdentifierFileStore = Stub()
 
-    final DefaultFlatDirArtifactRepository repository = new DefaultFlatDirArtifactRepository(
-            fileResolver, transportFactory, locallyAvailableResourceFinder, resolverStrategy)
+    final DefaultFlatDirArtifactRepository repository = new DefaultFlatDirArtifactRepository(fileResolver, transportFactory, locallyAvailableResourceFinder, resolverStrategy, artifactIdentifierFileStore)
 
     def "creates a repository with multiple root directories"() {
         given:
@@ -53,15 +54,15 @@ class DefaultFlatDirArtifactRepositoryTest extends Specification {
         def repo = repository.createResolver()
 
         then:
-        1 * transportFactory.createFileTransport("repo-name") >> repositoryTransport
+        1 * transportFactory.createTransport("file", "repo-name", null) >> repositoryTransport
 
         and:
         repo instanceof IvyResolver
         def expectedPatterns = [
-                "$dir1.absolutePath/[artifact]-[revision](-[classifier]).[ext]",
-                "$dir1.absolutePath/[artifact](-[classifier]).[ext]",
-                "$dir2.absolutePath/[artifact]-[revision](-[classifier]).[ext]",
-                "$dir2.absolutePath/[artifact](-[classifier]).[ext]"
+                "${dir1.toURI()}/[artifact]-[revision](-[classifier]).[ext]",
+                "${dir1.toURI()}/[artifact](-[classifier]).[ext]",
+                "${dir2.toURI()}/[artifact]-[revision](-[classifier]).[ext]",
+                "${dir2.toURI()}/[artifact](-[classifier]).[ext]"
         ]
         repo.ivyPatterns == []
         repo.artifactPatterns == expectedPatterns
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepositoryTest.groovy
index 76ac7ce7979f..a618735f8abf 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepositoryTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultIvyArtifactRepositoryTest.groovy
@@ -21,9 +21,10 @@ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.Resolver
 import org.gradle.api.internal.artifacts.repositories.resolver.IvyResolver
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder
+import org.gradle.internal.resource.transport.ExternalResourceRepository
 import org.gradle.api.internal.file.FileResolver
+import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore
 import org.gradle.internal.reflect.DirectInstantiator
 import org.gradle.logging.ProgressLoggerFactory
 import spock.lang.Specification
@@ -36,10 +37,11 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
     final ExternalResourceRepository resourceRepository = Mock()
     final ProgressLoggerFactory progressLoggerFactory = Mock()
     final ResolverStrategy resolverStrategy = Stub()
+    final ArtifactIdentifierFileStore artifactIdentifierFileStore = Stub()
 
     final DefaultIvyArtifactRepository repository = new DefaultIvyArtifactRepository(
             fileResolver, credentials, transportFactory, locallyAvailableResourceFinder,
-            new DirectInstantiator(), resolverStrategy
+            new DirectInstantiator(), resolverStrategy, artifactIdentifierFileStore
     )
 
     def "default values"() {
@@ -48,38 +50,6 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
         !repository.resolve.dynamicMode
     }
 
-    def "cannot create a resolver for url with unknown scheme"() {
-        repository.name = 'name'
-        repository.artifactPattern 'pattern1'
-
-        given:
-        fileResolver.resolveUri('pattern1') >> new URI('scheme:resource1')
-
-        when:
-        repository.createResolver()
-
-        then:
-        InvalidUserDataException e = thrown()
-        e.message == "You may only specify 'file', 'http' and 'https' urls for an Ivy repository."
-    }
-
-    def "cannot creates a resolver for mixed url scheme"() {
-        repository.name = 'name'
-        repository.artifactPattern 'pattern1'
-        repository.artifactPattern 'pattern2'
-
-        given:
-        fileResolver.resolveUri('pattern1') >> new URI('http:resource1')
-        fileResolver.resolveUri('pattern2') >> new URI('file:resource2')
-
-        when:
-        repository.createResolver()
-
-        then:
-        InvalidUserDataException e = thrown()
-        e.message == "You cannot mix file and http(s) urls for a single Ivy repository. Please declare 2 separate repositories."
-    }
-
     def "creates a resolver for HTTP patterns"() {
         repository.name = 'name'
         repository.artifactPattern 'http://host/[organisation]/[artifact]-[revision].[ext]'
@@ -89,7 +59,8 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
         given:
         fileResolver.resolveUri('http://host/') >> new URI('http://host/')
         fileResolver.resolveUri('http://other/') >> new URI('http://other/')
-        transportFactory.createHttpTransport('name', credentials) >> transport()
+        transportFactory.createTransport({ it == ['http'] as Set}, 'name', credentials) >> transport()
+
 
         when:
         def resolver = repository.createResolver()
@@ -114,7 +85,7 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
 
         given:
         fileResolver.resolveUri('repo/') >> fileUri
-        transportFactory.createFileTransport('name') >> transport()
+        transportFactory.createTransport({ it == ['file'] as Set}, 'name', credentials) >> transport()
 
         when:
         def resolver = repository.createResolver()
@@ -137,7 +108,7 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
 
         given:
         fileResolver.resolveUri('repo/') >> fileUri
-        transportFactory.createFileTransport('name') >> transport()
+        transportFactory.createTransport({ it == ['file'] as Set}, 'name', credentials) >> transport()
 
         when:
         def wrapper = repository.createLegacyDslObject()
@@ -155,13 +126,35 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
         repo.is(wrapper.resolver)
     }
 
+    def "uses ivy patterns with specified url and default layout"() {
+        repository.name = 'name'
+        repository.url = 'http://host'
+        repository.layout 'ivy'
+
+        given:
+        fileResolver.resolveUri('http://host') >> new URI('http://host/')
+        transportFactory.createTransport({ it == ['http'] as Set}, 'name', credentials) >> transport()
+
+        when:
+        def resolver = repository.createResolver()
+
+        then:
+        with(resolver) {
+            it instanceof IvyResolver
+            repository instanceof ExternalResourceRepository
+            name == 'name'
+            artifactPatterns == ['http://host/[organisation]/[module]/[revision]/[type]s/[artifact](.[ext])']
+            ivyPatterns == ["http://host/[organisation]/[module]/[revision]/[type]s/[artifact](.[ext])"]
+        }
+    }
+
     def "uses gradle patterns with specified url and default layout"() {
         repository.name = 'name'
         repository.url = 'http://host'
 
         given:
         fileResolver.resolveUri('http://host') >> new URI('http://host/')
-        transportFactory.createHttpTransport('name', credentials) >> transport()
+        transportFactory.createTransport({ it == ['http'] as Set}, 'name', credentials) >> transport()
 
         when:
         def resolver = repository.createResolver()
@@ -183,7 +176,7 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
 
         given:
         fileResolver.resolveUri('http://host') >> new URI('http://host/')
-        transportFactory.createHttpTransport('name', credentials) >> transport()
+        transportFactory.createTransport({ it == ['http'] as Set}, 'name', credentials) >> transport()
 
         when:
         def resolver = repository.createResolver()
@@ -209,7 +202,7 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
 
         given:
         fileResolver.resolveUri('http://host') >> new URI('http://host/')
-        transportFactory.createHttpTransport('name', credentials) >> transport()
+        transportFactory.createTransport({ it == ['http'] as Set}, 'name', credentials) >> transport()
 
         when:
         def resolver = repository.createResolver()
@@ -236,7 +229,7 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
 
         given:
         fileResolver.resolveUri('http://host') >> new URI('http://host/')
-        transportFactory.createHttpTransport('name', credentials) >> transport()
+        transportFactory.createTransport({ it == ['http'] as Set}, 'name', credentials) >> transport()
 
         when:
         def resolver = repository.createResolver()
@@ -260,7 +253,7 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
 
         given:
         fileResolver.resolveUri('http://host/') >> new URI('http://host/')
-        transportFactory.createHttpTransport('name', credentials) >> transport()
+        transportFactory.createTransport({ it == ['http'] as Set}, 'name', credentials) >> transport()
 
         when:
         def resolver = repository.createResolver()
@@ -282,7 +275,7 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
             artifact '[layoutPattern]'
         }
         repository.artifactPattern 'http://other/[additionalPattern]'
-        transportFactory.createHttpTransport('name', credentials) >> transport()
+        transportFactory.createTransport({ it == ['http'] as Set}, 'name', credentials) >> transport()
 
         given:
         fileResolver.resolveUri('http://host') >> new URI('http://host')
@@ -311,10 +304,6 @@ class DefaultIvyArtifactRepositoryTest extends Specification {
     private RepositoryTransport transport() {
         return Mock(RepositoryTransport) {
             getRepository() >> resourceRepository
-            convertToPath(_) >> { URI uri ->
-                def result = uri.toString()
-                return result.endsWith('/') ? result : result + '/'
-            }
         }
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepositoryTest.groovy
index 62d9fcbc2200..b77557ee7c08 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepositoryTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenArtifactRepositoryTest.groovy
@@ -21,9 +21,10 @@ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.Resolver
 import org.gradle.api.internal.artifacts.repositories.resolver.MavenResolver
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder
+import org.gradle.internal.resource.transport.ExternalResourceRepository
 import org.gradle.api.internal.file.FileResolver
+import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore
 import spock.lang.Specification
 
 class DefaultMavenArtifactRepositoryTest extends Specification {
@@ -33,16 +34,17 @@ class DefaultMavenArtifactRepositoryTest extends Specification {
     final LocallyAvailableResourceFinder locallyAvailableResourceFinder = Mock()
     final ExternalResourceRepository resourceRepository = Mock()
     final ResolverStrategy resolverStrategy = Stub()
+    final ArtifactIdentifierFileStore artifactIdentifierFileStore = Stub()
 
     final DefaultMavenArtifactRepository repository = new DefaultMavenArtifactRepository(
-            resolver, credentials, transportFactory, locallyAvailableResourceFinder, resolverStrategy)
+            resolver, credentials, transportFactory, locallyAvailableResourceFinder, resolverStrategy, artifactIdentifierFileStore)
 
     def "creates local repository"() {
         given:
         def file = new File('repo')
         def uri = file.toURI()
         _ * resolver.resolveUri('repo-dir') >> uri
-        transportFactory.createFileTransport('repo') >> transport()
+        transportFactory.createTransport('file', 'repo', credentials) >> transport()
 
         and:
         repository.name = 'repo'
@@ -53,7 +55,7 @@ class DefaultMavenArtifactRepositoryTest extends Specification {
 
         then:
         repo instanceof MavenResolver
-        repo.root == "${uri}/"
+        repo.root == uri.toString()
     }
 
     def "creates http repository"() {
@@ -62,7 +64,7 @@ class DefaultMavenArtifactRepositoryTest extends Specification {
         _ * resolver.resolveUri('repo-dir') >> uri
         _ * credentials.getUsername() >> 'username'
         _ * credentials.getPassword() >> 'password'
-        transportFactory.createHttpTransport('repo', credentials) >> transport()
+        transportFactory.createTransport('http', 'repo', credentials) >> transport()
 
         and:
         repository.name = 'repo'
@@ -73,7 +75,7 @@ class DefaultMavenArtifactRepositoryTest extends Specification {
 
         then:
         repo instanceof MavenResolver
-        repo.root == "${uri}/"
+        repo.root == uri.toString()
     }
 
     def "creates a DSL wrapper for the repository"() {
@@ -81,7 +83,7 @@ class DefaultMavenArtifactRepositoryTest extends Specification {
         def file = new File('repo')
         def uri = file.toURI()
         _ * this.resolver.resolveUri('repo-dir') >> uri
-        transportFactory.createFileTransport('repo') >> transport()
+        transportFactory.createTransport('file', 'repo', credentials) >> transport()
 
         and:
         repository.name = 'repo'
@@ -109,7 +111,7 @@ class DefaultMavenArtifactRepositoryTest extends Specification {
         _ * resolver.resolveUri('repo-dir') >> uri
         _ * resolver.resolveUri('repo1') >> uri1
         _ * resolver.resolveUri('repo2') >> uri2
-        transportFactory.createHttpTransport('repo', credentials) >> transport()
+        transportFactory.createTransport('http', 'repo', credentials) >> transport()
 
         and:
         repository.name = 'repo'
@@ -121,7 +123,7 @@ class DefaultMavenArtifactRepositoryTest extends Specification {
 
         then:
         repo instanceof MavenResolver
-        repo.root == "${uri}/"
+        repo.root == uri.toString()
         repo.artifactPatterns.size() == 3
         repo.artifactPatterns.any { it.startsWith uri.toString() }
         repo.artifactPatterns.any { it.startsWith uri1.toString() }
@@ -140,10 +142,6 @@ class DefaultMavenArtifactRepositoryTest extends Specification {
     private RepositoryTransport transport() {
         return Mock(RepositoryTransport) {
             getRepository() >> resourceRepository
-            convertToPath(_) >> { URI uri ->
-                def result = uri.toString()
-                return result.endsWith('/') ? result : result + '/'
-            }
         }
     }
 
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalRepositoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalRepositoryTest.groovy
index 65e0f55e9031..358c6ebcb24d 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalRepositoryTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/DefaultMavenLocalRepositoryTest.groovy
@@ -20,9 +20,10 @@ import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.Resolver
 import org.gradle.api.internal.artifacts.repositories.resolver.MavenLocalResolver
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransportFactory
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder
+import org.gradle.internal.resource.transport.ExternalResourceRepository
 import org.gradle.api.internal.file.FileResolver
+import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore
 import org.gradle.logging.ProgressLoggerFactory
 import spock.lang.Specification
 
@@ -33,9 +34,10 @@ class DefaultMavenLocalRepositoryTest extends Specification {
     final LocallyAvailableResourceFinder locallyAvailableResourceFinder = Mock()
     final ExternalResourceRepository resourceRepository = Mock()
     final ResolverStrategy resolverStrategy = Stub()
+    final ArtifactIdentifierFileStore artifactIdentifierFileStore = Stub()
 
     final DefaultMavenArtifactRepository repository = new DefaultMavenLocalArtifactRepository(
-            resolver, credentials, transportFactory, locallyAvailableResourceFinder, resolverStrategy)
+            resolver, credentials, transportFactory, locallyAvailableResourceFinder, resolverStrategy, artifactIdentifierFileStore)
     final ProgressLoggerFactory progressLoggerFactory = Mock()
 
     def "creates local repository"() {
@@ -43,7 +45,7 @@ class DefaultMavenLocalRepositoryTest extends Specification {
         def file = new File('repo')
         def uri = file.toURI()
         _ * resolver.resolveUri('repo-dir') >> uri
-        transportFactory.createFileTransport('repo') >> transport()
+        transportFactory.createTransport('file', 'repo', credentials) >> transport()
 
         and:
         repository.name = 'repo'
@@ -54,16 +56,12 @@ class DefaultMavenLocalRepositoryTest extends Specification {
 
         then:
         repo instanceof MavenLocalResolver
-        repo.root == "${uri}/"
+        repo.root == uri.toString()
     }
 
     private RepositoryTransport transport() {
         return Mock(RepositoryTransport) {
             getRepository() >> resourceRepository
-            convertToPath(_) >> { URI uri ->
-                def result = uri.toString()
-                return result.endsWith('/') ? result : result + '/'
-            }
         }
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManagerTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManagerTest.groovy
index 5bee2fa4f448..1884613c3e49 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManagerTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/legacy/DownloadingRepositoryCacheManagerTest.groovy
@@ -18,13 +18,13 @@ package org.gradle.api.internal.artifacts.repositories.legacy
 import org.apache.ivy.core.module.descriptor.Artifact
 import org.apache.ivy.plugins.repository.Resource
 import org.apache.ivy.plugins.repository.ResourceDownloader
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager
 import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactIdentifier
 import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactMetaData
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
 import org.gradle.api.internal.file.TemporaryFileProvider
-import org.gradle.internal.filestore.FileStore
+import org.gradle.internal.resource.local.FileStore
 import org.gradle.internal.resource.local.LocallyAvailableResource
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
@@ -34,7 +34,7 @@ class DownloadingRepositoryCacheManagerTest extends Specification {
     FileStore<ModuleVersionArtifactMetaData> fileStore = Mock()
     CacheLockingManager lockingManager = Mock()
     TemporaryFileProvider tmpFileProvider = Mock()
-    ModuleVersionArtifactMetaData artifactMetaData = new DefaultModuleVersionArtifactMetaData(new DefaultModuleVersionArtifactIdentifier(DefaultModuleVersionIdentifier.newId("group", "module", "version"), "name", "type", "ext"))
+    ModuleVersionArtifactMetaData artifactMetaData = new DefaultModuleVersionArtifactMetaData(new DefaultModuleVersionArtifactIdentifier(DefaultModuleComponentIdentifier.newId("group", "module", "version"), "name", "type", "ext"))
     Artifact artifact = Mock()
     ResourceDownloader resourceDownloader = Mock()
     Resource resource = Mock();
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionListerTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionListerTest.groovy
index 8be66c707511..baa51b12f1ee 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionListerTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ChainedVersionListerTest.groovy
@@ -17,9 +17,9 @@
 package org.gradle.api.internal.artifacts.repositories.resolver
 
 import org.gradle.api.artifacts.ModuleIdentifier
-import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
-import org.gradle.api.internal.resource.ResourceException
-import org.gradle.api.internal.resource.ResourceNotFoundException
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName
+import org.gradle.internal.resource.ResourceException
+import org.gradle.internal.resource.ResourceNotFoundException
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -33,7 +33,7 @@ class ChainedVersionListerTest extends Specification {
 
     ResourcePattern pattern = Mock()
     ModuleIdentifier module = Mock()
-    ModuleVersionArtifactMetaData artifact = Mock()
+    IvyArtifactName artifact = Mock()
 
     def chainedVersionLister = new ChainedVersionLister(lister1, lister2)
 
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverTest.groovy
index 2345e2892391..42fb4a790105 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ExternalResourceResolverTest.groovy
@@ -15,16 +15,16 @@
  */
 
 package org.gradle.api.internal.artifacts.repositories.resolver
-
 import org.gradle.api.artifacts.ArtifactIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.BuildableArtifactResolveResult
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ArtifactResolveException
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder
+import org.gradle.internal.resource.transfer.CacheAwareExternalResourceAccessor
+import org.gradle.internal.resource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.local.FileStore
 import spock.lang.Specification
 
 class ExternalResourceResolverTest extends Specification {
@@ -33,7 +33,6 @@ class ExternalResourceResolverTest extends Specification {
     VersionLister versionLister = Mock()
     LocallyAvailableResourceFinder<ArtifactIdentifier> locallyAvailableResourceFinder = Mock()
     BuildableArtifactResolveResult result = Mock()
-    MetaDataParser parser = Mock()
     final ResolverStrategy resolverStrategy = Mock()
     ModuleVersionArtifactIdentifier artifactIdentifier = Stub() {
         getDisplayName() >> 'some-artifact'
@@ -41,13 +40,15 @@ class ExternalResourceResolverTest extends Specification {
     ModuleVersionArtifactMetaData artifact = Stub() {
         getId() >> artifactIdentifier
     }
-    MavenResolver.TimestampedModuleSource moduleSource = Mock()
+    MavenUniqueSnapshotModuleSource moduleSource = Mock()
     File downloadedFile = Mock(File)
+    CacheAwareExternalResourceAccessor resourceAccessor = Stub()
+    FileStore<ModuleVersionArtifactMetaData> fileStore = Stub()
     ExternalResourceResolver resolver
 
     def setup() {
         //We use a spy here to avoid dealing with all the overhead ivys basicresolver brings in here.
-        resolver = Spy(ExternalResourceResolver, constructorArgs: [name, repository, versionLister, locallyAvailableResourceFinder, parser, resolverStrategy])
+        resolver = Spy(ExternalResourceResolver, constructorArgs: [name, true, repository, resourceAccessor, versionLister, locallyAvailableResourceFinder, resolverStrategy, fileStore])
     }
 
     def reportsNotFoundArtifactResolveResult() {
@@ -103,7 +104,7 @@ class ExternalResourceResolverTest extends Specification {
     }
 
     def artifactIsTimestampedSnapshotVersion() {
-        _ * moduleSource.timestampedVersion >> "1.0-20100101.120001-1"
+        _ * moduleSource.timestamp >> "1.0-20100101.120001-1"
     }
 
     def artifactIsMissing() {
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePatternTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePatternTest.groovy
index 7164801d5251..1ee8dc647c6b 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePatternTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/IvyResourcePatternTest.groovy
@@ -16,35 +16,74 @@
 
 package org.gradle.api.internal.artifacts.repositories.resolver
 
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
+import org.gradle.api.internal.artifacts.DefaultModuleIdentifier
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
+import org.gradle.api.internal.artifacts.metadata.DefaultIvyArtifactName
 import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactIdentifier
 import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactMetaData
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
 import spock.lang.Specification
 
 class IvyResourcePatternTest extends Specification {
+    def "can construct from URI and pattern"() {
+        expect:
+        new IvyResourcePattern(new URI(uri), pattern).pattern == expectedPattern
+
+        where:
+        uri                | pattern            | expectedPattern
+        "http://host/"     | "a/[revision]/c"   | "http://host/a/[revision]/c"
+        "http://host"      | "a/b/c"            | "http://host/a/b/c"
+        "http://host/"     | "/a/b/c"           | "http://host/a/b/c"
+        "http://host/"     | ""                 | "http://host/"
+        "http://host"      | ""                 | "http://host"
+        "http://host/"     | "/"                | "http://host/"
+        "http://host/repo" | "query?[revision]" | "http://host/repo/query?[revision]"
+    }
+
     def "substitutes artifact attributes into pattern"() {
         def pattern = new IvyResourcePattern("prefix/[organisation]-[module]/[revision]/[type]s/[revision]/[artifact].[ext]")
-        def artifact1 = artifact("group", "projectA", "1.2")
-        def artifact2 = artifact("org.group", "projectA", "1.2")
+        def artifact = artifact(group, module, version)
 
         expect:
-        pattern.toPath(artifact1) == 'prefix/group-projectA/1.2/ivys/1.2/ivy.xml'
-        pattern.toPath(artifact2) == 'prefix/org.group-projectA/1.2/ivys/1.2/ivy.xml'
+        pattern.getLocation(artifact).path == expectedPath
+
+        where:
+        group       | module     | version | expectedPath
+        "group"     | "projectA" | "1.2"   | 'prefix/group-projectA/1.2/ivys/1.2/ivy.xml'
+        "org.group" | "projectA" | "1.2"   | 'prefix/org.group-projectA/1.2/ivys/1.2/ivy.xml'
+        "##??::"    | "projectA" | "1.2"   | 'prefix/##??::-projectA/1.2/ivys/1.2/ivy.xml'
     }
 
-    def "substitutes artifact attributes without revision into pattern"() {
+    def "determines artifact location by substituting artifact attributes into pattern and resolving relative to base URI"() {
+        def pattern = new IvyResourcePattern(new URI('http://server/repo'), "lookup/[organisation]-[module]/[revision]/[type]s/[revision]/[artifact].[ext]")
+        def artifact = artifact(group, module, version)
+
+        expect:
+        pattern.getLocation(artifact).uri == new URI(expectedUri)
+
+        where:
+        group       | module     | version | expectedUri
+        "group"     | "projectA" | "1.2"   | 'http://server/repo/lookup/group-projectA/1.2/ivys/1.2/ivy.xml'
+        "org.group" | "projectA" | "1.2"   | 'http://server/repo/lookup/org.group-projectA/1.2/ivys/1.2/ivy.xml'
+        "#?: %12"   | "projectA" | "1.2"   | 'http://server/repo/lookup/%23%3F:%20%2512-projectA/1.2/ivys/1.2/ivy.xml'
+    }
+
+    def "substitutes attributes into pattern to determine version list pattern"() {
         def pattern = new IvyResourcePattern("prefix/[organisation]-[module]/[revision]/[type]s/[revision]/[artifact].[ext]")
-        def artifact1 = artifact("group", "projectA", "1.2")
-        def artifact2 = artifact("org.group", "projectA", "1.2")
+        def ivyName = new DefaultIvyArtifactName("ivy", "ivy", "xml")
+        def moduleId = new DefaultModuleIdentifier(group, module)
 
         expect:
-        pattern.toVersionListPattern(artifact1) == 'prefix/group-projectA/[revision]/ivys/[revision]/ivy.xml'
-        pattern.toVersionListPattern(artifact2) == 'prefix/org.group-projectA/[revision]/ivys/[revision]/ivy.xml'
+        pattern.toVersionListPattern(moduleId, ivyName).path == expectedPath
+
+        where:
+        group       | module     | expectedPath
+        "group"     | "projectA" | 'prefix/group-projectA/[revision]/ivys/[revision]/ivy.xml'
+        "org.group" | "projectA" | 'prefix/org.group-projectA/[revision]/ivys/[revision]/ivy.xml'
     }
 
     private static ModuleVersionArtifactMetaData artifact(String group, String name, String version) {
-        final moduleVersionId = DefaultModuleVersionIdentifier.newId(group, name, version)
-        return new DefaultModuleVersionArtifactMetaData(new DefaultModuleVersionArtifactIdentifier(moduleVersionId, "ivy", "ivy", "xml"))
+        final componentIdentifier = DefaultModuleComponentIdentifier.newId(group, name, version)
+        return new DefaultModuleVersionArtifactMetaData(new DefaultModuleVersionArtifactIdentifier(componentIdentifier, "ivy", "ivy", "xml"))
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePatternTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePatternTest.groovy
index 216cd5229f17..24b120ad4bb7 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePatternTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/M2ResourcePatternTest.groovy
@@ -15,36 +15,79 @@
  */
 
 package org.gradle.api.internal.artifacts.repositories.resolver
-
 import org.gradle.api.internal.artifacts.DefaultModuleIdentifier
-import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
+import org.gradle.api.internal.artifacts.metadata.DefaultIvyArtifactName
 import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactIdentifier
 import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactMetaData
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactMetaData
 import spock.lang.Specification
 
+import static org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier.newId
+
 class M2ResourcePatternTest extends Specification {
+    def "can construct from URI and pattern"() {
+        expect:
+        new M2ResourcePattern(new URI(uri), pattern).pattern == expectedPattern
+
+        where:
+        uri            | pattern  | expectedPattern
+        "http://host/" | "a/b/c"  | "http://host/a/b/c"
+        "http://host"  | "a/b/c"  | "http://host/a/b/c"
+        "http://host/" | "/a/b/c" | "http://host/a/b/c"
+        "http://host/" | ""       | "http://host/"
+        "http://host"  | ""       | "http://host"
+    }
+
     def "substitutes artifact attributes into pattern"() {
         def pattern = new M2ResourcePattern("prefix/[organisation]/[module]/[revision]/[type]s/[revision]/[artifact].[ext]")
-        final String group = "group"
-        final String name = "projectA"
-        final String version = "1.2"
-        def artifact1 = artifact(group, name, version)
-        def artifact2 = artifact("org.group", "projectA", "1.2")
+        def artifact = artifact(group, module, version)
 
         expect:
-        pattern.toPath(artifact1) == 'prefix/group/projectA/1.2/ivys/1.2/ivy.xml'
-        pattern.toPath(artifact2) == 'prefix/org/group/projectA/1.2/ivys/1.2/ivy.xml'
+        pattern.getLocation(artifact).path == expectPath
+
+        where:
+        group       | module     | version | expectPath
+        "group"     | "projectA" | "1.2"   | 'prefix/group/projectA/1.2/ivys/1.2/ivy.xml'
+        "org.group" | "projectA" | "1.2"   | 'prefix/org/group/projectA/1.2/ivys/1.2/ivy.xml'
+        "##??::"    | "projectA" | "1.2"   | 'prefix/##??::/projectA/1.2/ivys/1.2/ivy.xml'
     }
 
-    def "substitutes module attributes into pattern to determine module pattern"() {
+    def "substitutes snapshot artifact attributes into pattern"() {
+        def pattern = new M2ResourcePattern("prefix/" + MavenPattern.M2_PATTERN)
+        def snapshotId = new MavenUniqueSnapshotComponentIdentifier("group", "projectA", "1.2-SNAPSHOT", "2014-timestamp-3333")
+
+        def artifact1 = new DefaultModuleVersionArtifactMetaData(new DefaultModuleVersionArtifactIdentifier(snapshotId, "projectA", "pom", "pom"))
+
+        expect:
+        pattern.getLocation(artifact1).path == 'prefix/group/projectA/1.2-SNAPSHOT/projectA-1.2-2014-timestamp-3333.pom'
+    }
+
+    def "determines artifact location by substituting artifact attributes into pattern and resolving relative to base URI"() {
+        def pattern = new M2ResourcePattern(new URI("http://server/lookup"), "[organisation]/[module]/[revision]/[type]s/[revision]/[artifact].[ext]")
+        def artifact = artifact(group, module, version)
+
+        expect:
+        pattern.getLocation(artifact).uri == new URI(expectPath)
+
+        where:
+        group       | module     | version | expectPath
+        "group"     | "projectA" | "1.2"   | 'http://server/lookup/group/projectA/1.2/ivys/1.2/ivy.xml'
+        "org.group" | "projectA" | "1.2"   | 'http://server/lookup/org/group/projectA/1.2/ivys/1.2/ivy.xml'
+        "#?:%12"    | "projectA" | "1.2"   | 'http://server/lookup/%23%3F:%2512/projectA/1.2/ivys/1.2/ivy.xml'
+    }
+
+    def "substitutes attributes into pattern to determine version list pattern"() {
         def pattern = new M2ResourcePattern("prefix/[organisation]/[module]/[revision]/[type]s/[revision]/[artifact].[ext]")
-        def artifact1 = artifact("group", "projectA", "1.2")
-        def artifact2 = artifact("org.group", "projectA", "1.2")
+        def ivyName = new DefaultIvyArtifactName("projectA", "pom", "pom")
+        def moduleId = new DefaultModuleIdentifier(group, module)
 
         expect:
-        pattern.toVersionListPattern(artifact1) == 'prefix/group/projectA/[revision]/ivys/[revision]/ivy.xml'
-        pattern.toVersionListPattern(artifact2) == 'prefix/org/group/projectA/[revision]/ivys/[revision]/ivy.xml'
+        pattern.toVersionListPattern(moduleId, ivyName).path == expectedPath
+
+        where:
+        group       | module     | expectedPath
+        "group"     | "projectA" | 'prefix/group/projectA/[revision]/poms/[revision]/projectA.pom'
+        "org.group" | "projectA" | 'prefix/org/group/projectA/[revision]/poms/[revision]/projectA.pom'
     }
 
     def "can build module path"() {
@@ -53,18 +96,18 @@ class M2ResourcePatternTest extends Specification {
         def module2 = new DefaultModuleIdentifier("org.group", "projectA")
 
         expect:
-        pattern.toModulePath(module1) == 'prefix/group/projectA'
-        pattern.toModulePath(module2) == 'prefix/org/group/projectA'
+        pattern.toModulePath(module1).path == 'prefix/group/projectA'
+        pattern.toModulePath(module2).path == 'prefix/org/group/projectA'
     }
 
     def "can build module version path"() {
         def pattern = new M2ResourcePattern("prefix/" + MavenPattern.M2_PATTERN)
-        def artifact1 = artifact("group", "projectA", "1.2")
-        def artifact2 = artifact("org.group", "projectA", "1.2")
+        def component1 = newId("group", "projectA", "1.2")
+        def component2 = newId("org.group", "projectA", "1.2")
 
         expect:
-        pattern.toModuleVersionPath(artifact1) == 'prefix/group/projectA/1.2'
-        pattern.toModuleVersionPath(artifact2) == 'prefix/org/group/projectA/1.2'
+        pattern.toModuleVersionPath(component1).path == 'prefix/group/projectA/1.2'
+        pattern.toModuleVersionPath(component2).path == 'prefix/org/group/projectA/1.2'
     }
 
     def "throws UnsupportedOperationException for non M2 compatible pattern"() {
@@ -78,7 +121,7 @@ class M2ResourcePatternTest extends Specification {
     }
 
     private static ModuleVersionArtifactMetaData artifact(String group, String name, String version) {
-        final moduleVersionId = DefaultModuleVersionIdentifier.newId(group, name, version)
+        final moduleVersionId = newId(group, name, version)
         return new DefaultModuleVersionArtifactMetaData(new DefaultModuleVersionArtifactIdentifier(moduleVersionId, "ivy", "ivy", "xml"))
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolverTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolverTest.groovy
index f9009835081d..7ffecd8ab0f7 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolverTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenResolverTest.groovy
@@ -19,16 +19,18 @@ package org.gradle.api.internal.artifacts.repositories.resolver
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.parser.MetaDataParser
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ResolverStrategy
 import org.gradle.api.internal.artifacts.repositories.transport.RepositoryTransport
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceFinder
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.local.LocallyAvailableResourceFinder
+import org.gradle.internal.resource.transport.ExternalResourceRepository
+import org.gradle.api.internal.filestore.ivy.ArtifactIdentifierFileStore
 import spock.lang.Specification
 import spock.lang.Unroll
 
 class MavenResolverTest extends Specification {
     def repositoryTransport = Mock(RepositoryTransport)
     def repository = Mock(ExternalResourceRepository)
+    def artifactIdentifierFileStore = Stub(ArtifactIdentifierFileStore)
 
-    def rootUri = URI.create("localhost:8081:/testrepo/")
+    def rootUri = URI.create("thing:/localhost:8081:/testrepo/")
     def locallyAvailableResourceFinder = Mock(LocallyAvailableResourceFinder)
     def parser = Mock(MetaDataParser)
     def resolverStrategy = Stub(ResolverStrategy)
@@ -41,7 +43,7 @@ class MavenResolverTest extends Specification {
     def "setUseMavenMetaData '#value' adapts versionLister to #classname"() {
         setup:
         MavenResolver testresolver = new MavenResolver("test maven resolver", rootUri, repositoryTransport,
-                locallyAvailableResourceFinder, resolverStrategy)
+                locallyAvailableResourceFinder, resolverStrategy, artifactIdentifierFileStore)
         when:
         testresolver.setUseMavenMetadata(value)
         then:
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotComponentIdentifierTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotComponentIdentifierTest.groovy
new file mode 100644
index 000000000000..e032067eb285
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotComponentIdentifierTest.groovy
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.repositories.resolver
+
+import spock.lang.Specification
+
+import static org.gradle.util.Matchers.strictlyEquals
+
+class MavenUniqueSnapshotComponentIdentifierTest extends Specification {
+
+    def id = new MavenUniqueSnapshotComponentIdentifier("group", "module", "1.0-SNAPSHOT", "timestamp")
+
+    def "delegates module version to owner"() {
+        expect:
+        id.group == "group"
+        id.module == "module"
+        id.version == "1.0-SNAPSHOT"
+    }
+
+    def "replaces SNAPSHOT in version with timestamp for timestamped version"() {
+        expect:
+        id.timestampedVersion == "1.0-timestamp"
+    }
+
+    def "has useful display name"() {
+        expect:
+        id.displayName == "group:module:1.0-SNAPSHOT:timestamp"
+    }
+
+    def "can compare with other instance"() {
+        when:
+        MavenUniqueSnapshotComponentIdentifier id1 = new MavenUniqueSnapshotComponentIdentifier("group", "module", "1.0-SNAPSHOT", "timestamp")
+        MavenUniqueSnapshotComponentIdentifier same = new MavenUniqueSnapshotComponentIdentifier("group", "module", "1.0-SNAPSHOT", "timestamp")
+        MavenUniqueSnapshotComponentIdentifier differentVersion = new MavenUniqueSnapshotComponentIdentifier("group", "module", "1.1-SNAPSHOT", "timestamp")
+        MavenUniqueSnapshotComponentIdentifier differentTimestamp = new MavenUniqueSnapshotComponentIdentifier("group", "module", "1.0-SNAPSHOT", "other")
+
+        then:
+        assert strictlyEquals(id1, same)
+        assert id1.hashCode() != differentVersion.hashCode()
+        assert id1 != differentVersion
+        assert id1.hashCode() != differentTimestamp
+        assert id1 != differentTimestamp
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotExternalResourceArtifactResolverTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotExternalResourceArtifactResolverTest.groovy
new file mode 100644
index 000000000000..8c377344b6a9
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenUniqueSnapshotExternalResourceArtifactResolverTest.groovy
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.repositories.resolver
+
+import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
+import org.gradle.api.internal.artifacts.metadata.DefaultIvyArtifactName
+import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactMetaData
+import org.gradle.api.internal.artifacts.metadata.IvyArtifactName
+import org.gradle.internal.resource.LocallyAvailableExternalResource
+import spock.lang.Specification
+
+class MavenUniqueSnapshotExternalResourceArtifactResolverTest extends Specification {
+
+    def delegate = Mock(ExternalResourceArtifactResolver)
+    def resolver = new MavenUniqueSnapshotExternalResourceArtifactResolver(delegate, "timestamp")
+
+    def "creates timestamped artifact"() {
+        when:
+        def originalComponentId = DefaultModuleComponentIdentifier.newId("group", "name", "1.0-SNAPSHOT")
+        def originalIvyName = Mock(IvyArtifactName)
+        def originalArtifact = new DefaultModuleVersionArtifactMetaData(originalComponentId, originalIvyName)
+        def artifact = resolver.timestamp(originalArtifact)
+
+        then:
+        with (artifact.id.componentIdentifier) {
+            group == "group"
+            module == "name"
+            version == "1.0-SNAPSHOT"
+            timestamp == "timestamp"
+            timestampedVersion == "1.0-timestamp"
+        }
+    }
+
+    def "delegates with timestamped artifact"() {
+        given:
+        def originalComponentId = DefaultModuleComponentIdentifier.newId("group", "name", "1.0-SNAPSHOT")
+        def originalIvyName = new DefaultIvyArtifactName("name", "type", "extension")
+        def originalArtifact = new DefaultModuleVersionArtifactMetaData(originalComponentId, originalIvyName)
+        def artifact = resolver.timestamp(originalArtifact)
+        def resource1 = Mock(LocallyAvailableExternalResource)
+        def resource2 = Mock(LocallyAvailableExternalResource)
+
+        when:
+        1 * delegate.resolveMetaDataArtifact({ it.id == artifact.id }) >> resource1
+        1 * delegate.resolveArtifact({ it.id == artifact.id }) >> resource2
+        1 * delegate.artifactExists({ it.id == artifact.id }) >> true
+
+        then:
+        resolver.resolveMetaDataArtifact(originalArtifact) == resource1
+        resolver.resolveArtifact(originalArtifact) == resource2
+        resolver.artifactExists(originalArtifact)
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionListerTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionListerTest.groovy
index 0d3d60869fc9..3af692f4dc2b 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionListerTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/MavenVersionListerTest.groovy
@@ -21,12 +21,11 @@ import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.IvyUtil
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ExactVersionMatcher
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestVersionStrategy
-import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactIdentifier
-import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactMetaData
-import org.gradle.api.internal.externalresource.ExternalResource
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository
-import org.gradle.api.internal.resource.ResourceException
-import org.gradle.api.internal.resource.ResourceNotFoundException
+import org.gradle.api.internal.artifacts.metadata.DefaultIvyArtifactName
+import org.gradle.internal.resource.ExternalResource
+import org.gradle.internal.resource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.ResourceException
+import org.gradle.internal.resource.ResourceNotFoundException
 import org.gradle.internal.UncheckedException
 import org.xml.sax.SAXParseException
 import spock.lang.Specification
@@ -36,11 +35,11 @@ class MavenVersionListerTest extends Specification {
     def moduleRevisionId = IvyUtil.createModuleRevisionId("org.acme", "testproject", "1.0")
     def module = new DefaultModuleIdentifier("org.acme", "testproject")
     def moduleVersion = new DefaultModuleVersionIdentifier(module, "1.0")
-    def artifact = new DefaultModuleVersionArtifactMetaData(new DefaultModuleVersionArtifactIdentifier(moduleVersion, "testproject", "jar", "jar"))
+    def artifact = new DefaultIvyArtifactName("testproject", "jar", "jar")
 
     def repository = Mock(ExternalResourceRepository)
-    def pattern = pattern("localhost:8081/testRepo/" + MavenPattern.M2_PATTERN)
-    String metaDataResource = 'localhost:8081/testRepo/org/acme/testproject/maven-metadata.xml'
+    def pattern = pattern("testRepo/" + MavenPattern.M2_PATTERN)
+    def metaDataResource = new URI('testRepo/org/acme/testproject/maven-metadata.xml')
 
     final MavenVersionLister lister = new MavenVersionLister(repository)
 
@@ -87,7 +86,7 @@ class MavenVersionListerTest extends Specification {
         sort(versionList).collect {it.pattern} == [pattern2, pattern1, pattern1]
 
         and:
-        1 * repository.getResource('prefix1/org/acme/testproject/maven-metadata.xml') >> resource1
+        1 * repository.getResource(new URI('prefix1/org/acme/testproject/maven-metadata.xml')) >> resource1
         1 * resource1.withContent(_) >> { Action action -> action.execute(new ByteArrayInputStream("""
 <metadata>
     <versioning>
@@ -98,7 +97,7 @@ class MavenVersionListerTest extends Specification {
     </versioning>
 </metadata>""".bytes))
         }
-        1 * repository.getResource('prefix2/org/acme/testproject/maven-metadata.xml') >> resource2
+        1 * repository.getResource(new URI('prefix2/org/acme/testproject/maven-metadata.xml')) >> resource2
         1 * resource2.withContent(_) >> { Action action -> action.execute(new ByteArrayInputStream("""
 <metadata>
     <versioning>
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionListerTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionListerTest.groovy
index 3433fcc9723e..68b642d99705 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionListerTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ResourceVersionListerTest.groovy
@@ -15,16 +15,14 @@
  */
 
 package org.gradle.api.internal.artifacts.repositories.resolver
-
 import org.gradle.api.internal.artifacts.DefaultModuleIdentifier
 import org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier
 import org.gradle.api.internal.artifacts.ivyservice.IvyUtil
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.ExactVersionMatcher
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestVersionStrategy
-import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactIdentifier
-import org.gradle.api.internal.artifacts.metadata.DefaultModuleVersionArtifactMetaData
-import org.gradle.api.internal.externalresource.transport.ExternalResourceRepository
-import org.gradle.api.internal.resource.ResourceException
+import org.gradle.api.internal.artifacts.metadata.DefaultIvyArtifactName
+import org.gradle.internal.resource.transport.ExternalResourceRepository
+import org.gradle.internal.resource.ResourceException
 import spock.lang.Specification
 import spock.lang.Unroll
 
@@ -34,7 +32,7 @@ class ResourceVersionListerTest extends Specification {
     def moduleRevisionId = IvyUtil.createModuleRevisionId("org.acme", "proj1", "1.0")
     def module = new DefaultModuleIdentifier("org.acme", "proj1")
     def moduleVersion = new DefaultModuleVersionIdentifier(module, "1.0")
-    def artifact = new DefaultModuleVersionArtifactMetaData(new DefaultModuleVersionArtifactIdentifier(moduleVersion, "proj1", "jar", "jar"))
+    def artifact = new DefaultIvyArtifactName("proj1", "jar", "jar")
 
     def ResourceVersionLister lister;
 
@@ -95,28 +93,28 @@ class ResourceVersionListerTest extends Specification {
         sort(versionList).collect { it.version } == ["2.1", "1", "a-version"]
 
         and:
-        1 * repo.list(repoListingPath) >> repoResult
+        1 * repo.list(URI.create(repoListingPath)) >> repoResult
         0 * repo._
 
         where:
         testPattern                              | repoListingPath | repoResult
-        "[revision]"                             | ""              | ["1", "2.1/", "a-version"]
-        "[revision]/"                            | ""              | ["1", "2.1/", "a-version"]
-        "/[revision]"                            | "/"             | ["1", "2.1/", "a-version"]
-        "/[revision]/"                           | "/"             | ["1", "2.1/", "a-version"]
-        "/some/[revision]"                       | "/some/"        | ["/some/1", "/some/2.1/", "/some/a-version"]
-        "/some/[revision]/"                      | "/some/"        | ["/some/1", "/some/2.1/", "/some/a-version"]
-        "/some/[revision]/lib"                   | "/some/"        | ["/some/1/", "/some/2.1", "/some/a-version"]
-        "/some/version-[revision]"               | "/some/"        | ["/some/version-1", "/some/version-2.1", "/some/version-a-version", "/some/nonmatching"]
-        "/some/version-[revision]/lib"           | "/some/"        | ["/some/version-1", "/some/version-2.1", "/some/version-a-version", "/some/nonmatching"]
-        "/some/version-[revision]/lib/"          | "/some/"        | ["/some/version-1", "/some/version-2.1", "/some/version-a-version", "/some/nonmatching"]
-        "/some/[revision]-version"               | "/some/"        | ["/some/1-version", "/some/2.1-version", "/some/a-version-version", "/some/nonmatching"]
-        "/some/[revision]-version/lib"           | "/some/"        | ["/some/1-version", "/some/2.1-version", "/some/a-version-version", "/some/nonmatching"]
-        "/some/[revision]-lib.[ext]"             | "/some/"        | ["/some/1-lib.jar", "/some/1-lib.zip", "/some/2.1-lib.jar", "/some/a-version-lib.jar", "/some/nonmatching"]
-        "/some/any-[revision]-version/lib"       | "/some/"        | ["/some/any-1-version", "/some/any-2.1-version", "/some/any-a-version-version", "/some/nonmatching"]
-        "/some/any-[revision]-version/lib/"      | "/some/"        | ["/some/any-1-version", "/some/any-2.1-version", "/some/any-a-version-version", "/some/nonmatching"]
-        "/some/[revision]/lib/myjar-[revision]/" | "/some/"        | ["/some/1", "/some/2.1", "/some/a-version"]
-        "/some/proj-[revision]/[revision]/lib/"  | "/some/"        | ["/some/proj-1", "/some/proj-2.1", "/some/proj-a-version"]
+        "[revision]"                             | ""              | ["1", "2.1", "a-version"]
+        "[revision]/"                            | ""              | ["1", "2.1", "a-version"]
+        "/[revision]"                            | "/"             | ["1", "2.1", "a-version"]
+        "/[revision]/"                           | "/"             | ["1", "2.1", "a-version"]
+        "/some/[revision]"                       | "/some/"        | ["1", "2.1", "a-version"]
+        "/some/[revision]/"                      | "/some/"        | ["1", "2.1", "a-version"]
+        "/some/[revision]/lib"                   | "/some/"        | ["1", "2.1", "a-version"]
+        "/some/version-[revision]"               | "/some/"        | ["version-1", "version-2.1", "version-a-version", "nonmatching"]
+        "/some/version-[revision]/lib"           | "/some/"        | ["version-1", "version-2.1", "version-a-version", "nonmatching"]
+        "/some/version-[revision]/lib/"          | "/some/"        | ["version-1", "version-2.1", "version-a-version", "nonmatching"]
+        "/some/[revision]-version"               | "/some/"        | ["1-version", "2.1-version", "a-version-version", "nonmatching"]
+        "/some/[revision]-version/lib"           | "/some/"        | ["1-version", "2.1-version", "a-version-version", "nonmatching"]
+        "/some/[revision]-lib.[ext]"             | "/some/"        | ["1-lib.jar", "1-lib.zip", "2.1-lib.jar", "a-version-lib.jar", "nonmatching"]
+        "/some/any-[revision]-version/lib"       | "/some/"        | ["any-1-version", "any-2.1-version", "any-a-version-version", "nonmatching"]
+        "/some/any-[revision]-version/lib/"      | "/some/"        | ["any-1-version", "any-2.1-version", "any-a-version-version", "nonmatching"]
+        "/some/[revision]/lib/myjar-[revision]/" | "/some/"        | ["1", "2.1", "a-version"]
+        "/some/proj-[revision]/[revision]/lib/"  | "/some/"        | ["proj-1", "proj-2.1", "proj-a-version"]
     }
 
     def "visit builds union of versions"() {
@@ -132,8 +130,8 @@ class ResourceVersionListerTest extends Specification {
         sort(versionList).collect { it.pattern } == [pattern2, pattern1, pattern1]
 
         and:
-        1 * repo.list("/") >> ["1.2", "1.3"]
-        1 * repo.list("/org.acme/") >> ["1.3", "1.4"]
+        1 * repo.list(URI.create("/")) >> ["1.2", "1.3"]
+        1 * repo.list(URI.create("/org.acme/")) >> ["1.3", "1.4"]
         0 * repo._
     }
 
@@ -149,7 +147,7 @@ class ResourceVersionListerTest extends Specification {
         sort(versionList).collect { it.pattern } == [patternA, patternA]
 
         and:
-        1 * repo.list("/a/") >> ["1.2", "1.3"]
+        1 * repo.list(URI.create("/a/")) >> ["1.2", "1.3"]
         0 * repo._
     }
 
@@ -164,7 +162,7 @@ class ResourceVersionListerTest extends Specification {
         versionList.visit(pattern(inputPattern), artifact)
 
         then:
-        1 * repo.list(repoPath) >> ['1.2']
+        1 * repo.list(URI.create(repoPath)) >> ['1.2']
 
         where:
         inputPattern                                  | repoPath
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactoryTest.groovy
new file mode 100644
index 000000000000..cac1c54eb9a5
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/repositories/transport/RepositoryTransportFactoryTest.groovy
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.repositories.transport
+
+import org.gradle.api.InvalidUserDataException
+import spock.lang.Specification
+
+class RepositoryTransportFactoryTest extends Specification {
+
+    def repositoryTransportFactory = new RepositoryTransportFactory(null, null, null, null, null, null)
+
+    def "cannot create a transport for url with unsupported scheme"() {
+        when:
+        repositoryTransportFactory.createTransport(['unsupported'] as Set, null, null)
+
+        then:
+        InvalidUserDataException e = thrown()
+        e.message == "You may only specify 'file', 'http', 'https' and 'sftp' URLs for a repository."
+    }
+
+    def "cannot creates a transport for mixed url scheme"() {
+        when:
+        repositoryTransportFactory.createTransport(['file', 'http'] as Set, null, null)
+
+        then:
+        InvalidUserDataException e = thrown()
+        e.message == "You cannot mix different URL schemes for a single repository. Please declare separate repositories."
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentArtifactsResultTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentArtifactsResultTest.groovy
new file mode 100644
index 000000000000..6f3bdd6635e5
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentArtifactsResultTest.groovy
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.result
+import org.gradle.api.artifacts.component.ComponentIdentifier
+import org.gradle.api.artifacts.result.Artifact
+import org.gradle.api.artifacts.result.ArtifactResult
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact
+import spock.lang.Specification
+
+class DefaultResolvedComponentArtifactsResultTest extends Specification {
+    def id = Mock(ComponentIdentifier)
+    def result = new DefaultResolvedComponentArtifactsResult(id)
+
+    def "returns artifacts matching type"() {
+        given:
+        def artifact = Mock(ArtifactResult)
+        result.addArtifact(artifact)
+
+        when:
+        artifact.type >> SourcesArtifact
+
+        then:
+        result.getArtifacts(Artifact) == [artifact] as Set
+        result.getArtifacts(SourcesArtifact) == [artifact] as Set
+        result.getArtifacts(JavadocArtifact) == [] as Set
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedModuleVersionResultSpec.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentResultTest.groovy
similarity index 96%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedModuleVersionResultSpec.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentResultTest.groovy
index e19bc8cb1438..e578c4bc69d6 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedModuleVersionResultSpec.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/artifacts/result/DefaultResolvedComponentResultTest.groovy
@@ -20,7 +20,7 @@ import spock.lang.Specification
 
 import static org.gradle.api.internal.artifacts.result.ResolutionResultDataBuilder.*
 
-class DefaultResolvedModuleVersionResultSpec extends Specification {
+class DefaultResolvedComponentResultTest extends Specification {
 
     def "mutating dependencies or dependents is harmless"() {
         given:
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessorTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessorTest.groovy
deleted file mode 100644
index be40d750b49d..000000000000
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/DefaultCacheAwareExternalResourceAccessorTest.groovy
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.externalresource.transfer
-
-import org.gradle.api.internal.externalresource.cached.CachedExternalResourceIndex
-import org.gradle.util.BuildCommencedTimeProvider
-import spock.lang.Specification
-import org.gradle.api.internal.externalresource.local.LocallyAvailableResourceCandidates
-import org.gradle.api.internal.externalresource.cached.CachedExternalResource
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData
-import org.gradle.internal.hash.HashValue
-import org.gradle.internal.resource.local.LocallyAvailableResource
-import org.gradle.api.internal.externalresource.DefaultLocallyAvailableExternalResource
-
-class DefaultCacheAwareExternalResourceAccessorTest extends Specification {
-    final accessor = Mock(ExternalResourceAccessor)
-    final index = Mock(CachedExternalResourceIndex)
-    final timeProvider = Mock(BuildCommencedTimeProvider)
-    final cache = new DefaultCacheAwareExternalResourceAccessor(accessor, index, timeProvider)
-
-    def "will use sha1 from metadata for finding candidates if available"() {
-        given:
-        def localCandidates = Mock(LocallyAvailableResourceCandidates)
-        def cached = Mock(CachedExternalResource)
-        def sha1 = HashValue.parse("abc")
-        def cachedMetaData = Mock(ExternalResourceMetaData)
-        def remoteMetaData = Mock(ExternalResourceMetaData)
-        def localCandidate = Mock(LocallyAvailableResource)
-
-        and:
-        index.lookup("location") >> cached
-        cached.getExternalResourceMetaData() >> cachedMetaData
-        accessor.getMetaData("location") >> remoteMetaData
-        localCandidates.isNone() >> false
-        remoteMetaData.sha1 >> sha1
-        
-        when:
-        def foundResource = cache.getResource("location", localCandidates)
-
-        then:
-        1 * timeProvider.currentTime >> new Date().time
-        1 * cached.cachedAt >> new Date().time + 2
-        0 * accessor.getResourceSha1(_)
-        1 * localCandidates.findByHashValue(sha1) >> localCandidate
-
-        and:
-        foundResource instanceof DefaultLocallyAvailableExternalResource
-    }
-}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapterTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/cached/CachedExternalResourceAdapterTest.groovy
similarity index 57%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapterTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/cached/CachedExternalResourceAdapterTest.groovy
index 988904c4942c..0d73a72a8d2d 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/CachedExternalResourceAdapterTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/cached/CachedExternalResourceAdapterTest.groovy
@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.cached
+package org.gradle.internal.resource.cached
 
-import org.gradle.api.internal.externalresource.ExternalResource
-import org.gradle.api.internal.externalresource.metadata.DefaultExternalResourceMetaData
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceAccessor
+import org.gradle.internal.resource.ExternalResource
+import org.gradle.internal.resource.transfer.ExternalResourceAccessor
+import org.gradle.internal.hash.HashUtil
+import org.gradle.internal.hash.HashValue
+import org.gradle.internal.resource.local.LocallyAvailableResource
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
@@ -26,26 +28,13 @@ public class CachedExternalResourceAdapterTest extends Specification {
     @Rule final TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider()
 
     ExternalResourceAccessor accessor = Mock()
-    CachedExternalResource cachedExternalResource = Mock()
-    CachedExternalResourceAdapter cachedResource
+    LocallyAvailableResource candidate = Mock()
+    def uri = new URI("scheme:thing")
     def origin = tmpDir.file('origin')
     def destination = tmpDir.file('destination')
-    def download = tmpDir.file('download')
 
     def setup() {
-        cachedExternalResource.cachedFile >> origin
-        cachedResource = new CachedExternalResourceAdapter("resource-source", cachedExternalResource, accessor)
-    }
-
-    def "delegates to cached artifact"() {
-        given:
-        cachedExternalResource.contentLength >> 22
-        cachedExternalResource.externalResourceMetaData >> new DefaultExternalResourceMetaData("url")
-        cachedExternalResource.externalLastModifiedAsTimestamp >> 33
-
-        expect:
-        cachedResource.contentLength == 22
-        cachedResource.lastModified == 33
+        candidate.file >> origin
     }
 
     def "will copy cache file to destination"() {
@@ -53,6 +42,7 @@ public class CachedExternalResourceAdapterTest extends Specification {
         origin << "some content"
 
         when:
+        def cachedResource = new CachedExternalResourceAdapter(uri, candidate, accessor, null, HashUtil.createHash(origin, "sha1"))
         cachedResource.writeTo(destination)
 
         then:
@@ -62,17 +52,14 @@ public class CachedExternalResourceAdapterTest extends Specification {
     def "will copy download resource if destination does not match original sha1 after copy"() {
         given:
         origin << "some content"
-        download << "some other content"
         ExternalResource resource = Mock()
 
         when:
+        def cachedResource = new CachedExternalResourceAdapter(uri, candidate, accessor, null, new HashValue(123.toBigInteger().toByteArray()))
         cachedResource.writeTo(destination)
 
         then:
-        cachedExternalResource.cachedFile >> origin
-
-        and:
-        accessor.getResource("resource-source") >> resource
+        accessor.getResource(uri) >> resource
         resource.writeTo(destination)
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/DefaultArtifactResolutionCacheTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/cached/DefaultArtifactResolutionCacheTest.groovy
similarity index 82%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/DefaultArtifactResolutionCacheTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/cached/DefaultArtifactResolutionCacheTest.groovy
index 8d72fd0bfd49..273268d3e146 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/cached/DefaultArtifactResolutionCacheTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/cached/DefaultArtifactResolutionCacheTest.groovy
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.cached
+package org.gradle.internal.resource.cached
 
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager
-import org.gradle.api.internal.externalresource.metadata.DefaultExternalResourceMetaData
+import org.gradle.internal.resource.metadata.DefaultExternalResourceMetaData
 import org.gradle.messaging.serialize.Serializer
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.testfixtures.internal.InMemoryIndexedCache
@@ -54,13 +54,13 @@ class DefaultArtifactResolutionCacheTest extends Specification {
         index = new DefaultCachedExternalResourceIndex("index", String, timeProvider, cacheLockingManager)
     }
 
-    @Unroll "stores entry - lastModified = #lastModified, artifactUrl = #artifactUrl"() {
+    @Unroll "stores entry - lastModified = #lastModified"() {
         given:
         def key = "key"
         def artifactFile = tmp.createFile("artifact") << "content"
         
         when:
-        index.store(key, artifactFile, new DefaultExternalResourceMetaData(artifactUrl, lastModified, 100, null, null))
+        index.store(key, artifactFile, new DefaultExternalResourceMetaData(new URI("abc"), lastModified, 100, null, null))
         
         then:
         def cached = index.lookup(key)
@@ -70,15 +70,11 @@ class DefaultArtifactResolutionCacheTest extends Specification {
         cached.cachedFile == artifactFile
         cached.externalResourceMetaData != null
         cached.externalResourceMetaData.lastModified == lastModified
-        cached.externalResourceMetaData.location == artifactUrl
+        cached.externalResourceMetaData.location == new URI("abc")
 
 
         where:
-        lastModified | artifactUrl
-        new Date()   | null
-        null         | "abc"
-        null         | null
-        new Date()   | "abc"
+        lastModified << [new Date(), null]
     }
 
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/CompositeLocallyAvailableResourceFinderTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/local/CompositeLocallyAvailableResourceFinderTest.groovy
similarity index 94%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/CompositeLocallyAvailableResourceFinderTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/local/CompositeLocallyAvailableResourceFinderTest.groovy
index d2e0b5fec62c..f190d386003a 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/CompositeLocallyAvailableResourceFinderTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/local/CompositeLocallyAvailableResourceFinderTest.groovy
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.local
+package org.gradle.internal.resource.local
 
-import org.gradle.internal.resource.local.LocallyAvailableResource
 import spock.lang.Specification
 import org.gradle.internal.hash.HashUtil
 
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/LazyLocallyAvailableResourceCandidatesTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/local/LazyLocallyAvailableResourceCandidatesTest.groovy
similarity index 96%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/LazyLocallyAvailableResourceCandidatesTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/local/LazyLocallyAvailableResourceCandidatesTest.groovy
index add05c10f445..a2f685aa1960 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/local/LazyLocallyAvailableResourceCandidatesTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/local/LazyLocallyAvailableResourceCandidatesTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.local
+package org.gradle.internal.resource.local
 
 import org.gradle.internal.Factory
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/DefaultCacheAwareExternalResourceAccessorTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/DefaultCacheAwareExternalResourceAccessorTest.groovy
new file mode 100644
index 000000000000..ac372e33c9ec
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/DefaultCacheAwareExternalResourceAccessorTest.groovy
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2012 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transfer
+
+import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager
+import org.gradle.internal.resource.ExternalResource
+import org.gradle.internal.resource.cached.CachedExternalResource
+import org.gradle.internal.resource.cached.CachedExternalResourceIndex
+import org.gradle.internal.resource.local.LocallyAvailableResourceCandidates
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData
+import org.gradle.api.internal.file.TemporaryFileProvider
+import org.gradle.internal.hash.HashUtil
+import org.gradle.internal.resource.local.DefaultLocallyAvailableResource
+import org.gradle.internal.resource.local.LocallyAvailableResource
+import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
+import org.gradle.util.BuildCommencedTimeProvider
+import org.junit.Rule
+import spock.lang.Specification
+
+class DefaultCacheAwareExternalResourceAccessorTest extends Specification {
+    @Rule TestNameTestDirectoryProvider tempDir = new TestNameTestDirectoryProvider()
+    final accessor = Mock(ExternalResourceAccessor)
+    final index = Mock(CachedExternalResourceIndex)
+    final timeProvider = Mock(BuildCommencedTimeProvider)
+    final tempFile = tempDir.file("temp-file")
+    final cachedFile = tempDir.file("cached-file")
+    final temporaryFileProvider = Stub(TemporaryFileProvider) {
+        createTemporaryFile(_, _, _) >> tempFile
+    }
+    final cacheLockingManager = Mock(CacheLockingManager)
+    final cache = new DefaultCacheAwareExternalResourceAccessor(accessor, index, timeProvider, temporaryFileProvider, cacheLockingManager)
+
+    def "returns null when the request resource is not cached and does not exist in the remote repository"() {
+        def uri = new URI("scheme:thing")
+        def fileStore = Mock(CacheAwareExternalResourceAccessor.ResourceFileStore)
+        def localCandidates = Mock(LocallyAvailableResourceCandidates)
+
+        when:
+        def result = cache.getResource(uri, fileStore, localCandidates)
+
+        then:
+        result == null
+
+        and:
+        1 * index.lookup("scheme:thing") >> null
+        1 * localCandidates.isNone() >> true
+        1 * accessor.getResource(uri) >> null
+        0 * _._
+    }
+
+    def "returns null when the request resource is not cached and there are local candidates but the resource does not exist in the remote repository"() {
+        def uri = new URI("scheme:thing")
+        def fileStore = Mock(CacheAwareExternalResourceAccessor.ResourceFileStore)
+        def localCandidates = Mock(LocallyAvailableResourceCandidates)
+
+        when:
+        def result = cache.getResource(uri, fileStore, localCandidates)
+
+        then:
+        result == null
+
+        and:
+        1 * index.lookup("scheme:thing") >> null
+        1 * localCandidates.isNone() >> false
+        1 * accessor.getMetaData(uri) >> null
+        0 * _._
+    }
+
+    def "downloads resource and moves it into the cache when it is not cached"() {
+        def uri = new URI("scheme:thing")
+        def fileStore = Mock(CacheAwareExternalResourceAccessor.ResourceFileStore)
+        def localCandidates = Mock(LocallyAvailableResourceCandidates)
+        def remoteResource = Mock(ExternalResource)
+        def metaData = Mock(ExternalResourceMetaData)
+        def localResource = new DefaultLocallyAvailableResource(cachedFile)
+
+        when:
+        def result = cache.getResource(uri, fileStore, localCandidates)
+
+        then:
+        result.localResource.file == cachedFile
+        result.metaData == metaData
+
+        and:
+        1 * index.lookup("scheme:thing") >> null
+        1 * localCandidates.isNone() >> true
+        1 * accessor.getResource(uri) >> remoteResource
+        _ * remoteResource.name >> "remoteResource"
+        1 * remoteResource.writeTo(tempFile)
+        1 * remoteResource.close()
+
+        and:
+        1 * cacheLockingManager.useCache(_, _) >> { String description, org.gradle.internal.Factory factory ->
+            return factory.create()
+        }
+        1 * fileStore.moveIntoCache(tempFile) >> localResource
+        1 * remoteResource.metaData >> metaData
+        1 * index.store("scheme:thing", cachedFile, metaData)
+        0 * _._
+    }
+
+    def "reuses cached resource if it has not expired"() {
+        def uri = new URI("scheme:thing")
+        def fileStore = Mock(CacheAwareExternalResourceAccessor.ResourceFileStore)
+        def localCandidates = Mock(LocallyAvailableResourceCandidates)
+        def metaData = Mock(ExternalResourceMetaData)
+        def cachedResource = Stub(CachedExternalResource)
+
+        when:
+        def result = cache.getResource(uri, fileStore, localCandidates)
+
+        then:
+        result.localResource.file == cachedFile
+        result.metaData == metaData
+
+        and:
+        1 * index.lookup("scheme:thing") >> cachedResource
+        _ * timeProvider.currentTime >> 24000L
+        _ * cachedResource.cachedAt >> 24000L
+        _ * cachedResource.cachedFile >> cachedFile
+        _ * cachedResource.externalResourceMetaData >> metaData
+        0 * _._
+    }
+
+    def "will use sha1 from metadata for finding candidates if available"() {
+        given:
+        def localCandidates = Mock(LocallyAvailableResourceCandidates)
+        def cached = Mock(CachedExternalResource)
+        def candidate = tempDir.createFile("candidate-file")
+        def sha1 = HashUtil.createHash(candidate, "sha1")
+        def fileStore = Mock(CacheAwareExternalResourceAccessor.ResourceFileStore)
+        def cachedMetaData = Mock(ExternalResourceMetaData)
+        def remoteMetaData = Mock(ExternalResourceMetaData)
+        def localCandidate = Mock(LocallyAvailableResource)
+        def uri = new URI("scheme:thing")
+        def localResource = new DefaultLocallyAvailableResource(cachedFile)
+
+        when:
+        def result = cache.getResource(uri, fileStore, localCandidates)
+
+        then:
+        result.localResource.file == cachedFile
+        result.metaData == remoteMetaData
+
+        and:
+        1 * index.lookup("scheme:thing") >> cached
+        timeProvider.currentTime >> 24000L
+        cached.cachedAt >> 23999L
+        cached.externalResourceMetaData >> cachedMetaData
+        1 * accessor.getMetaData(uri) >> remoteMetaData
+        localCandidates.none >> false
+        remoteMetaData.sha1 >> sha1
+        remoteMetaData.etag >> null
+        remoteMetaData.lastModified >> null
+        cachedMetaData.etag >> null
+        cachedMetaData.lastModified >> null
+        1 * localCandidates.findByHashValue(sha1) >> localCandidate
+        localCandidate.file >> candidate
+        cached.cachedFile >> cachedFile
+        0 * _._
+
+        and:
+        1 * cacheLockingManager.useCache(_, _) >> { String description, org.gradle.internal.Factory factory ->
+            return factory.create()
+        }
+        1 * fileStore.moveIntoCache(tempFile) >> localResource
+        1 * index.store("scheme:thing", cachedFile, remoteMetaData)
+        0 * _._
+    }
+
+    def "downloads resource directly when local candidate cannot be copied"() {
+        given:
+        def localCandidates = Mock(LocallyAvailableResourceCandidates)
+        def cached = Mock(CachedExternalResource)
+        def candidate = tempDir.createFile("candidate-file")
+        def sha1 = HashUtil.createHash(candidate, "sha1")
+        candidate << "some extra stuff"
+        def fileStore = Mock(CacheAwareExternalResourceAccessor.ResourceFileStore)
+        def cachedMetaData = Mock(ExternalResourceMetaData)
+        def remoteMetaData = Mock(ExternalResourceMetaData)
+        def localCandidate = Mock(LocallyAvailableResource)
+        def uri = new URI("scheme:thing")
+        def remoteResource = Mock(ExternalResource)
+        def localResource = new DefaultLocallyAvailableResource(cachedFile)
+
+        when:
+        def result = cache.getResource(uri, fileStore, localCandidates)
+
+        then:
+        result.localResource.file == cachedFile
+        result.metaData == remoteMetaData
+
+        and:
+        1 * index.lookup("scheme:thing") >> cached
+        timeProvider.currentTime >> 24000L
+        cached.cachedAt >> 23999L
+        cached.externalResourceMetaData >> cachedMetaData
+        1 * accessor.getMetaData(uri) >> remoteMetaData
+        localCandidates.none >> false
+        remoteMetaData.sha1 >> sha1
+        remoteMetaData.etag >> null
+        remoteMetaData.lastModified >> null
+        cachedMetaData.etag >> null
+        cachedMetaData.lastModified >> null
+        1 * localCandidates.findByHashValue(sha1) >> localCandidate
+        localCandidate.file >> candidate
+        cached.cachedFile >> cachedFile
+        1 * accessor.getResource(uri) >> remoteResource
+        1 * remoteResource.writeTo(tempFile)
+        0 * _._
+
+        and:
+        1 * cacheLockingManager.useCache(_, _) >> { String description, org.gradle.internal.Factory factory ->
+            return factory.create()
+        }
+        1 * fileStore.moveIntoCache(tempFile) >> localResource
+        1 * index.store("scheme:thing", cachedFile, remoteMetaData)
+        0 * _._
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceAccessorTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceAccessorTest.groovy
similarity index 78%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceAccessorTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceAccessorTest.groovy
index e5168cd4963f..5b58b2e5e15d 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceAccessorTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceAccessorTest.groovy
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer
+package org.gradle.internal.resource.transfer
 
-import org.gradle.api.internal.externalresource.ExternalResource
+import org.gradle.internal.resource.ExternalResource
 import org.gradle.logging.ProgressLogger
 import org.gradle.logging.ProgressLoggerFactory
 import spock.lang.Specification
@@ -33,27 +33,29 @@ class ProgressLoggingExternalResourceAccessorTest extends Specification {
     @Unroll
     def "delegates #method to delegate resource accessor"() {
         when:
-        progressLoggerAccessor."$method"("location")
+        progressLoggerAccessor."$method"(new URI("location"))
+
         then:
-        1 * accessor."$method"("location")
+        1 * accessor."$method"(new URI("location"))
+
         where:
         method << ['getMetaData', 'getResource', 'getResourceSha1']
     }
 
     def "getResource returns null when delegate returns null"() {
         setup:
-        accessor.getResource("location") >> null
+        accessor.getResource(new URI("location")) >> null
         when:
-        def loadedResource = progressLoggerAccessor.getResource("location")
+        def loadedResource = progressLoggerAccessor.getResource(new URI("location"))
         then:
         loadedResource == null
     }
 
     def "getResource wraps loaded Resource from delegate in ProgressLoggingExternalResource"() {
         setup:
-        accessor.getResource("location") >> externalResource
+        accessor.getResource(new URI("location")) >> externalResource
         when:
-        def loadedResource = progressLoggerAccessor.getResource("location")
+        def loadedResource = progressLoggerAccessor.getResource(new URI("location"))
         then:
         loadedResource != null
         loadedResource instanceof ProgressLoggingExternalResourceAccessor.ProgressLoggingExternalResource
@@ -61,7 +63,7 @@ class ProgressLoggingExternalResourceAccessorTest extends Specification {
 
     def "ProgressLoggingExternalResource.writeTo wraps delegate call in progress logger"() {
         setup:
-        accessor.getResource("location") >> externalResource
+        accessor.getResource(new URI("location")) >> externalResource
         externalResource.getName() >> "test resource"
         externalResource.getContentLength() >> 2060
         externalResource.writeTo(_) >> { OutputStream stream ->
@@ -71,7 +73,7 @@ class ProgressLoggingExternalResourceAccessorTest extends Specification {
             stream.write(new byte[1024])
         }
         when:
-        progressLoggerAccessor.getResource("location").writeTo(new ByteArrayOutputStream())
+        progressLoggerAccessor.getResource(new URI("location")).writeTo(new ByteArrayOutputStream())
         then:
         1 * progressLoggerFactory.newOperation(_) >> progressLogger
         1 * progressLogger.started()
@@ -81,14 +83,14 @@ class ProgressLoggingExternalResourceAccessorTest extends Specification {
 
     def "no progress events logged for resources smaller 1024 bytes"() {
         setup:
-        accessor.getResource("location") >> externalResource
+        accessor.getResource(new URI("location")) >> externalResource
         externalResource.getName() >> "test resource"
         externalResource.getContentLength() >> 1023
         externalResource.writeTo(_) >> { OutputStream stream ->
             stream.write(new byte[1023])
         }
         when:
-        progressLoggerAccessor.getResource("location").writeTo(new ByteArrayOutputStream())
+        progressLoggerAccessor.getResource(new URI("location")).writeTo(new ByteArrayOutputStream())
         then:
         1 * progressLoggerFactory.newOperation(_) >> progressLogger
         1 * progressLogger.started()
@@ -99,13 +101,13 @@ class ProgressLoggingExternalResourceAccessorTest extends Specification {
     @Unroll
     def "ProgressLoggingExternalResource delegates #method to delegate ExternalResource"() {
         when:
-        accessor.getResource("location") >> externalResource
-        def plExternalResource = progressLoggerAccessor.getResource("location")
+        accessor.getResource(new URI("location")) >> externalResource
+        def plExternalResource = progressLoggerAccessor.getResource(new URI("location"))
         and:
         plExternalResource."$method"()
         then:
         1 * externalResource."$method"()
         where:
-        method << ['close', 'getMetaData', 'getName', 'getLastModified', 'getContentLength', 'isLocal']
+        method << ['close', 'getMetaData', 'getName', 'getContentLength', 'isLocal']
     }
 }
\ No newline at end of file
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceUploaderTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceUploaderTest.groovy
similarity index 92%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceUploaderTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceUploaderTest.groovy
index 25d09fba5903..c0a8a69755e8 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ProgressLoggingExternalResourceUploaderTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ProgressLoggingExternalResourceUploaderTest.groovy
@@ -16,7 +16,7 @@
 
 
 
-package org.gradle.api.internal.externalresource.transfer
+package org.gradle.internal.resource.transfer
 
 import org.gradle.internal.Factory
 import org.gradle.logging.ProgressLogger
@@ -36,10 +36,10 @@ class ProgressLoggingExternalResourceUploaderTest extends Specification {
         startsProgress()
 
         when:
-        progressLoggerUploader.upload(inputStreamFactory(), 5 * 1024, "http://a/remote/path")
+        progressLoggerUploader.upload(inputStreamFactory(), 5 * 1024, new URI("http://a/remote/path"))
         then:
         1 * delegateFactory.create() >> inputStream
-        1 * uploader.upload(_, 5 * 1024, "http://a/remote/path") >> {factory, length, destination ->
+        1 * uploader.upload(_, 5 * 1024, new URI("http://a/remote/path")) >> {factory, length, destination ->
             def stream = factory.create();
             assert stream.read(new byte[1024]) == 1024
             assert stream.read() == 48
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ResourceOperationTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ResourceOperationTest.groovy
similarity index 98%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ResourceOperationTest.groovy
rename to subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ResourceOperationTest.groovy
index 00e33c65c71f..41405a0fd8d9 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transfer/ResourceOperationTest.groovy
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transfer/ResourceOperationTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer
+package org.gradle.internal.resource.transfer
 
 import spock.lang.Specification
 import org.gradle.logging.ProgressLogger
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transport/sftp/SftpClientFactoryTest.groovy b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transport/sftp/SftpClientFactoryTest.groovy
new file mode 100644
index 000000000000..a7f0e3decae0
--- /dev/null
+++ b/subprojects/core-impl/src/test/groovy/org/gradle/internal/resource/transport/sftp/SftpClientFactoryTest.groovy
@@ -0,0 +1,260 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource.transport.sftp
+
+import org.gradle.internal.resource.PasswordCredentials
+import org.gradle.test.fixtures.concurrent.ConcurrentSpec
+
+import static org.gradle.internal.resource.transport.sftp.SftpClientFactory.SftpClientCreator
+
+class SftpClientFactoryTest extends ConcurrentSpec {
+    SftpClientFactory sftpClientFactory = new SftpClientFactory()
+    SftpClientCreator sftpClientCreator = Mock(SftpClientCreator)
+
+    def setup() {
+        sftpClientFactory.sftpClientCreator = sftpClientCreator
+    }
+
+    def "Can acquire and release single client"() {
+        def mockSftpClient = Mock(LockableSftpClient)
+
+        given:
+        URI uri = new URI('http://localhost:22/repo')
+        PasswordCredentials credentials = new PasswordCredentials('sftp', 'sftp')
+
+        when:
+        LockableSftpClient actualClient = sftpClientFactory.createSftpClient(uri, credentials)
+
+        then:
+        sftpClientCreator.createNewClient(new SftpHost(uri, credentials)) >> mockSftpClient
+        sftpClientFactory.clients.size() == 0
+
+        when:
+        sftpClientFactory.releaseSftpClient(actualClient)
+
+        then:
+        1 * mockSftpClient.host >> new SftpHost(uri, credentials)
+        sftpClientFactory.clients.size() == 1
+        List<SftpHost> clientsByHost = getClientsForSftpHost(uri, credentials)
+        clientsByHost.size() == 1
+        clientsByHost.get(0) == actualClient
+    }
+
+    def "Creates new client if existing client is in use"() {
+        def mockInitialSftpClient = Mock(LockableSftpClient)
+        def mockNewSftpClient = Mock(LockableSftpClient)
+
+        given:
+        URI uri = new URI('http://localhost:22/repo')
+        PasswordCredentials credentials = new PasswordCredentials('sftp', 'sftp')
+
+        when:
+        LockableSftpClient initialClient = sftpClientFactory.createSftpClient(uri, credentials)
+
+        then:
+        sftpClientCreator.createNewClient(new SftpHost(uri, credentials)) >> mockInitialSftpClient
+        sftpClientFactory.clients.size() == 0
+
+        when:
+        LockableSftpClient newClient = sftpClientFactory.createSftpClient(uri, credentials)
+
+        then:
+        sftpClientCreator.createNewClient(new SftpHost(uri, credentials)) >> mockNewSftpClient
+        sftpClientFactory.clients.size() == 0
+        initialClient != newClient
+    }
+
+    def "Can acquire, release and reuse single client"() {
+        def mockSftpClient = Mock(LockableSftpClient)
+
+        given:
+        URI uri = new URI('http://localhost:22/repo')
+        PasswordCredentials credentials = new PasswordCredentials('sftp', 'sftp')
+
+        when:
+        LockableSftpClient initialClient = sftpClientFactory.createSftpClient(uri, credentials)
+        sftpClientFactory.releaseSftpClient(initialClient)
+
+        then:
+        1 * mockSftpClient.host >> new SftpHost(uri, credentials)
+        sftpClientCreator.createNewClient(new SftpHost(uri, credentials)) >> mockSftpClient
+        sftpClientFactory.clients.size() == 1
+        List<SftpHost> clientsByHost = getClientsForSftpHost(uri, credentials)
+        clientsByHost.size() == 1
+        clientsByHost.get(0) == initialClient
+
+        when:
+        LockableSftpClient reusedClient = sftpClientFactory.createSftpClient(uri, credentials)
+        sftpClientFactory.releaseSftpClient(reusedClient)
+
+        then:
+        1 * mockSftpClient.host >> new SftpHost(uri, credentials)
+        sftpClientFactory.clients.size() == 1
+        clientsByHost.size() == 1
+        clientsByHost.get(0) == reusedClient
+        initialClient == reusedClient
+    }
+
+    def "Can acquire and release multiple clients"() {
+        def mockSftpClient1 = Mock(LockableSftpClient)
+        def mockSftpClient2 = Mock(LockableSftpClient)
+
+        given:
+        URI uri1 = new URI('http://localhost:22/repo1')
+        URI uri2 = new URI('http://localhost:22/repo2')
+        PasswordCredentials credentials1 = new PasswordCredentials('sftp1', 'sftp1')
+        PasswordCredentials credentials2 = new PasswordCredentials('sftp2', 'sftp2')
+
+        when:
+        LockableSftpClient client1 = sftpClientFactory.createSftpClient(uri1, credentials1)
+        LockableSftpClient client2 = sftpClientFactory.createSftpClient(uri2, credentials2)
+
+        then:
+        sftpClientCreator.createNewClient(new SftpHost(uri1, credentials1)) >> mockSftpClient1
+        sftpClientCreator.createNewClient(new SftpHost(uri2, credentials2)) >> mockSftpClient2
+        sftpClientFactory.clients.size() == 0
+
+        when:
+        sftpClientFactory.releaseSftpClient(client1)
+        sftpClientFactory.releaseSftpClient(client2)
+
+        then:
+        1 * mockSftpClient1.host >> new SftpHost(uri1, credentials1)
+        1 * mockSftpClient2.host >> new SftpHost(uri2, credentials2)
+        sftpClientFactory.clients.size() == 2
+        List<SftpHost> clientsByHost1 = getClientsForSftpHost(uri1, credentials1)
+        clientsByHost1.size() == 1
+        clientsByHost1.get(0) == client1
+        List<SftpHost> clientsByHost2 = getClientsForSftpHost(uri2, credentials2)
+        clientsByHost2.size() == 1
+        clientsByHost2.get(0) == client2
+    }
+
+    def "Can stop a single, released client"() {
+        def mockSftpClient = Mock(LockableSftpClient)
+
+        given:
+        URI uri = new URI('http://localhost:22/repo')
+        PasswordCredentials credentials = new PasswordCredentials('sftp', 'sftp')
+
+        when:
+        LockableSftpClient actualClient = sftpClientFactory.createSftpClient(uri, credentials)
+
+        and:
+        sftpClientFactory.releaseSftpClient(actualClient)
+        sftpClientFactory.stop()
+
+        then:
+        sftpClientCreator.createNewClient(new SftpHost(uri, credentials)) >> mockSftpClient
+        1 * mockSftpClient.host >> new SftpHost(uri, credentials)
+        sftpClientFactory.clients.size() == 0
+        1 * mockSftpClient.stop()
+    }
+
+    def "Can stop multiple, released clients"() {
+        def mockSftpClient1 = Mock(LockableSftpClient)
+        def mockSftpClient2 = Mock(LockableSftpClient)
+
+        given:
+        URI uri1 = new URI('http://localhost:22/repo1')
+        URI uri2 = new URI('http://localhost:22/repo2')
+        PasswordCredentials credentials1 = new PasswordCredentials('sftp1', 'sftp1')
+        PasswordCredentials credentials2 = new PasswordCredentials('sftp2', 'sftp2')
+
+        when:
+        LockableSftpClient client1 = sftpClientFactory.createSftpClient(uri1, credentials1)
+        LockableSftpClient client2 = sftpClientFactory.createSftpClient(uri2, credentials2)
+
+        and:
+        sftpClientFactory.releaseSftpClient(client1)
+        sftpClientFactory.releaseSftpClient(client2)
+        sftpClientFactory.stop()
+
+        then:
+        sftpClientCreator.createNewClient(new SftpHost(uri1, credentials1)) >> mockSftpClient1
+        sftpClientCreator.createNewClient(new SftpHost(uri2, credentials2)) >> mockSftpClient2
+        1 * mockSftpClient1.host >> new SftpHost(uri1, credentials1)
+        1 * mockSftpClient2.host >> new SftpHost(uri2, credentials2)
+        sftpClientFactory.clients.size() == 0
+        1 * mockSftpClient1.stop()
+        1 * mockSftpClient2.stop()
+    }
+
+    def "Multiple threads can create and release a client concurrently"() {
+        def mockSftpClient = Mock(LockableSftpClient)
+
+        given:
+        URI uri = new URI('http://localhost:22/repo')
+        PasswordCredentials credentials = new PasswordCredentials('sftp', 'sftp')
+
+        when:
+        async {
+            10.times {
+                start {
+                    LockableSftpClient actualClient = sftpClientFactory.createSftpClient(uri, credentials)
+                    assert actualClient != null
+                    sftpClientFactory.releaseSftpClient(actualClient)
+                }
+            }
+        }
+
+        then:
+        sftpClientCreator.createNewClient(new SftpHost(uri, credentials)) >> mockSftpClient
+        mockSftpClient.host >> new SftpHost(uri, credentials)
+        sftpClientFactory.clients.size() > 0
+    }
+
+    def "Creates new client if currently in use by different thread"() {
+        def mockSftpClient1 = Mock(LockableSftpClient)
+        def mockSftpClient2 = Mock(LockableSftpClient)
+
+        given:
+        URI uri = new URI('http://localhost:22/repo')
+        PasswordCredentials credentials = new PasswordCredentials('sftp', 'sftp')
+        LockableSftpClient actualClient1
+        LockableSftpClient actualClient2
+
+        when:
+        async {
+            start {
+                actualClient1 = sftpClientFactory.createSftpClient(uri, credentials)
+                instant.action1
+                thread.blockUntil.action2
+                sftpClientFactory.releaseSftpClient(actualClient1)
+            }
+
+            start {
+                actualClient2 = sftpClientFactory.createSftpClient(uri, credentials)
+                instant.action2
+                thread.blockUntil.action1
+                sftpClientFactory.releaseSftpClient(actualClient2)
+            }
+        }
+
+        then:
+        1 * sftpClientCreator.createNewClient(new SftpHost(uri, credentials)) >> mockSftpClient1
+        1 * sftpClientCreator.createNewClient(new SftpHost(uri, credentials)) >> mockSftpClient2
+        1 * mockSftpClient1.host >> new SftpHost(uri, credentials)
+        1 * mockSftpClient2.host >> new SftpHost(uri, credentials)
+        sftpClientFactory.clients.size() == 2
+        actualClient1 != actualClient2
+    }
+
+    private List<SftpHost> getClientsForSftpHost(URI uri, PasswordCredentials credentials) {
+        sftpClientFactory.clients.get(new SftpHost(uri, credentials))
+    }
+}
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryCachedArtifactIndexTest.groovy b/subprojects/core-impl/src/test/resources/org/gradle/internal/resource/ivy/ArtifactAtRepositoryCachedArtifactIndexTest.groovy
similarity index 94%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryCachedArtifactIndexTest.groovy
rename to subprojects/core-impl/src/test/resources/org/gradle/internal/resource/ivy/ArtifactAtRepositoryCachedArtifactIndexTest.groovy
index fb4c8357e689..60eaa1a07e15 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/ivy/ArtifactAtRepositoryCachedArtifactIndexTest.groovy
+++ b/subprojects/core-impl/src/test/resources/org/gradle/internal/resource/ivy/ArtifactAtRepositoryCachedArtifactIndexTest.groovy
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.ivy
+package org.gradle.internal.resource.ivy
 
 import org.gradle.api.internal.artifacts.ivyservice.CacheLockingManager
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactIdentifier
-import org.gradle.api.internal.externalresource.cached.CachedArtifact
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData
+import org.gradle.internal.resource.cached.CachedArtifact
+import org.gradle.internal.resource.cached.ivy.ArtifactAtRepositoryCachedArtifactIndex
+import org.gradle.internal.resource.cached.ivy.ArtifactAtRepositoryKey
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData
 import org.gradle.cache.PersistentIndexedCache
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.BuildCommencedTimeProvider
diff --git a/subprojects/core/core.gradle b/subprojects/core/core.gradle
index 4a9667d23ab0..c02efe867e1a 100755
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-apply from: "$rootDir/gradle/providedConfiguration.gradle"
-
 configurations {
     reports
 }
@@ -26,9 +24,9 @@ dependencies {
     publishCompile libraries.slf4j_api
     publishCompile project(":baseServices")
     publishCompile project(":messaging")
+    publishCompile project(":resources")
 
     compile project(":baseServicesGroovy")
-    compile project(":resources")
     compile libraries.asm
     compile libraries.ant
     compile libraries.commons_collections
@@ -48,17 +46,6 @@ dependencies {
 
     runtime project(":docs")
 
-    compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-impl', version: '0.1.0') {
-        exclude module:'groovy-all'
-        exclude module:'groovy'
-        exclude group: 'org.slf4j'
-        exclude module: 'commons-collections'
-        exclude module: 'commons-lang'
-        exclude module: 'httpclient'
-        exclude module: 'nekohtml'
-    }
-    compile libraries.commons_httpclient // Needed by bintray client
-
     runtime libraries.log4j_to_slf4j
     runtime libraries.jcl_to_slf4j
 
@@ -71,6 +58,7 @@ dependencies {
 
     testFixturesCompile project(":internalTesting")
     testFixturesRuntime project(':coreImpl')
+    testFixturesRuntime project(':pluginUse')
 
     integTestCompile project(":internalIntegTesting")
 
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/ApplyPluginIntegSpec.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/ApplyPluginIntegSpec.groovy
index e3f3daa9f125..e602483438e8 100644
--- a/subprojects/core/src/integTest/groovy/org/gradle/api/ApplyPluginIntegSpec.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/ApplyPluginIntegSpec.groovy
@@ -89,17 +89,12 @@ class ApplyPluginIntegSpec extends AbstractIntegrationSpec {
             package com.acme
 import org.gradle.api.Project
 import org.gradle.testfixtures.ProjectBuilder
-import spock.lang.*
+import org.junit.Test
 
-class BreakingTest extends Specification {
-  Project project
-
-  def setup() {
-    project = ProjectBuilder.builder().build()
-  }
-
-  def "can evaluate ProjectBuilder"() {
-    expect:
+class BreakingTest {
+  @Test
+  void "can evaluate ProjectBuilder"() {
+    def project = ProjectBuilder.builder().build()
     project.apply(plugin: 'groovy')
     project.evaluate()
   }
@@ -117,9 +112,6 @@ class BreakingTest extends Specification {
             dependencies {
                 compile gradleApi()
                 compile localGroovy()
-                testCompile "org.spockframework:spock-core:0.7-groovy-1.8", {
-                    exclude module: "groovy-all"
-                }
             }
         '''
 
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CharacterEncodingIntegTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/BuildDefaultCharacterEncodingIntegrationTest.groovy
similarity index 95%
rename from subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CharacterEncodingIntegTest.groovy
rename to subprojects/core/src/integTest/groovy/org/gradle/api/BuildDefaultCharacterEncodingIntegrationTest.groovy
index cbb369484087..2ceb59019c76 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CharacterEncodingIntegTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/BuildDefaultCharacterEncodingIntegrationTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.gradle.integtests
+package org.gradle.api
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import spock.lang.Unroll
 
 import java.nio.charset.Charset
 
-class CharacterEncodingIntegTest extends AbstractIntegrationSpec {
+class BuildDefaultCharacterEncodingIntegrationTest extends AbstractIntegrationSpec {
 
     def executerEncoding(String inputEncoding) {
         if (inputEncoding) {
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptExecutionIntegrationSpec.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptExecutionIntegrationSpec.groovy
new file mode 100644
index 000000000000..2053295410d8
--- /dev/null
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptExecutionIntegrationSpec.groovy
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+
+class BuildScriptExecutionIntegrationSpec extends AbstractIntegrationSpec {
+    def "build scripts must be encoded using utf-8"() {
+        given:
+        executer.withDefaultCharacterEncoding("ISO-8859-15")
+
+        and:
+        buildFile.setText("""
+task check << {
+    assert java.nio.charset.Charset.defaultCharset().name() == "ISO-8859-15"
+    // embed a euro character in the text - this is encoded differently in ISO-8859-12 and UTF-8
+    assert '\u20AC'.charAt(0) == 0x20AC
+}
+""", "UTF-8")
+        assert file('build.gradle').getText("ISO-8859-15") != file('build.gradle').getText("UTF-8")
+
+        expect:
+        succeeds 'check'
+    }
+}
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildScriptExecutionIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptExecutionIntegrationTest.groovy
similarity index 99%
rename from subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildScriptExecutionIntegrationTest.groovy
rename to subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptExecutionIntegrationTest.groovy
index 4dbf474097b4..267fafcd200f 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildScriptExecutionIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/BuildScriptExecutionIntegrationTest.groovy
@@ -15,7 +15,7 @@
  */
 
 
-package org.gradle.integtests
+package org.gradle.api
 
 import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.integtests.fixtures.executer.ExecutionResult
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/ConfigurationOnDemandIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/ConfigurationOnDemandIntegrationTest.groovy
index 41e4b21495c6..4c1a628765a3 100644
--- a/subprojects/core/src/integTest/groovy/org/gradle/api/ConfigurationOnDemandIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/ConfigurationOnDemandIntegrationTest.groovy
@@ -331,4 +331,41 @@ project(':api') {
         then:
         fixture.assertProjectsConfigured(":", ":a", ":b")
     }
+
+    def "handles buildNeeded"() {
+        settingsFile << "include 'a', 'b', 'c'"
+        file("a/build.gradle") << """ apply plugin: 'java' """
+        file("b/build.gradle") << """
+            apply plugin: 'java'
+            project(':b') {
+                dependencies { compile project(':a') }
+            }
+        """
+
+        when:
+        run(":b:buildNeeded")
+
+        then:
+        result.executedTasks.containsAll ':b:buildNeeded', ':a:buildNeeded'
+        fixture.assertProjectsConfigured(":", ":b", ":a")
+    }
+
+    def "handles buildDependents"() {
+        settingsFile << "include 'a', 'b', 'c'"
+        file("a/build.gradle") << """ apply plugin: 'java' """
+        file("b/build.gradle") << """
+            apply plugin: 'java'
+            project(':b') {
+                dependencies { compile project(':a') }
+            }
+        """
+
+        when:
+        run(":a:buildDependents")
+
+        then:
+        result.executedTasks.containsAll ':b:buildDependents', ':a:buildDependents'
+        //unfortunately buildDependents requires all projects to be configured
+        fixture.assertProjectsConfigured(":", ":a", ":b", ":c")
+    }
 }
\ No newline at end of file
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptExecutionIntegrationSpec.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptExecutionIntegrationSpec.groovy
new file mode 100644
index 000000000000..d0c2c8dcdd9e
--- /dev/null
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptExecutionIntegrationSpec.groovy
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.test.fixtures.server.http.HttpServer
+
+class ExternalScriptExecutionIntegrationSpec extends AbstractIntegrationSpec {
+    @org.junit.Rule
+    public final HttpServer server = new HttpServer()
+
+    def "uses encoding specified by http server"() {
+        given:
+        executer.withDefaultCharacterEncoding("UTF-8")
+        server.start()
+
+        and:
+        def scriptFile = file("script.gradle")
+        scriptFile.setText("""
+task check << {
+    assert java.nio.charset.Charset.defaultCharset().name() == "UTF-8"
+    // embed a euro character in the text - this is encoded differently in ISO-8859-15 and UTF-8
+    assert '\u20AC'.charAt(0) == 0x20AC
+}
+""", "ISO-8859-15")
+        assert scriptFile.getText("ISO-8859-15") != scriptFile.getText("UTF-8")
+        server.expectGet('/script.gradle', scriptFile).contentType("text/plain; charset=ISO-8859-15")
+
+        and:
+        buildFile << "apply from: 'http://localhost:${server.port}/script.gradle'"
+
+        expect:
+        succeeds 'check'
+    }
+
+    def "assumes utf-8 encoding when none specified by http server"() {
+        given:
+        executer.withDefaultCharacterEncoding("ISO-8859-15")
+        server.start()
+
+        and:
+        def scriptFile = file("script.gradle")
+        scriptFile.setText("""
+task check << {
+    assert java.nio.charset.Charset.defaultCharset().name() == "ISO-8859-15"
+    // embed a euro character in the text - this is encoded differently in ISO-8859-15 and UTF-8
+    assert '\u20AC'.charAt(0) == 0x20AC
+}
+""", "UTF-8")
+        assert scriptFile.getText("ISO-8859-15") != scriptFile.getText("UTF-8")
+        server.expectGet('/script.gradle', scriptFile).contentType("text/plain")
+
+        and:
+        buildFile << "apply from: 'http://localhost:${server.port}/script.gradle'"
+
+        expect:
+        succeeds 'check'
+    }
+}
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ExternalScriptExecutionIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptExecutionIntegrationTest.groovy
similarity index 99%
rename from subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ExternalScriptExecutionIntegrationTest.groovy
rename to subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptExecutionIntegrationTest.groovy
index 973a55625900..8db5110bfd30 100755
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ExternalScriptExecutionIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/ExternalScriptExecutionIntegrationTest.groovy
@@ -15,7 +15,7 @@
  */
 
 
-package org.gradle.integtests
+package org.gradle.api
 
 import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.integtests.fixtures.executer.ArtifactBuilder
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/InitScriptExecutionIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/InitScriptExecutionIntegrationTest.groovy
similarity index 99%
rename from subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/InitScriptExecutionIntegrationTest.groovy
rename to subprojects/core/src/integTest/groovy/org/gradle/api/InitScriptExecutionIntegrationTest.groovy
index 9605e00ced4c..ee98407341a9 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/InitScriptExecutionIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/InitScriptExecutionIntegrationTest.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests
+package org.gradle.api
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.integtests.fixtures.executer.ArtifactBuilder
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/SettingsScriptExecutionIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/SettingsScriptExecutionIntegrationTest.groovy
similarity index 98%
rename from subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/SettingsScriptExecutionIntegrationTest.groovy
rename to subprojects/core/src/integTest/groovy/org/gradle/api/SettingsScriptExecutionIntegrationTest.groovy
index 67de4a7cbc89..52453652cb02 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/SettingsScriptExecutionIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/SettingsScriptExecutionIntegrationTest.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests
+package org.gradle.api
 
 import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.integtests.fixtures.executer.ArtifactBuilder
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/dsl/FilteringPluginsByIdIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/dsl/FilteringPluginsByIdIntegrationTest.groovy
new file mode 100644
index 000000000000..720f038f4aa0
--- /dev/null
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/dsl/FilteringPluginsByIdIntegrationTest.groovy
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2010 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.dsl
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+
+class FilteringPluginsByIdIntegrationTest extends AbstractIntegrationSpec {
+
+    def "filters plugins by id"() {
+        buildFile << """
+            def operations = []
+            plugins.withId("java") {
+                operations << 'withId for ' + it.class.simpleName
+            }
+            operations << "applying"
+            apply plugin: 'java'
+            operations << "applied"
+
+            task verify << { assert operations == ['applying', 'withId for JavaPlugin', 'applied'] }
+        """
+
+        expect:
+        run("verify")
+    }
+}
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/ArchiveIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/ArchiveIntegrationTest.groovy
index 9637d29c1e57..895465b699de 100644
--- a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/ArchiveIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/ArchiveIntegrationTest.groovy
@@ -20,6 +20,7 @@ import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.integtests.fixtures.TestResources
 import org.gradle.test.fixtures.archive.TarTestFixture
 import org.gradle.test.fixtures.file.TestFile
+import org.hamcrest.Matchers
 import org.junit.Rule
 
 import static org.hamcrest.Matchers.equalTo
@@ -230,9 +231,9 @@ public class ArchiveIntegrationTest extends AbstractIntegrationSpec {
 '''
         when:
         def failure = runAndFail('copy')
+
         then:
-        assert failure.error.contains("Unable to expand TAR")
-        assert failure.error.contains("compression based on the file extension")
+        failure.assertThatDescription(Matchers.startsWith("Unable to expand TAR"))
     }
 
     def cannotCreateAnEmptyZip() {
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CopyTaskIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CopyTaskIntegrationTest.groovy
index 9d43b3da4788..83944b8aa676 100644
--- a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CopyTaskIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/CopyTaskIntegrationTest.groovy
@@ -19,6 +19,7 @@ import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.integtests.fixtures.TestResources
 import org.gradle.test.fixtures.file.TestFile
 import org.gradle.util.Matchers
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
@@ -164,7 +165,8 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         )
     }
 
-    @Test public void copySingleFiles() {
+    @Test
+    public void copySingleFiles() {
         TestFile buildFile = testFile("build.gradle").writelns(
                 "task copyIt << {",
                 "   copy {",
@@ -185,7 +187,8 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
      * If these filters are chained in the correct order, you should get 6, 11, and 16
      */
 
-    @Test public void copyMultipleFilterTest() {
+    @Test
+    public void copyMultipleFilterTest() {
         TestFile buildFile = testFile('build.gradle').writelns(
                 """task (copy, type:Copy) {
                    into 'dest'
@@ -205,7 +208,8 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         assertThat(it.next(), startsWith('16'))
     }
 
-    @Test public void chainedTransformations() {
+    @Test
+    public void chainedTransformations() {
         def buildFile = testFile('build.gradle') << '''
             task copy(type: Copy) {
                 into 'dest'
@@ -237,7 +241,8 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         assertThat(it.next(), equalTo('[prefix: line 2]'))
     }
 
-    @Test public void testCopyFromFileTree() {
+    @Test
+    public void testCopyFromFileTree() {
         TestFile buildFile = testFile("build.gradle").writelns(
                 """task cpy << {
                    copy {
@@ -257,7 +262,8 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         )
     }
 
-    @Test public void testCopyFromFileCollection() {
+    @Test
+    public void testCopyFromFileCollection() {
         TestFile buildFile = testFile("build.gradle").writelns(
                 """task copy << {
                    copy {
@@ -279,7 +285,8 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         )
     }
 
-    @Test public void testCopyFromCompositeFileCollection() {
+    @Test
+    public void testCopyFromCompositeFileCollection() {
         testFile('a.jar').touch()
 
         TestFile buildFile = testFile("build.gradle").writelns(
@@ -304,7 +311,8 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         )
     }
 
-    @Test public void testCopyFromTask() {
+    @Test
+    public void testCopyFromTask() {
         TestFile buildFile = testFile("build.gradle").writelns(
                 """
                     configurations { compile }
@@ -337,7 +345,8 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         )
     }
 
-    @Test public void testCopyFromTaskOutputs() {
+    @Test
+    public void testCopyFromTaskOutputs() {
         TestFile buildFile = testFile("build.gradle").writelns(
                 """
                         configurations { compile }
@@ -370,10 +379,11 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         )
     }
 
-    @Test public void testCopyWithCopyspec() {
+    @Test
+    public void testCopyWithCopyspec() {
         TestFile buildFile = testFile("build.gradle").writelns(
                 """
-                def spec = copySpec {
+                def parentSpec = copySpec {
                     from 'src'
                     exclude '**/ignore/**'
                     include '*/*.a'
@@ -381,16 +391,116 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
                 }
                 task copy(type: Copy) {
                     into 'dest'
-                    with spec
+                    with parentSpec
+                }"""
+        )
+        usingBuildFile(buildFile).withTasks("copy").run()
+        testFile('dest').assertHasDescendants(
+                'subdir/one/one.a',
+                'subdir/two/two.a'
+        )
+    }
+
+    @Test
+    public void testTransformWithCopyspec() {
+        TestFile buildFile = testFile("build.gradle").writelns(
+                """
+                def parentSpec = copySpec {
+                    from 'src'
+                    include '*/*.a'
+                    into 'subdir'
+                    eachFile { fcd -> fcd.relativePath = fcd.relativePath.prepend('transformedAgain')}
+                }
+                task copy(type: Copy) {
+                    into 'dest'
+                    with parentSpec
+                    eachFile { fcd -> fcd.relativePath = fcd.relativePath.prepend('transformed') }
+                }"""
+        )
+        usingBuildFile(buildFile).withTasks("copy").run()
+        testFile('dest').assertHasDescendants(
+                'transformedAgain/transformed/subdir/one/one.a',
+                'transformedAgain/transformed/subdir/two/two.a'
+        )
+    }
+
+    @Test
+    @Ignore //this does not pass with current implementation
+    public void testIncludeExcludeWithCopyspec() {
+        TestFile buildFile = testFile("build.gradle").writelns(
+                """
+                def parentSpec = copySpec {
+                    from 'src'
+                    include '**/one/**'
+                    exclude '**/ignore/**'
+                    into 'subdir'
+                }
+                task copy(type: Copy) {
+                    into 'dest'
+                    include '**/two/**'
+                    exclude '**/*.b'
+                    with parentSpec
                 }"""
         )
         usingBuildFile(buildFile).withTasks("copy").run()
         testFile('dest').assertHasDescendants(
                 'subdir/one/one.a',
+                'subdir/one/sub/onesub.a',
                 'subdir/two/two.a'
         )
     }
 
+    /*
+   * two.a starts off with "$one\n${one+1}\n${one+1+1}\n"
+   * If these filters are chained in the correct order, you should get 6, 11, and 16
+   */
+
+    @Test
+    public void testMultipleFilterWithCopyspec() {
+        TestFile buildFile = testFile('build.gradle').writelns(
+                """
+                  def parentSpec = copySpec {
+                    from('src/two/two.a')
+                    filter { (Integer.parseInt(it) / 2) as String }
+                  }
+                  task (copy, type:Copy) {
+                   into 'dest'
+                   expand(one: 1)
+                   filter { (Integer.parseInt(it) * 10) as String }
+                   filter { (Integer.parseInt(it) + 2) as String }
+                   with parentSpec
+                }
+                """
+        )
+        usingBuildFile(buildFile).withTasks("copy").run()
+        Iterator<String> it = testFile('dest/two.a').readLines().iterator()
+        assertThat(it.next(), startsWith('6'))
+        assertThat(it.next(), startsWith('11'))
+        assertThat(it.next(), startsWith('16'))
+    }
+
+    @Test
+    void testRenameWithCopySpec() {
+        TestFile buildFile = testFile("build.gradle") << '''
+            def parentSpec = copySpec {
+               from 'src/one'
+               exclude '**/ignore/**'
+               rename '(.*).b$', '$1.renamed'
+            }
+            task (copy, type:Copy) {
+               with parentSpec
+               into 'dest'
+               rename { it.startsWith('one.') ? "renamed_$it" : it }
+            }'''
+        usingBuildFile(buildFile).withTasks("copy").run()
+        testFile('dest').assertHasDescendants(
+                'renamed_one.renamed',
+                'renamed_one.a',
+                'sub/onesub.renamed',
+                'sub/onesub.a',
+        )
+    }
+
     // can't use TestResources here because Git doesn't support committing empty directories
     @Test
     void emptyDirsAreCopiedByDefault() {
@@ -492,7 +602,7 @@ public class CopyTaskIntegrationTest extends AbstractIntegrationTest {
         file('path/bcd.txt').createFile()
 
         def buildFile = testFile('build.gradle') <<
-            '''
+                '''
             task copy(type: Copy) {
                 from 'path'
                 into 'dest'
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/ExecutionTimeTaskConfigurationIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/ExecutionTimeTaskConfigurationIntegrationTest.groovy
index 110fd58774a6..9855a09ec549 100644
--- a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/ExecutionTimeTaskConfigurationIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/ExecutionTimeTaskConfigurationIntegrationTest.groovy
@@ -96,69 +96,69 @@ class ExecutionTimeTaskConfigurationIntegrationTest extends AbstractIntegrationS
         then:
         succeeds("bar", "foo")
 
-        output.contains("Calling Task.doFirst(Action) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.doFirst(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.doLast(Action) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.doLast(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.getActions().add() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.getActions().addAll() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.getActions().set(int, Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.getActions().remove() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.getActions().removeAll() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.getActions().clear() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.onlyIf(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.setActions(Actions<Task>) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.dependsOn(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.setDependsOn(Iterable) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.setOnlyIf(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.setOnlyIf(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.onlyIf(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.setEnabled(boolean) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling Task.deleteAllActions() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskInputs.dir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskInputs.files(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskInputs.file(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskInputs.property(String, Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskInputs.properties(Map) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskInputs.source(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskInputs.sourceDir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskOutputs.upToDateWhen(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskOutputs.upToDateWhen(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskOutputs.file(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskOutputs.files(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
-        output.contains("Calling TaskOutputs.dir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.doFirst(Action) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.doFirst(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.doLast(Action) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.doLast(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.getActions().add() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.getActions().addAll() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.getActions().set(int, Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.getActions().remove() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.getActions().removeAll() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.getActions().clear() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.onlyIf(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.setActions(Actions<Task>) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.dependsOn(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.setDependsOn(Iterable) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.setOnlyIf(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.setOnlyIf(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.onlyIf(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.setEnabled(boolean) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling Task.deleteAllActions() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskInputs.dir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskInputs.files(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskInputs.file(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskInputs.property(String, Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskInputs.properties(Map) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskInputs.source(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskInputs.sourceDir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskOutputs.upToDateWhen(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskOutputs.upToDateWhen(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskOutputs.file(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskOutputs.files(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
+        output.contains("Calling TaskOutputs.dir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':bar'.$NL")
         and:
 
-        output.contains("Calling Task.doFirst(Action) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.doFirst(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.doLast(Action) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.doLast(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.getActions().add() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.getActions().addAll() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.getActions().set(int, Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.getActions().remove() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.getActions().removeAll() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.getActions().clear() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.onlyIf(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.setActions(Actions<Task>) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.dependsOn(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.setDependsOn(Iterable) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.setOnlyIf(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.setOnlyIf(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.onlyIf(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.setEnabled(boolean) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling Task.deleteAllActions() after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskInputs.dir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskInputs.files(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskInputs.file(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskInputs.property(String, Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskInputs.properties(Map) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskInputs.source(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskInputs.sourceDir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskOutputs.upToDateWhen(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskOutputs.upToDateWhen(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskOutputs.file(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskOutputs.files(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
-        output.contains("Calling TaskOutputs.dir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 2.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.doFirst(Action) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.doFirst(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.doLast(Action) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.doLast(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.getActions().add() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.getActions().addAll() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.getActions().set(int, Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.getActions().remove() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.getActions().removeAll() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.getActions().clear() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.onlyIf(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.setActions(Actions<Task>) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.dependsOn(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.setDependsOn(Iterable) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.setOnlyIf(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.setOnlyIf(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.onlyIf(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.setEnabled(boolean) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling Task.deleteAllActions() after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskInputs.dir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskInputs.files(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskInputs.file(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskInputs.property(String, Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskInputs.properties(Map) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskInputs.source(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskInputs.sourceDir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskOutputs.upToDateWhen(Closure) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskOutputs.upToDateWhen(Spec) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskOutputs.file(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskOutputs.files(Object...) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
+        output.contains("Calling TaskOutputs.dir(Object) after task execution has started has been deprecated and is scheduled to be removed in Gradle 3.0. Check the configuration of task ':foo'. You may have misused '<<' at task declaration.$NL")
     }
 }
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTaskIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/FailingIncrementalTasksIntegrationTest.groovy
similarity index 94%
rename from subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTaskIntegrationTest.groovy
rename to subprojects/core/src/integTest/groovy/org/gradle/api/tasks/FailingIncrementalTasksIntegrationTest.groovy
index bcb82bd8d95f..510d93f082df 100644
--- a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTaskIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/FailingIncrementalTasksIntegrationTest.groovy
@@ -18,7 +18,7 @@ package org.gradle.api.tasks
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 
-class IncrementalTaskIntegrationTest extends AbstractIntegrationSpec {
+class FailingIncrementalTasksIntegrationTest extends AbstractIntegrationSpec {
 
     def "consecutively failing task has correct up-to-date status and failure"() {
         buildFile << """
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalBuildIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalBuildIntegrationTest.groovy
similarity index 99%
rename from subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalBuildIntegrationTest.groovy
rename to subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalBuildIntegrationTest.groovy
index 0c075fc6f813..4e280f059e89 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalBuildIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalBuildIntegrationTest.groovy
@@ -16,7 +16,7 @@
 
 
 
-package org.gradle.integtests
+package org.gradle.api.tasks
 
 import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.integtests.fixtures.TestResources
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalTasksIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTasksIntegrationTest.groovy
similarity index 99%
rename from subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalTasksIntegrationTest.groovy
rename to subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTasksIntegrationTest.groovy
index 036cddee7835..ce0ff49c5eaa 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/IncrementalTasksIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/IncrementalTasksIntegrationTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.integtests
+package org.gradle.api.tasks
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 
 class IncrementalTasksIntegrationTest extends AbstractIntegrationSpec {
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/TaskInputPropertiesIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/TaskInputPropertiesIntegrationTest.groovy
new file mode 100644
index 000000000000..99caba5973cd
--- /dev/null
+++ b/subprojects/core/src/integTest/groovy/org/gradle/api/tasks/TaskInputPropertiesIntegrationTest.groovy
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.tasks
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+
+class TaskInputPropertiesIntegrationTest extends AbstractIntegrationSpec {
+
+    def "reports which properties are not serializable"() {
+        buildFile << """
+            task foo {
+                inputs.property "a", "hello"
+                inputs.property "b", new Foo()
+                outputs.file "foo.txt"
+                doLast { file("foo.txt") << "" }
+            }
+
+            class Foo {
+                int x
+                String toString() { "xxx" }
+            }
+        """
+
+        when: fails "foo"
+        then: failure.assertHasCause("Unable to store task input properties. Property 'b' with value 'xxx")
+    }
+
+    def "deals gracefully with not serializable contents of GStrings"() {
+        buildFile << """
+            task foo {
+                inputs.property "a", "hello \${new Foo()}"
+                outputs.file "foo.txt"
+                doLast { file("foo.txt") << "" }
+            }
+
+            class Foo {
+                int x
+                String toString() { "xxx" }
+            }
+        """
+
+        expect:
+        run("foo").assertTaskNotSkipped(":foo")
+        run("foo").assertTaskSkipped(":foo")
+    }
+}
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/plugin/PluginHandlerScriptIntegTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/plugin/PluginHandlerScriptIntegTest.groovy
deleted file mode 100644
index 81bfed362a5a..000000000000
--- a/subprojects/core/src/integTest/groovy/org/gradle/plugin/PluginHandlerScriptIntegTest.groovy
+++ /dev/null
@@ -1,554 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.tasks.TaskAction
-import org.gradle.integtests.fixtures.AbstractIntegrationSpec
-import org.gradle.test.fixtures.bintray.BintrayApi
-import org.gradle.test.fixtures.bintray.BintrayTestServer
-import org.gradle.test.fixtures.plugin.PluginBuilder
-import org.gradle.util.GradleVersion
-import org.junit.Rule
-
-import static org.gradle.util.TextUtil.toPlatformLineSeparators
-
-class PluginHandlerScriptIntegTest extends AbstractIntegrationSpec {
-
-    private static final String SCRIPT = "plugins { println 'in' }; println 'out'"
-
-    @Rule BintrayTestServer bintray = new BintrayTestServer(executer, mavenRepo) // provides a double for JCenter
-
-    int pluginCounter = 0
-
-    def pluginMessage = "from plugin"
-    def pluginTaskName = "pluginTask"
-    def pluginVersion = "1.0"
-
-    PluginBuilder pluginBuilder() {
-        new PluginBuilder(executer, file("plugin${++pluginCounter}"))
-    }
-
-    def setup() {
-        executer.requireOwnGradleUserHomeDir() // to negate caching effects
-    }
-
-    def "build scripts have plugin blocks"() {
-        when:
-        buildFile << SCRIPT
-
-        then:
-        executesCorrectly()
-    }
-
-    def "settings scripts have plugin blocks"() {
-        when:
-        settingsFile << SCRIPT
-
-        then:
-        executesCorrectly()
-    }
-
-    def "init scripts have plugin blocks"() {
-        def initScript = file("init.gradle")
-
-        when:
-        initScript << SCRIPT
-
-        then:
-        args "-I", initScript.absolutePath
-        executesCorrectly()
-    }
-
-    def "cannot use plugin block when script target is not plugin capable"() {
-        buildFile << """
-            task foo {}
-            apply {
-                from "plugin.gradle"
-                to foo
-            }
-        """
-
-        file("plugin.gradle") << """
-            plugins {
-                apply plugin: "foo"
-            }
-        """
-
-        when:
-        fails "foo"
-
-        then:
-        errorOutput.contains("cannot have plugins applied to it")
-    }
-
-
-    def void executesCorrectly() {
-        succeeds "tasks"
-        assert output.contains(toPlatformLineSeparators("in\nout\n"))
-    }
-
-    void "plugins block has no implicit access to owner context"() {
-        when:
-        buildScript """
-            plugins {
-                try {
-                    buildscript {}
-                } catch(MissingMethodException e) {
-                    // ok
-                }
-
-                try {
-                    version
-                } catch(MissingPropertyException e) {
-                    // ok
-                }
-
-                assert delegate == null
-                assert this instanceof ${PluginHandler.name}
-                assert owner == this
-
-                println "end-of-plugins"
-            }
-        """
-
-        then:
-        succeeds "tasks"
-        and:
-        output.contains("end-of-plugins")
-    }
-
-    void "can resolve core plugins"() {
-        when:
-        buildScript """
-            plugins {
-              apply plugin: 'java'
-            }
-        """
-
-        then:
-        succeeds "javadoc"
-    }
-
-    void "core plugins cannot have a version number"() {
-        given:
-        buildScript """
-            plugins {
-                apply plugin: "java", version: "1.0"
-            }
-        """
-
-        when:
-        fails "tasks"
-
-        then:
-        failure.assertHasCause("Plugin 'java' is a core Gradle plugin, which cannot be specified with a version number")
-    }
-
-    def void publishPluginToBintray(PluginBuilder pluginBuilder, String group, String name, String version = pluginVersion) {
-        def module = bintray.jcenter.module(group, name, version)
-        module.allowAll()
-        def artifact = module.artifact([:])
-        module.publish()
-        pluginBuilder.publishTo(artifact.file)
-    }
-
-    void "can use plugin classes in script"() {
-        given:
-        bintray.start()
-        def pb = pluginBuilder()
-        pb.groovy("EchoTask.groovy") << """
-            package $pb.packageName
-
-            class EchoTask extends ${DefaultTask.name} {
-                @${TaskAction.name}
-                void doEcho() {
-                    println "$pluginMessage"
-                }
-            }
-        """
-
-        pb.addPlugin("", "test")
-        publishPluginToBintray(pb, "test", "test")
-        bintray.api.expectPackageSearch("test", new BintrayApi.FoundPackage("foo", "test:test"))
-
-        buildScript """
-          plugins {
-            apply plugin: "test", version: "$pluginVersion"
-          }
-
-          task echo(type: ${pb.packageName}.EchoTask) {}
-        """
-
-        when:
-        succeeds "echo"
-
-        then:
-        output.contains pluginMessage
-    }
-
-    void "plugins block does not leak into build script proper"() {
-        given:
-        buildFile << """
-            configurations {
-                plugins {
-                    transitive = false // just use some configuration specific API here
-                }
-            }
-
-            task showConfigurationsSize << {
-                println "configurations: " + configurations.size()
-                println "plugins transitive: " + configurations.plugins.transitive
-            }
-        """
-
-        when:
-        succeeds "sCS"
-
-        then:
-        output.contains("configurations: 1")
-        output.contains("plugins transitive: false")
-    }
-
-    def "buildscript blocks are allowed before plugin statements"() {
-        when:
-        buildScript """
-            buildscript {}
-            plugins {}
-        """
-
-        then:
-        succeeds "tasks"
-    }
-
-    def "buildscript blocks are not allowed after plugin blocks"() {
-        when:
-        buildScript """
-            plugins {}
-            buildscript {}
-        """
-
-        then:
-        fails "tasks"
-
-        and:
-        failure.assertHasLineNumber 3
-        errorOutput.contains("all buildscript {} blocks must appear before any plugins {} blocks")
-    }
-
-    def "build logic cannot precede plugins block"() {
-        when:
-        buildScript """
-            someThing()
-            plugins {}
-        """
-
-        then:
-        fails "tasks"
-
-        and:
-        failure.assertHasLineNumber 3
-        errorOutput.contains "only buildscript {} and and other plugins {} script blocks are allowed before plugins {} blocks, no other statements are allowed"
-    }
-
-    def "build logic cannot precede any plugins block"() {
-        when:
-        buildScript """
-            plugins {}
-            someThing()
-            plugins {}
-        """
-
-        then:
-        fails "tasks"
-
-        and:
-        failure.assertHasLineNumber 4
-        errorOutput.contains "only buildscript {} and and other plugins {} script blocks are allowed before plugins {} blocks, no other statements are allowed"
-    }
-
-    def "failed resolution provides helpful error message"() {
-        given:
-        bintray.start()
-
-        buildScript """
-            plugins {
-                apply plugin: "foo"
-            }
-        """
-
-        and:
-        bintray.api.expectPackageSearch("foo")
-
-        when:
-        fails "tasks"
-
-        then:
-        errorOutput.contains "Cannot resolve plugin request [plugin: 'foo'] from plugin repositories:"
-        errorOutput.contains "- Gradle Distribution Plugins (listing: http://gradle.org/docs/${GradleVersion.current().version}/userguide/standard_plugins.html)"
-        errorOutput.contains "- Gradle Bintray Plugin Repository (listing: https://bintray.com/gradle-plugins-development/gradle-plugins)"
-    }
-
-    private publishTestPlugin() {
-        def pluginBuilder = new PluginBuilder(executer, testDirectory.file("plugin"))
-
-        def module = mavenRepo.module("plugin", "plugin")
-        def artifactFile = module.artifact([:]).artifactFile
-        module.publish()
-
-        def message = "from plugin"
-        def taskName = "pluginTask"
-        pluginBuilder.addPluginWithPrintlnTask(taskName, message, "plugin")
-        pluginBuilder.publishTo(artifactFile)
-    }
-
-    private testPluginBuildscriptBlock() {
-        return """
-            buildscript {
-                repositories {
-                    maven { url "$mavenRepo.uri" }
-                }
-                dependencies {
-                    classpath "plugin:plugin:1.0"
-                }
-            }
-        """
-    }
-
-    private testPluginPluginsBlock() {
-        return """
-            plugins {
-                apply plugin: "plugin", version: "1.0"
-            }
-        """
-    }
-
-    def "cannot apply plugins added to buildscript classpath in plugins block"() {
-        given:
-        publishTestPlugin()
-
-        when:
-        buildScript """
-            ${testPluginBuildscriptBlock()}
-            ${testPluginPluginsBlock()}
-        """
-
-        then:
-        fails "tasks"
-
-        and:
-        errorOutput.contains "Plugin 'plugin' is already on the script classpath (plugins on the script classpath cannot be used in a plugins {} block; move \"apply plugin: 'plugin'\" outside of the plugins {} block)"
-    }
-
-    def "cannot apply plugins added to parent buildscript classpath in plugins block"() {
-        given:
-        publishTestPlugin()
-
-        when:
-        buildScript """
-            ${testPluginBuildscriptBlock()}
-        """
-
-        settingsFile << "include 'sub'"
-
-        file("sub/build.gradle") << """
-            ${testPluginPluginsBlock()}
-        """
-
-        then:
-        fails "sub:tasks"
-
-        and:
-        errorOutput.contains "Plugin 'plugin' is already on the script classpath (plugins on the script classpath cannot be used in a plugins {} block; move \"apply plugin: 'plugin'\" outside of the plugins {} block)"
-    }
-
-    def "plugin classes are reused across projects and resolution is cached"() {
-        when:
-        bintray.start()
-        def pb = pluginBuilder().addPlugin("", "test")
-        publishPluginToBintray(pb, "test", "test")
-
-        // Only receiving one search request verifies that the result is cached
-        bintray.api.expectPackageSearch("test", new BintrayApi.FoundPackage("foo", "test:test"))
-
-        settingsFile << "include 'sub1', 'sub2'"
-
-        ["sub1/build.gradle", "sub2/build.gradle", "build.gradle"].each {
-            file(it) << """
-                plugins {
-                    apply plugin: "test", version: "$pluginVersion"
-                }
-                ext.pluginClass = org.gradle.test.TestPlugin
-            """
-        }
-
-        file("build.gradle") << """
-            evaluationDependsOnChildren()
-
-            pluginClass.is project(":sub1").pluginClass
-            pluginClass.is project(":sub2").pluginClass
-            project(":sub1").pluginClass.is project(":sub2").pluginClass
-        """
-
-        then:
-        succeeds "tasks"
-    }
-
-    def "classes from plugin block are not visible to classes from buildscript block"() {
-        given:
-        def pb1 = pluginBuilder()
-        def pb2 = pluginBuilder()
-
-        pb1.addPlugin("getClass().classLoader.loadClass('org.gradle.test.PluginOne')", "p1", "PluginOne")
-        pb2.addPlugin("getClass().classLoader.loadClass('org.gradle.test.PluginOne')", "p2", "PluginTwo")
-
-        bintray.start()
-
-        publishPluginToBintray(pb1, "p1", "p1")
-        bintray.api.expectPackageSearch("p1", new BintrayApi.FoundPackage(pluginVersion, "p1:p1"))
-
-        publishPluginToBintray(pb2, "p2", "p2")
-
-        when:
-        settingsFile << "rootProject.name = 'tp'"
-        buildScript """
-            buildscript {
-                repositories {
-                    jcenter()
-                }
-                dependencies {
-                    classpath "p2:p2:$pluginVersion"
-                }
-            }
-            plugins {
-                apply plugin: "p1", version: "1.0"
-            }
-
-            apply plugin: "p2"
-        """
-
-        then:
-        fails "tasks"
-
-        and:
-        failure.assertHasDescription("A problem occurred evaluating root project 'tp'.")
-        failure.assertHasCause("org.gradle.test.PluginOne") // message of ClassNotFoundException
-        failure.assertHasLineNumber(14) // asserts that  'apply plugin: "p2"' is the line that fails
-    }
-
-    def "plugin classes are not available to child projects"() {
-        given:
-        bintray.start()
-        def pb = pluginBuilder().addPlugin("", "plugin")
-        publishPluginToBintray(pb, "plugin", "plugin")
-        bintray.api.expectPackageSearch("plugin", new BintrayApi.FoundPackage(pluginVersion, "plugin:plugin"))
-
-        when:
-        settingsFile << "include 'child'"
-        buildScript """
-            ${testPluginPluginsBlock()}
-            import org.gradle.test.TestPlugin
-        """
-        file("child/build.gradle") << """
-            import org.gradle.test.TestPlugin
-        """
-
-        then:
-        fails "tasks"
-
-        and:
-        failure.assertHasDescription("Could not compile build file '${file("child/build.gradle")}'.")
-    }
-
-    def "plugins cannot be applied by child projects"() {
-        given:
-        bintray.start()
-        def pb = pluginBuilder().addPlugin("", "plugin")
-        publishPluginToBintray(pb, "plugin", "plugin")
-        bintray.api.expectPackageSearch("plugin", new BintrayApi.FoundPackage(pluginVersion, "plugin:plugin"))
-
-        when:
-        settingsFile << "include 'child'"
-        buildScript """
-            ${testPluginPluginsBlock()}
-            import org.gradle.test.TestPlugin
-        """
-        file("child/build.gradle") << """
-            apply plugin: 'plugin'
-        """
-
-        then:
-        fails "tasks"
-
-        and:
-        failure.assertHasDescription("A problem occurred evaluating project ':child'.")
-        failure.assertHasCause("Plugin with id 'plugin' not found.")
-    }
-
-    def "plugins added via plugins block cannot be applied with project.apply"() {
-        given:
-        bintray.start()
-        def pb = pluginBuilder().addPlugin("project.task('foo')", "plugin")
-        publishPluginToBintray(pb, "plugin", "plugin")
-        bintray.api.expectPackageSearch("plugin", new BintrayApi.FoundPackage(pluginVersion, "plugin:plugin"))
-
-        when:
-        settingsFile << 'rootProject.name = "tp"'
-        buildScript """
-            ${testPluginPluginsBlock()}
-            apply plugin: 'plugin'
-        """
-
-        then:
-        fails "tasks"
-
-        and:
-        failure.assertHasDescription("A problem occurred evaluating root project 'tp'.")
-        failure.assertHasCause("Plugin with id 'plugin' not found.")
-    }
-
-    def "plugins added in root buildscript can be applied in subprojects"() {
-        given:
-        executer.withEagerClassLoaderCreationCheckDisabled()
-        pluginBuilder().addPlugin("project.task('foo')", "plugin").publishTo(mavenRepo.module("g", "a").artifactFile)
-
-        settingsFile << "include 'sub'"
-
-        buildScript """
-            buildscript {
-                repositories {
-                    maven { url "$mavenRepo.uri" }
-                }
-                dependencies {
-                    classpath "g:a:1.0"
-                }
-            }
-
-            apply plugin: 'plugin'
-
-            subprojects {
-                apply plugin: 'plugin'
-            }
-        """
-
-        when:
-        succeeds "sub:foo"
-
-        then:
-        ":sub:foo" in executedTasks
-    }
-}
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/plugin/ScriptPluginClassLoadingIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/plugin/ScriptPluginClassLoadingIntegrationTest.groovy
index 058edd537ab6..a85ea4f43ea3 100644
--- a/subprojects/core/src/integTest/groovy/org/gradle/plugin/ScriptPluginClassLoadingIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/plugin/ScriptPluginClassLoadingIntegrationTest.groovy
@@ -17,10 +17,15 @@
 package org.gradle.plugin
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.test.fixtures.plugin.PluginBuilder
 import spock.lang.Issue
 
+import static org.gradle.util.Matchers.containsText
+
 class ScriptPluginClassLoadingIntegrationTest extends AbstractIntegrationSpec {
 
+    def pluginBuilder = new PluginBuilder(file("plugin"))
+
     @Issue("http://issues.gradle.org/browse/GRADLE-3069")
     def "second level and beyond script plugins have same class loader scope as original target"() {
         when:
@@ -51,4 +56,223 @@ class ScriptPluginClassLoadingIntegrationTest extends AbstractIntegrationSpec {
         succeeds "sayMessageFrom1", "sayMessageFrom2", "sayMessageFrom3"
         output.contains "hello"
     }
+
+    @Issue("http://issues.gradle.org/browse/GRADLE-3079")
+    def "methods defined in script are available to used script plugins"() {
+        given:
+        buildScript """
+          def addTask(project) {
+            project.tasks.create("hello").doLast { println "hello from method" }
+          }
+
+          apply from: "script.gradle"
+        """
+
+        file("script.gradle") << "addTask(project)"
+
+        when:
+        succeeds "hello"
+
+        then:
+        output.contains "hello from method"
+    }
+
+    def "methods defined in script plugin are not inherited by applied script plugin"() {
+        given:
+        buildScript """
+            apply from: "script1.gradle"
+        """
+
+        file("script1.gradle") << """
+            def someMethod() {}
+            apply from: "script2.gradle"
+        """
+
+        file("script2.gradle") << """
+            someMethod()
+        """
+
+        when:
+        fails "tasks"
+
+        then:
+        failure.assertHasFileName("Script '${file("script2.gradle").absolutePath}'")
+        failure.assertThatCause(containsText("Could not find method someMethod()"))
+    }
+
+    def "methods defined in settings script are not inherited by scripts"() {
+        given:
+        settingsFile << """
+            def someMethod() {}
+        """
+
+        buildScript """
+            someMethod()
+        """
+
+        when:
+        fails "tasks"
+
+        then:
+        failure.assertHasFileName("Build file '${buildFile.absolutePath}'")
+        failure.assertThatCause(containsText("Could not find method someMethod()"))
+    }
+
+    def "methods defined in init script are not inherited by scripts"() {
+        given:
+        file("init.gradle") << """
+            def someMethod() {}
+        """
+
+        buildScript """
+            someMethod()
+        """
+
+        when:
+        fails "tasks", "-I", file("init.gradle").absolutePath
+
+        then:
+        failure.assertHasFileName("Build file '${buildFile.absolutePath}'")
+        failure.assertThatCause(containsText("Could not find method someMethod()"))
+    }
+
+    def "methods defined in a build script are visible to scripts applied to sub projects"() {
+        given:
+        settingsFile << "include 'sub'"
+
+        buildScript """
+            def someMethod() {
+                println "from some method"
+            }
+        """
+
+        file("sub/build.gradle") << "apply from: 'script.gradle'"
+        file("sub/script.gradle") << "someMethod()"
+
+        when:
+        run "tasks"
+
+        then:
+        output.contains("from some method")
+    }
+
+    @Issue("http://issues.gradle.org/browse/GRADLE-3082")
+    def "can use apply block syntax to apply multiple scripts"() {
+        given:
+        buildScript """
+          apply {
+            from "script1.gradle"
+            from "script2.gradle"
+          }
+        """
+
+        file("script1.gradle") << "task hello1 << { println 'hello from script1' }"
+        file("script2.gradle") << "task hello2 << { println 'hello from script2' }"
+
+        when:
+        succeeds "hello1", "hello2"
+
+        then:
+        output.contains "hello from script1"
+        output.contains "hello from script2"
+    }
+
+    def "separate classloaders are used when using multi apply syntax"() {
+        given:
+        buildScript """
+          apply {
+            from "script1.gradle"
+            from "script2.gradle"
+          }
+        """
+
+        file("script1.gradle") << "class Foo {}"
+        file("script2.gradle") << "new Foo()"
+
+        when:
+        fails "tasks"
+
+        then:
+        failure.assertHasFileName("Script '${file("script2.gradle").absolutePath}'")
+        failure.assertThatCause(containsText("unable to resolve class Foo"))
+    }
+
+    def "script plugin buildscript does not affect client"() {
+        given:
+        def jar = file("plugin.jar")
+        pluginBuilder.addPlugin("project.task('hello')")
+        pluginBuilder.publishTo(executer, jar)
+
+        settingsFile << "include 'sub'"
+
+        buildScript """
+            apply from: "script.gradle"
+
+            try {
+                getClass().classLoader.loadClass(pluginClass.name)
+                assert false
+            } catch (ClassNotFoundException ignore) {
+                println "not in root"
+            }
+
+        """
+
+        file("script.gradle") << """
+          buildscript {
+            dependencies { classpath files("plugin.jar") }
+          }
+
+          apply plugin: org.gradle.test.TestPlugin
+          ext.pluginClass = org.gradle.test.TestPlugin
+        """
+
+        file("sub/build.gradle") << """
+            try {
+                getClass().classLoader.loadClass(pluginClass.name)
+                assert false
+            } catch (ClassNotFoundException ignore) {
+                println "not in sub"
+            }
+        """
+
+        when:
+        succeeds "hello"
+
+        then:
+        output.contains "not in root"
+        output.contains "not in sub"
+    }
+
+    def "script plugin cannot access classed added by buildscript in applying script"() {
+        given:
+        def jar = file("plugin.jar")
+        pluginBuilder.addPlugin("project.task('hello')")
+        pluginBuilder.publishTo(executer, jar)
+
+        buildScript """
+            buildscript {
+                dependencies { classpath files("plugin.jar") }
+            }
+
+            apply plugin: org.gradle.test.TestPlugin
+            ext.pluginClass = org.gradle.test.TestPlugin
+
+            apply from: "script.gradle"
+        """
+
+        file("script.gradle") << """
+            try {
+                getClass().classLoader.loadClass(pluginClass.name)
+                assert false
+            } catch (ClassNotFoundException ignore) {
+                println "not in script"
+            }
+        """
+
+        when:
+        succeeds "hello"
+
+        then:
+        output.contains "not in script"
+    }
 }
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/plugin/bintray/BintrayPluginResolutionIntegTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/plugin/bintray/BintrayPluginResolutionIntegTest.groovy
deleted file mode 100644
index e4cd608928b4..000000000000
--- a/subprojects/core/src/integTest/groovy/org/gradle/plugin/bintray/BintrayPluginResolutionIntegTest.groovy
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.bintray
-
-import org.gradle.integtests.fixtures.AbstractIntegrationSpec
-import org.gradle.test.fixtures.bintray.BintrayApi
-import org.gradle.test.fixtures.bintray.BintrayTestServer
-import org.gradle.test.fixtures.plugin.PluginBuilder
-import org.hamcrest.Matchers
-import org.junit.Rule
-
-class BintrayPluginResolutionIntegTest extends AbstractIntegrationSpec {
-
-    @Rule BintrayTestServer bintray = new BintrayTestServer(executer, mavenRepo)
-    def pluginBuilder = new PluginBuilder(executer, file("plugin"))
-
-    def setup() {
-        executer.requireOwnGradleUserHomeDir() // negate caching behaviour
-        bintray.start()
-    }
-
-    def "can resolve and use plugin from bintray"() {
-        given:
-        def group = "org.gradle.test"
-        def name = "foo"
-        def id = "fake-plugin"
-        def version = "2.0"
-
-        bintray.api.expectPackageSearch(id, new BintrayApi.FoundPackage(version, "$group:$name"))
-
-        def module = bintray.jcenter.module(group, name, version)
-        module.allowAll()
-        def artifact = module.artifact([:])
-        module.publish()
-
-        def message = "from plugin"
-        def taskName = "pluginTask"
-        pluginBuilder.addPluginWithPrintlnTask(taskName, message, id)
-        pluginBuilder.publishTo(artifact.file)
-
-        buildScript """
-          plugins {
-            apply plugin: "$id", version: "2.0"
-          }
-        """
-
-        when:
-        succeeds taskName
-
-        then:
-        output.contains message
-    }
-
-    def "plugin version number is required"() {
-        given:
-        def group = "org.gradle.test"
-        def name = "foo"
-        def id = "fake-plugin"
-        def version = "2.0"
-
-        bintray.api.expectPackageSearch(id, new BintrayApi.FoundPackage(version, "$group:$name"))
-
-        def module = bintray.jcenter.module(group, name, version)
-        module.allowAll()
-        def artifact = module.artifact([:])
-        module.publish()
-
-        pluginBuilder.addPlugin("", id)
-        pluginBuilder.publishTo(artifact.file)
-
-        buildScript """
-          plugins {
-            apply plugin: "$id"
-          }
-        """
-
-        when:
-        fails "tasks"
-
-        then:
-        failure.assertHasCause("No version number supplied for plugin 'fake-plugin'. A version number must be supplied for plugins resolved from 'https://bintray.com/gradle-plugins-development/gradle-plugins'.")
-    }
-
-    def "does not assert has version number if plugin not found"() {
-        given:
-        def id = "fake-plugin"
-        bintray.api.expectPackageSearch(id)
-        buildScript """
-          plugins {
-            apply plugin: "$id"
-          }
-        """
-
-        when:
-        fails "tasks"
-
-        then:
-        failure.assertThatCause(Matchers.startsWith("Cannot resolve plugin request"))
-    }
-
-}
diff --git a/subprojects/core/src/integTest/groovy/org/gradle/testfixtures/ProjectBuilderIntegrationTest.groovy b/subprojects/core/src/integTest/groovy/org/gradle/testfixtures/ProjectBuilderIntegrationTest.groovy
index 080f99d0a03e..b569ed0cdc69 100644
--- a/subprojects/core/src/integTest/groovy/org/gradle/testfixtures/ProjectBuilderIntegrationTest.groovy
+++ b/subprojects/core/src/integTest/groovy/org/gradle/testfixtures/ProjectBuilderIntegrationTest.groovy
@@ -19,7 +19,7 @@ package org.gradle.testfixtures
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.junit.Rule
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 
 class ProjectBuilderIntegrationTest extends AbstractIntegrationSpec {
     @Rule HttpServer server
diff --git a/subprojects/integ-test/src/integTest/resources/org/gradle/integtests/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/DirTransformerTask.java b/subprojects/core/src/integTest/resources/org/gradle/api/tasks/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/DirTransformerTask.java
similarity index 100%
rename from subprojects/integ-test/src/integTest/resources/org/gradle/integtests/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/DirTransformerTask.java
rename to subprojects/core/src/integTest/resources/org/gradle/api/tasks/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/DirTransformerTask.java
diff --git a/subprojects/integ-test/src/integTest/resources/org/gradle/integtests/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/GeneratorTask.java b/subprojects/core/src/integTest/resources/org/gradle/api/tasks/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/GeneratorTask.java
similarity index 100%
rename from subprojects/integ-test/src/integTest/resources/org/gradle/integtests/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/GeneratorTask.java
rename to subprojects/core/src/integTest/resources/org/gradle/api/tasks/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/GeneratorTask.java
diff --git a/subprojects/integ-test/src/integTest/resources/org/gradle/integtests/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/TransformerTask.java b/subprojects/core/src/integTest/resources/org/gradle/api/tasks/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/TransformerTask.java
similarity index 100%
rename from subprojects/integ-test/src/integTest/resources/org/gradle/integtests/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/TransformerTask.java
rename to subprojects/core/src/integTest/resources/org/gradle/api/tasks/IncrementalBuildIntegrationTest/shared/buildSrc/src/main/java/TransformerTask.java
diff --git a/subprojects/core/src/main/groovy/org/gradle/BuildResult.java b/subprojects/core/src/main/groovy/org/gradle/BuildResult.java
index 303b1df240d3..d9bf36e72cc3 100644
--- a/subprojects/core/src/main/groovy/org/gradle/BuildResult.java
+++ b/subprojects/core/src/main/groovy/org/gradle/BuildResult.java
@@ -19,7 +19,7 @@
 import org.gradle.api.invocation.Gradle;
 
 /**
- * <p>A {@code BuildResult} packages up the results of a build executed by a {@link GradleLauncher} instance.</p>
+ * <p>A {@code BuildResult} packages up the results of a build executed by a {@link org.gradle.initialization.GradleLauncher} instance.</p>
  */
 public class BuildResult {
     private final Throwable failure;
diff --git a/subprojects/core/src/main/groovy/org/gradle/GradleLauncher.java b/subprojects/core/src/main/groovy/org/gradle/GradleLauncher.java
deleted file mode 100644
index 442e50b14eb2..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/GradleLauncher.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * 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.
- */
-package org.gradle;
-
-import org.gradle.api.logging.StandardOutputListener;
-import org.gradle.initialization.GradleLauncherFactory;
-import org.gradle.internal.nativeplatform.services.NativeServices;
-import org.gradle.internal.service.ServiceRegistryBuilder;
-import org.gradle.internal.service.scopes.GlobalScopeServices;
-import org.gradle.logging.LoggingServiceRegistry;
-import org.gradle.util.DeprecationLogger;
-
-/**
- * <p>Executes a Gradle build.
- *
- * <p>{@code GradleLauncher} is deprecated. It has been replaced by the Tooling API.
- * If you're interested in embedding Gradle you should read the user guide chapter on embedding Gradle.
- * The main entry point to the Tooling API (and embedding Gradle) is {@code org.gradle.tooling.GradleConnector}.
- *
- * <p>You should try using the Tooling API (via {@code GradleConnector}) instead of {@code GradleLauncher}.
- * However, if you need some capability that isn't yet implemented in the Tooling API here is how you use {@code GradleLauncher}:
- *
- * <ol>
- *
- * <li>Optionally create a {@link StartParameter} instance and configure it with the desired properties. The properties
- * of {@code StartParameter} generally correspond to the command-line options of Gradle. You can use {@link
- * #createStartParameter(String...)} to create a {@link StartParameter} from a set of command-line options.</li>
- *
- * <li>Obtain a {@code GradleLauncher} instance by calling {@link #newInstance}, passing in the {@code StartParameter},
- * or an array of Strings that will be treated as command line arguments.</li>
- *
- * <li>Optionally add one or more listeners to the {@code GradleLauncher}.</li>
- *
- * <li>Call {@link #run} to execute the build. This will return a {@link BuildResult}. Note that if the build fails, the
- * resulting exception will be contained in the {@code BuildResult}.</li>
- *
- * <li>Query the build result. You might want to call {@link BuildResult#rethrowFailure()} to rethrow any build
- * failure.</li>
- *
- * </ol>
- *
- * @deprecated Use the tooling API instead.
- */
-@Deprecated
-public abstract class GradleLauncher {
-
-    private static GradleLauncherFactory factory;
-
-    /**
-     * <p>Executes the build for this {@code GradleLauncher} instance and returns the result. Note that when the build
-     * fails, the exception is available using {@link org.gradle.BuildResult#getFailure()}.</p>
-     *
-     * @return The result. Never returns null.
-     */
-    public abstract BuildResult run();
-
-    /**
-     * Evaluates the settings and all the projects. The information about available tasks and projects is accessible via
-     * the {@link org.gradle.api.invocation.Gradle#getRootProject()} object.
-     *
-     * @return The result. Never returns null.
-     */
-    public abstract BuildResult getBuildAnalysis();
-
-    /**
-     * Evaluates the settings and all the projects. The information about available tasks and projects is accessible via
-     * the {@link org.gradle.api.invocation.Gradle#getRootProject()} object. Fills the execution plan without running
-     * the build. The tasks to be executed tasks are available via {@link org.gradle.api.invocation.Gradle#getTaskGraph()}.
-     *
-     * @return The result. Never returns null.
-     */
-    public abstract BuildResult getBuildAndRunAnalysis();
-
-    /**
-     * Returns a {@code GradleLauncher} instance based on the passed start parameter.
-     *
-     * @param startParameter The start parameter object the GradleLauncher instance is initialized with
-     * @return The {@code GradleLauncher}. Never returns null.
-     * @deprecated Use the tooling API instead.
-     */
-    @Deprecated
-    public static GradleLauncher newInstance(StartParameter startParameter) {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("GradleLauncher.newInstance()");
-        return doGetFactory().newInstance(startParameter);
-    }
-
-    @Deprecated
-    public static GradleLauncherFactory getFactory() {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("GradleLauncher.getFactory()");
-        return doGetFactory();
-    }
-
-    private static synchronized GradleLauncherFactory doGetFactory() {
-        if (factory == null) {
-            factory = ServiceRegistryBuilder.builder()
-                    .displayName("Global services")
-                    .parent(LoggingServiceRegistry.newProcessLogging())
-                    .parent(NativeServices.getInstance())
-                    .provider(new GlobalScopeServices(false))
-                    .build()
-                    .get(GradleLauncherFactory.class);
-        }
-        return factory;
-    }
-
-    /**
-     * Returns a {@code GradleLauncher} instance based on the passed command line syntax arguments.
-     *
-     * @param commandLineArgs A String array where each element denotes an entry of the Gradle command line syntax
-     * @return The {@code GradleLauncher}. Never returns null.
-     * @deprecated Use the tooling API instead.
-     */
-    @Deprecated
-    public static GradleLauncher newInstance(String... commandLineArgs) {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("GradleLauncher.newInstance()");
-        GradleLauncherFactory gradleLauncherFactory = doGetFactory();
-        return gradleLauncherFactory.newInstance(gradleLauncherFactory.createStartParameter(commandLineArgs));
-    }
-
-    /**
-     * Returns a {@code StartParameter} object out of command line syntax arguments. Each command line option has an
-     * associated field in the {@code StartParameter} object.
-     *
-     * @param commandLineArgs A String array where each element denotes an entry of the Gradle command line syntax
-     * @return The {@code GradleLauncher}. Never returns null.
-     * @deprecated No replacement.
-     */
-    @Deprecated
-    public static StartParameter createStartParameter(String... commandLineArgs) {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("GradleLauncher.createStartParameter()");
-        return doGetFactory().createStartParameter(commandLineArgs);
-    }
-
-    @Deprecated
-    public static synchronized void injectCustomFactory(GradleLauncherFactory gradleLauncherFactory) {
-        factory = gradleLauncherFactory;
-    }
-
-    /**
-     * <p>Adds a listener to this build instance. The listener is notified of events which occur during the execution of
-     * the build. See {@link org.gradle.api.invocation.Gradle#addListener(Object)} for supported listener types.</p>
-     *
-     * @param listener The listener to add. Has no effect if the listener has already been added.
-     */
-    public abstract void addListener(Object listener);
-
-    /**
-     * Use the given listener. See {@link org.gradle.api.invocation.Gradle#useLogger(Object)} for details.
-     *
-     * @param logger The logger to use.
-     */
-    public abstract void useLogger(Object logger);
-
-    /**
-     * <p>Adds a {@link StandardOutputListener} to this build instance. The listener is notified of any text written to
-     * standard output by Gradle's logging system
-     *
-     * @param listener The listener to add. Has no effect if the listener has already been added.
-     */
-    public abstract void addStandardOutputListener(StandardOutputListener listener);
-
-    /**
-     * <p>Adds a {@link StandardOutputListener} to this build instance. The listener is notified of any text written to standard error by Gradle's logging system
-     *
-     * @param listener The listener to add. Has no effect if the listener has already been added.
-     */
-    public abstract void addStandardErrorListener(StandardOutputListener listener);
-
-    /**
-     * Returns the {@link StartParameter} used by this build instance.
-     * @return The parameter. Never null.
-     */
-    public abstract StartParameter getStartParameter();
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/StartParameter.java b/subprojects/core/src/main/groovy/org/gradle/StartParameter.java
index 577e073ae3d9..b61d861625c9 100644
--- a/subprojects/core/src/main/groovy/org/gradle/StartParameter.java
+++ b/subprojects/core/src/main/groovy/org/gradle/StartParameter.java
@@ -16,6 +16,8 @@
 
 package org.gradle;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -26,9 +28,8 @@
 import org.gradle.initialization.CompositeInitScriptFinder;
 import org.gradle.initialization.DistributionInitScriptFinder;
 import org.gradle.initialization.UserHomeInitScriptFinder;
-import org.gradle.internal.SystemProperties;
+import org.gradle.internal.DefaultTaskParameter;
 import org.gradle.logging.LoggingConfiguration;
-import org.gradle.util.DeprecationLogger;
 import org.gradle.util.GFileUtils;
 
 import java.io.File;
@@ -39,25 +40,23 @@
  * <p>{@code StartParameter} defines the configuration used by a Gradle instance to execute a build. The properties of {@code StartParameter} generally
  * correspond to the command-line options of Gradle.
  *
- * <p>You pass a {@code StartParameter} instance to {@link GradleLauncher#newInstance(StartParameter)} when you create a new Gradle instance.</p>
- *
  * <p>You can obtain an instance of a {@code StartParameter} by either creating a new one, or duplicating an existing one using {@link #newInstance} or {@link #newBuild}.</p>
  *
- * @see GradleLauncher
+ * @see org.gradle.initialization.GradleLauncher
  */
 public class StartParameter extends LoggingConfiguration implements Serializable {
-    public static final String GRADLE_USER_HOME_PROPERTY_KEY = "gradle.user.home";
+    public static final String GRADLE_USER_HOME_PROPERTY_KEY = BuildLayoutParameters.GRADLE_USER_HOME_PROPERTY_KEY;
+
     /**
      * The default user home directory.
      */
-    public static final File DEFAULT_GRADLE_USER_HOME = new File(SystemProperties.getUserHome() + "/.gradle");
+    public static final File DEFAULT_GRADLE_USER_HOME = new BuildLayoutParameters().getGradleUserHomeDir();
 
-    private List<String> taskNames = new ArrayList<String>();
+    private List<TaskParameter> taskParameters = new ArrayList<TaskParameter>();
     private Set<String> excludedTaskNames = new LinkedHashSet<String>();
     private boolean buildProjectDependencies = true;
     private File currentDir;
     private File projectDir;
-    private String projectPath;
     private boolean searchUpwards;
     private Map<String, String> projectProperties = new HashMap<String, String>();
     private Map<String, String> systemPropertiesArgs = new HashMap<String, String>();
@@ -120,10 +119,9 @@ protected StartParameter prepareNewInstance(StartParameter p) {
         prepareNewBuild(p);
         p.buildFile = buildFile;
         p.projectDir = projectDir;
-        p.projectPath = projectPath;
         p.settingsFile = settingsFile;
         p.useEmptySettings = useEmptySettings;
-        p.taskNames = new ArrayList<String>(taskNames);
+        p.taskParameters = new ArrayList<TaskParameter>(taskParameters);
         p.excludedTaskNames = new LinkedHashSet<String>(excludedTaskNames);
         p.buildProjectDependencies = buildProjectDependencies;
         p.currentDir = currentDir;
@@ -233,11 +231,18 @@ public boolean isUseEmptySettings() {
 
     /**
      * Returns the names of the tasks to execute in this build. When empty, the default tasks for the project will be executed.
+     * If {@link org.gradle.TaskParameter}s are set for this build then names from these task parameters are returned.
      *
      * @return the names of the tasks to execute in this build. Never returns null.
      */
     public List<String> getTaskNames() {
-        return taskNames;
+        return Lists.newArrayList(Iterables.transform(
+                taskParameters,
+                new Function<TaskParameter, String>() {
+                    public String apply(TaskParameter input) {
+                        return input.getTaskName();
+                    }
+                }));
     }
 
     /**
@@ -247,7 +252,34 @@ public List<String> getTaskNames() {
      * @param taskNames the names of the tasks to execute in this build.
      */
     public void setTaskNames(Iterable<String> taskNames) {
-        this.taskNames = Lists.newArrayList(taskNames);
+        this.taskParameters = Lists.newArrayList(Iterables.transform(
+                taskNames != null ? taskNames : Collections.<String>emptyList(),
+                    new Function<String, TaskParameter>() {
+                        public TaskParameter apply(String input) {
+                            return new DefaultTaskParameter(input);
+                        }
+                    }));
+    }
+
+    /**
+     * Returns the tasks to execute in this build. When empty, the default tasks for the project will be executed.
+     *
+     * @return the tasks to execute in this build. Never returns null.
+     */
+    @Incubating
+    public List<TaskParameter> getTaskParameters() {
+        return taskParameters;
+    }
+
+    /**
+     * <p>Sets the task parameters to execute in this build. Set to an empty list, to execute the default tasks for the project. The tasks are executed in the order provided, subject to dependency
+     * between the tasks.</p>
+     *
+     * @param taskParameters the tasks to execute in this build.
+     */
+    @Incubating
+    public void setTaskParameters(Iterable<TaskParameter> taskParameters) {
+        this.taskParameters = Lists.newArrayList(taskParameters);
     }
 
     /**
@@ -314,24 +346,6 @@ public void setSystemPropertiesArgs(Map<String, String> systemPropertiesArgs) {
         this.systemPropertiesArgs = systemPropertiesArgs;
     }
 
-    /**
-     * Deprecated. It is no longer used internally and there's no good reason to keep it.
-     * There is no replacement method.
-     *
-     * Returns a newly constructed map that is the JVM system properties merged with the system property args. <p> System property args take precedence over JVM system properties.
-     *
-     * @return The merged system properties
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public Map<String, String> getMergedSystemProperties() {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("StartParameter.getMergedSystemProperties()");
-        Map<String, String> merged = new HashMap<String, String>();
-        merged.putAll((Map) System.getProperties());
-        merged.putAll(getSystemPropertiesArgs());
-        return merged;
-    }
-
     /**
      * Returns the directory to use as the user home directory.
      *
@@ -347,7 +361,7 @@ public File getGradleUserHomeDir() {
      * @param gradleUserHomeDir The home directory. May be null.
      */
     public void setGradleUserHomeDir(File gradleUserHomeDir) {
-        this.gradleUserHomeDir = gradleUserHomeDir == null ? DEFAULT_GRADLE_USER_HOME : GFileUtils.canonicalise(gradleUserHomeDir);
+        this.gradleUserHomeDir = gradleUserHomeDir == null ? new BuildLayoutParameters().getGradleUserHomeDir() : GFileUtils.canonicalise(gradleUserHomeDir);
     }
 
     /**
@@ -512,26 +526,6 @@ public File getProjectDir() {
         return projectDir;
     }
 
-    /**
-     * Sets the project path to use to select the default project. Use null to use the default criteria for selecting the default project.
-     *
-     * @param projectPath The project path. May be null.
-     */
-    @Incubating
-    public void setProjectPath(String projectPath) {
-        this.projectPath = projectPath;
-    }
-
-    /**
-     * Returns the project path to use to select the default project.
-     *
-     * @return The project path. May be null when the project path is not used to select the default project.
-     */
-    @Incubating
-    public String getProjectPath() {
-        return projectPath;
-    }
-
     /**
      * Specifies if a profile report should be generated.
      *
@@ -667,7 +661,7 @@ public boolean isConfigureOnDemand() {
     @Override
     public String toString() {
         return "StartParameter{"
-                + "taskNames=" + taskNames
+                + "taskParameters=" + taskParameters
                 + ", excludedTaskNames=" + excludedTaskNames
                 + ", currentDir=" + currentDir
                 + ", searchUpwards=" + searchUpwards
diff --git a/subprojects/core/src/main/groovy/org/gradle/TaskParameter.java b/subprojects/core/src/main/groovy/org/gradle/TaskParameter.java
new file mode 100644
index 000000000000..bd4277ae7eea
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/TaskParameter.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle;
+
+import org.gradle.api.Incubating;
+import org.gradle.api.Nullable;
+
+/**
+ * Task name with an optional project path context to provide information necessary to initiate the build.
+ *
+ * @since 2.0
+ */
+@Incubating
+public interface TaskParameter {
+    /**
+     * Task path for real tasks, selector name for task selectors.
+     *
+     * @return task name.
+     */
+    String getTaskName();
+
+    /**
+     * Project path associated with this task parameter request if any.
+     *
+     * @return project path or {@code null}.
+     */
+    @Nullable String getProjectPath();
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/IllegalOperationAtExecutionTimeException.java b/subprojects/core/src/main/groovy/org/gradle/api/IllegalOperationAtExecutionTimeException.java
deleted file mode 100644
index 8391b3f487ba..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/api/IllegalOperationAtExecutionTimeException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api;
-
-/**
- * A <code>IllegalOperationAtExecutionTimeException</code> is thrown if you try to trigger an operation at runtime,
- * which is only allowed at configuration time.
- *
- * @deprecated No replacement
- */
-@Deprecated
-public class IllegalOperationAtExecutionTimeException extends InvalidUserDataException {
-    public IllegalOperationAtExecutionTimeException(String message) {
-        super(message);
-    }
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/NamedDomainObjectCollection.java b/subprojects/core/src/main/groovy/org/gradle/api/NamedDomainObjectCollection.java
index d5d5e82b6b9e..49fb45d5c034 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/NamedDomainObjectCollection.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/NamedDomainObjectCollection.java
@@ -90,6 +90,8 @@ public interface NamedDomainObjectCollection<T> extends DomainObjectCollection<T
 
     /**
      * An object that represents the naming strategy used to name objects of this collection.
+     *
+     * @return Object representing the naming strategy.
      */
     Namer<T> getNamer();
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/PolymorphicDomainObjectContainer.java b/subprojects/core/src/main/groovy/org/gradle/api/PolymorphicDomainObjectContainer.java
index 8e8574623640..0a6ffec09ef7 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/PolymorphicDomainObjectContainer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/PolymorphicDomainObjectContainer.java
@@ -71,4 +71,13 @@ public interface PolymorphicDomainObjectContainer<T> extends NamedDomainObjectCo
      * or the container does not support creating a domain object with the specified type
      */
     <U extends T> U create(String name, Class<U> type, Action<? super U> configuration) throws InvalidUserDataException;
+
+    /**
+     * Creates a regular container that wraps the polymorphic container presenting all elements of a specified type.
+     *
+     * @param type the type of the container elements
+     * @param <U> the type of the container elements
+     * @return a {@link NamedDomainObjectContainer} providing access to elements of type U.
+     */
+    <U extends T> NamedDomainObjectContainer<U> containerWithType(Class<U> type);
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/Project.java b/subprojects/core/src/main/groovy/org/gradle/api/Project.java
index ecde8ef3d32f..12f3314e216d 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/Project.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/Project.java
@@ -339,13 +339,6 @@ public interface Project extends Comparable<Project>, ExtensionAware, PluginAwar
      */
     Map<String, Project> getChildProjects();
 
-    /**
-     * <p>Returns the set of projects which this project depends on.</p>
-     *
-     * @return The set of projects. Returns an empty set if this project depends on no projects.
-     */
-    Set<Project> getDependsOnProjects();
-
     /**
      * <p>Sets a property of this project.  This method searches for a property with the given name in the following
      * locations, and sets the property on the first location where it finds the property.</p>
@@ -513,27 +506,6 @@ public interface Project extends Comparable<Project>, ExtensionAware, PluginAwar
      */
     void defaultTasks(String... defaultTasks);
 
-    /**
-     * <p>Declares that this project has an execution dependency on the project with the given path.</p>
-     *
-     * @deprecated Use {@link Task#dependsOn(Object...)} instead.
-     * @param path The path of the project which this project depends on.
-     * @throws UnknownProjectException If no project with the given path exists.
-     */
-    @Deprecated
-    void dependsOn(String path) throws UnknownProjectException;
-
-    /**
-     * <p>Declares that this project has an execution dependency on the project with the given path.</p>
-     *
-     * @deprecated Use {@link Task#dependsOn(Object...)} instead.
-     * @param path The path of the project which this project depends on.
-     * @param evaluateDependsOnProject If true, adds an evaluation dependency.
-     * @throws UnknownProjectException If no project with the given path exists.
-     */
-    @Deprecated
-    void dependsOn(String path, boolean evaluateDependsOnProject) throws UnknownProjectException;
-
     /**
      * <p>Declares that this project has an evaluation dependency on the project with the given path.</p>
      *
@@ -549,36 +521,6 @@ public interface Project extends Comparable<Project>, ExtensionAware, PluginAwar
      */
     void evaluationDependsOnChildren();
 
-    /**
-     * <p>Declares that all child projects of this project have an execution dependency on this project.</p>
-     *
-     * @deprecated Use {@link Task#dependsOn(Object...)} instead.
-     * @return this project.
-     */
-    @Deprecated
-    Project childrenDependOnMe();
-
-    /**
-     * <p>Declares that this project has an execution dependency on each of its child projects.</p>
-     *
-     * @deprecated Use {@link Task#dependsOn(Object...)} instead.
-     * @return this project.
-     */
-    @Deprecated
-    Project dependsOnChildren();
-
-    /**
-     * <p>Declares that this project has an execution dependency on each of its child projects.</p>
-     *
-     * @deprecated To definde task dependencies use {@link Task#dependsOn(Object...)} instead.
-     * For declaring evaluation dependencies to child projects, use evaluation dependencies
-     * use {@link #evaluationDependsOnChildren()}.
-     * @param evaluateDependsOnProject If true, adds an evaluation dependency.
-     * @return this project.
-     */
-    @Deprecated
-    Project dependsOnChildren(boolean evaluateDependsOnProject);
-
     /**
      * <p>Locates a project by path. If the path is relative, it is interpreted relative to this project.</p>
      *
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/Task.java b/subprojects/core/src/main/groovy/org/gradle/api/Task.java
index 3f64d82a56dc..fc33ea8d89dc 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/Task.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/Task.java
@@ -307,7 +307,7 @@ public String determineName(Task c) {
 
     /**
      * <p>Checks if the task actually did any work.  Even if a Task executes, it may determine that it has nothing to
-     * do.  For example, the Compile task may determine that source files have not changed since the last time a the
+     * do.  For example, a compilation task may determine that source files have not changed since the last time a the
      * task was run.</p>
      *
      * @return true if this task did any work
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/ClientModule.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/ClientModule.java
index 198c13d0ab3d..e03f7bf4a822 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/ClientModule.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/ClientModule.java
@@ -23,7 +23,7 @@
  * a client module you can declare a module dependency without the need of a module descriptor in a
  * remote repository.
  */
-public interface ClientModule extends ExternalDependency {
+public interface ClientModule extends ExternalModuleDependency {
     /**
      * Add a dependency to the client module. Such a dependency is transitive dependency for the
      * project that has a dependency on the client module.
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/IvyModuleDescriptor.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/IvyModuleDescriptor.java
new file mode 100644
index 000000000000..2a1cf2b6659d
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/IvyModuleDescriptor.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.artifacts;
+
+import org.gradle.api.Incubating;
+
+import java.util.Map;
+
+/**
+ * An Ivy module descriptor that acts as an input to a component metadata rule.
+ */
+@Incubating
+public interface IvyModuleDescriptor {
+    /**
+     * Returns a read-only map of the extra info declared in this descriptor.
+     * The extra info is the set of all non-standard subelements of the <em>info</em> element.
+     * For each such element, the returned map contains one entry. The entry's key is the name
+     * (i.e. tag) of the element, including any namespace prefix. The entry's value is the contents of
+     * the element.
+     *
+     * Example: Given an <em>info</em> element with the following non-standard subelements:
+     *
+     * &lt;pre&gt;
+     * &lt;info&gt;
+     *     &lt;ns1:expires&gt;2015-09-23&lt;/ns1:expires&gt;
+     *     &lt;ns2:popularity&gt;high&lt;/ns2:popularity&gt;
+     * &lt;/info&gt;
+     * &lt;/pre&gt;
+     *
+     * Then the returned map will be {@code ["ns1:expires": "2015-09-23", "ns2:popularity": "high"]}.
+     *
+     * @return a read-only map of the extra info declared in this descriptor
+     */
+    Map<String, String> getExtraInfo();
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/ResolvedArtifact.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/ResolvedArtifact.java
index 13d50ce57474..54efc43552d2 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/ResolvedArtifact.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/ResolvedArtifact.java
@@ -30,15 +30,6 @@ public interface ResolvedArtifact {
      */
     ResolvedModuleVersion getModuleVersion();
 
-    /**
-     * Returns one of the dependencies which this artifact belongs to.
-     *
-     * @return One of the dependencies which this artifact belongs to.
-     * @deprecated An artifact can belong to multiple dependencies. Use {@link #getModuleVersion()} instead.
-     */
-    @Deprecated
-    ResolvedDependency getResolvedDependency();
-
     String getName();
 
     String getType();
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQuery.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ArtifactResolutionQuery.java
similarity index 72%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQuery.java
rename to subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ArtifactResolutionQuery.java
index c26823c92acf..7a6949b97e2b 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQuery.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ArtifactResolutionQuery.java
@@ -13,20 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
+package org.gradle.api.artifacts.dsl;
 
 import org.gradle.api.Incubating;
 import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.artifacts.result.Artifact;
+import org.gradle.api.artifacts.result.ArtifactResolutionResult;
+import org.gradle.api.artifacts.result.Component;
 
 /**
  * Resolves selected software artifacts of the given components.
  *
- * @since 1.12
+ * @since 2.0
  */
 @Incubating
 public interface ArtifactResolutionQuery {
     ArtifactResolutionQuery forComponents(Iterable<? extends ComponentIdentifier> componentIds);
     ArtifactResolutionQuery forComponents(ComponentIdentifier... componentIds);
-    <T extends SoftwareComponent, U extends SoftwareArtifact> ArtifactResolutionQuery withArtifacts(Class<T> componentType, Class<U>... artifactTypes);
-    ArtifactResolutionQueryResult execute();
+    ArtifactResolutionQuery withArtifacts(Class<? extends Component> componentType, Class<? extends Artifact>... artifactTypes);
+    ArtifactResolutionResult execute();
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ComponentMetadataHandler.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ComponentMetadataHandler.java
index 39f21af180af..f281a015668b 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ComponentMetadataHandler.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/ComponentMetadataHandler.java
@@ -15,6 +15,7 @@
  */
 package org.gradle.api.artifacts.dsl;
 
+import groovy.lang.Closure;
 import org.gradle.api.Action;
 import org.gradle.api.Incubating;
 import org.gradle.api.artifacts.ComponentMetadataDetails;
@@ -51,4 +52,24 @@ public interface ComponentMetadataHandler {
      * @param rule the rule to be added
      */
     void eachComponent(Action<? super ComponentMetadataDetails> rule);
+
+    /**
+     * Adds a rule to modify the metadata of depended-on software components.
+     * For example, this allows to set a component's status and status scheme
+     * from within the build script, overriding any value specified in the
+     * component descriptor.
+     *
+     * <p>The rule can declare one or multiple parameters, depending on which
+     * metadata it is interested in. The order of parameters is irrelevant.
+     * The following parameter types are supported:
+     * <ul>
+     *     <li>{@link ComponentMetadataDetails} Core metadata which is provided for
+     *     every kind of component. When declaring this parameter, the type may be omitted.</li>
+     *     <li>{@link org.gradle.api.artifacts.IvyModuleDescriptor} Additional Ivy-specific
+     *     metadata. Rules declaring this parameter will only be invoked for Ivy components.</li>
+     * </ul>
+     *
+     * @param rule the rule to be added
+     */
+    void eachComponent(Closure<?> rule);
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/DependencyHandler.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/DependencyHandler.java
index 4522d20d025c..8ba63e425207 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/DependencyHandler.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/dsl/DependencyHandler.java
@@ -19,7 +19,6 @@
 import org.gradle.api.Action;
 import org.gradle.api.Incubating;
 import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.resolution.ArtifactResolutionQuery;
 
 import java.util.Map;
 
@@ -343,6 +342,11 @@ public interface DependencyHandler {
     @Incubating
     void components(Action<? super ComponentMetadataHandler> configureAction);
 
+    /**
+     * Creates an artifact resolution query.
+     *
+     * @since 2.0
+     */
     @Incubating
     ArtifactResolutionQuery createArtifactResolutionQuery();
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/repositories/IvyArtifactRepository.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/repositories/IvyArtifactRepository.java
index bf9252346cf0..7f43990f9931 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/repositories/IvyArtifactRepository.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/repositories/IvyArtifactRepository.java
@@ -34,6 +34,8 @@
  */
 public interface IvyArtifactRepository extends ArtifactRepository, AuthenticationSupported {
 
+    String IVY_ARTIFACT_PATTERN = "[organisation]/[module]/[revision]/[type]s/[artifact](.[ext])";
+
     String GRADLE_ARTIFACT_PATTERN = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier])(.[ext])";
     String GRADLE_IVY_PATTERN = "[organisation]/[module]/[revision]/ivy-[revision].xml";
 
@@ -108,6 +110,13 @@ public interface IvyArtifactRepository extends ArtifactRepository, Authenticatio
      * </ul>
      * Following the Maven convention, the 'organisation' value is further processed by replacing '.' with '/'.
      *
+     * <h4>'ivy'</h4>
+     * A Repository Layout that applies the following patterns:
+     * <ul>
+     *     <li>Artifacts: <code>$baseUri/{@value #IVY_ARTIFACT_PATTERN}</code></li>
+     *     <li>Ivy: <code>$baseUri/{@value #IVY_ARTIFACT_PATTERN}</code></li>
+     * </ul>
+     *
      * <h4>'pattern'</h4>
      * A repository layout that allows custom patterns to be defined. eg:
      * <pre autoTested="">
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareArtifact.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/Artifact.java
similarity index 90%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareArtifact.java
rename to subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/Artifact.java
index e8c235620865..8a3167e57d68 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareArtifact.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/Artifact.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
+package org.gradle.api.artifacts.result;
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Incubating;
@@ -24,10 +24,10 @@
 /**
  * An artifact of a software component.
  *
- * @since 1.12
+ * @since 2.0
  */
 @Incubating
-public interface SoftwareArtifact {
+public interface Artifact {
     /**
      * The file for the artifact. If resolving the artifact caused a failure, that failure will be rethrown.
      *
@@ -41,5 +41,5 @@ public interface SoftwareArtifact {
      * @return the failure that occurred when the artifact was resolved, or {@code null} if no failure occurred
      */
     @Nullable
-    GradleException getFailure();
+    Throwable getFailure();
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQueryResult.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResolutionResult.java
similarity index 72%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQueryResult.java
rename to subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResolutionResult.java
index b6cdb15e176e..4c5f33b4d14a 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/ArtifactResolutionQueryResult.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResolutionResult.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
+package org.gradle.api.artifacts.result;
 
 import org.gradle.api.Incubating;
 
@@ -22,11 +22,10 @@
 /**
  * The result of executing an artifact resolution query.
  *
- * @since 1.12
+ * @since 2.0
  */
 @Incubating
-public interface ArtifactResolutionQueryResult {
-    Set<? extends SoftwareComponent> getComponents();
-    <T extends SoftwareComponent> Set<T> getComponents(Class<T> type);
-    Set<UnresolvedSoftwareComponent> getUnresolvedComponents();
+public interface ArtifactResolutionResult {
+    Set<ComponentResult> getComponents();
+    <T extends Component> Set<T> getResolvedComponents(Class<T> type);
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryArtifact.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResult.java
similarity index 77%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryArtifact.java
rename to subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResult.java
index 1341ee647952..82b95414f467 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryArtifact.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ArtifactResult.java
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
+package org.gradle.api.artifacts.result;
 
 import org.gradle.api.Incubating;
 
 /**
- * Base interface for the artifacts of a JVM library software component.
+ * The result of resolving an artifact.
  *
- * @since 1.12
+ * @since 2.0
  */
 @Incubating
-public interface JvmLibraryArtifact extends SoftwareArtifact {
+public interface ArtifactResult {
+    Class<? extends Artifact> getType();
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareComponent.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/Component.java
similarity index 76%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareComponent.java
rename to subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/Component.java
index 08c5ffc66a25..be34a59a34e1 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/SoftwareComponent.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/Component.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
+package org.gradle.api.artifacts.result;
 
 import org.gradle.api.Incubating;
 import org.gradle.api.artifacts.component.ComponentIdentifier;
@@ -21,12 +21,9 @@
 /**
  * A software component with resolved artifacts.
  *
- * Implementations have the following equals contract:
- * {@code other != null && getClass() == other.getClass() && getId().equals(other.getId());}
- *
- * @since 1.12
+ * @since 2.0
  */
 @Incubating
-public interface SoftwareComponent {
+public interface Component {
     ComponentIdentifier getId();
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentResult.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentResult.java
new file mode 100644
index 000000000000..80367625e72f
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentResult.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.artifacts.result;
+
+import org.gradle.api.Incubating;
+import org.gradle.api.artifacts.component.ComponentIdentifier;
+
+/**
+ * The result of resolving a component.
+ *
+ * @since 2.0
+ */
+@Incubating
+public interface ComponentResult {
+    /**
+     * Returns the ID of the requested component.
+     */
+    ComponentIdentifier getId();
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentSelectionReason.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentSelectionReason.java
index 3e66244abb00..31db167d9ba6 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentSelectionReason.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ComponentSelectionReason.java
@@ -50,9 +50,8 @@ public interface ComponentSelectionReason {
     boolean isSelectedByRule();
 
     /**
-     * Informs whether the component is an expected selection.
+     * Informs whether the component is the requested selection of all dependency declarations, and was not replaced for some reason, such as conflict resolution.
      *
-     * @return Flag
      * @since 1.11
      */
     boolean isExpected();
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedArtifactResult.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedArtifactResult.java
new file mode 100644
index 000000000000..a41bfd8a30fb
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedArtifactResult.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.artifacts.result;
+
+import org.gradle.api.Incubating;
+
+import java.io.File;
+
+/**
+ * The result of successfully downloading an artifact.
+ *
+ * @since 2.0
+ */
+@Incubating
+public interface ResolvedArtifactResult extends ArtifactResult {
+    /**
+     * The file for the artifact.
+     */
+    File getFile();
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedComponentArtifactsResult.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedComponentArtifactsResult.java
new file mode 100644
index 000000000000..189a69b3ecd2
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/ResolvedComponentArtifactsResult.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.artifacts.result;
+
+import org.gradle.api.Incubating;
+
+import java.util.Set;
+
+/**
+ * The result of successfully resolving a component with a set of artifacts.
+ *
+ * @since 2.0
+ */
+@Incubating
+public interface ResolvedComponentArtifactsResult extends ComponentResult {
+    /**
+     * <p>Returns the component artifacts of the specified type. Includes resolved and unresolved artifacts (if any).
+     *
+     * <p>The elements of the returned collection are declared as {@link ArtifactResult}, however the artifact instances will also implement one of the
+     * following instances:</p>
+     *
+     * <ul>
+     *     <li>{@link ResolvedArtifactResult} for artifacts which were successfully resolved.</li>
+     *     <li>{@link UnresolvedArtifactResult} for artifacts which could not be resolved for some reason.</li>
+     * </ul>
+     *
+     * @return the artifacts of this component with the specified type, or an empty set if no artifacts of the type exist.
+     */
+    Set<ArtifactResult> getArtifacts(Class<? extends Artifact> type);
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedArtifactResult.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedArtifactResult.java
new file mode 100644
index 000000000000..1b47d4e5d1c6
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedArtifactResult.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.artifacts.result;
+
+import org.gradle.api.Incubating;
+
+/**
+ * An artifact the could not be resolved.
+ *
+ * @since 2.0
+ */
+@Incubating
+public interface UnresolvedArtifactResult extends ArtifactResult {
+    /**
+     * The failure that occurred when the artifact was resolved.
+     */
+    Throwable getFailure();
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedComponentResult.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedComponentResult.java
new file mode 100644
index 000000000000..e93df0509b34
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/UnresolvedComponentResult.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.artifacts.result;
+
+import org.gradle.api.Incubating;
+
+/**
+ * A component that could not be resolved.
+ *
+ * @since 2.0
+ */
+@Incubating
+public interface UnresolvedComponentResult extends ComponentResult {
+    /**
+     * Returns the failure that occurred when trying to resolve the component.
+     */
+    Throwable getFailure();
+}
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryJavadocArtifact.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/JavadocArtifact.java
similarity index 76%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryJavadocArtifact.java
rename to subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/JavadocArtifact.java
index f8868c1cf68b..4c74b7f5480f 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibraryJavadocArtifact.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/JavadocArtifact.java
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
+package org.gradle.api.artifacts.result.jvm;
 
 import org.gradle.api.Incubating;
+import org.gradle.api.artifacts.result.Artifact;
 
 /**
- * An artifact containing sources for a JVM library software component.
+ * An artifact containing Javadoc documentation.
  *
- * @since 1.12
+ * @since 2.0
  */
 @Incubating
-public interface JvmLibraryJavadocArtifact extends JvmLibraryArtifact {
+public interface JavadocArtifact extends Artifact {
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrary.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/JvmLibraryComponent.java
similarity index 74%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrary.java
rename to subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/JvmLibraryComponent.java
index 007c2830f6dc..5e0360cdbfc3 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrary.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/JvmLibraryComponent.java
@@ -13,19 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
+package org.gradle.api.artifacts.result.jvm;
 
 import org.gradle.api.Incubating;
+import org.gradle.api.artifacts.result.Component;
 
 import java.util.Set;
 
 /**
  * Software component representing a JVM library.
  *
- * @since 1.12
+ * @since 2.0
  */
 @Incubating
-public interface JvmLibrary extends SoftwareComponent {
-    Set<JvmLibrarySourcesArtifact> getSourcesArtifacts();
-    Set<JvmLibraryJavadocArtifact> getJavadocArtifacts();
+public interface JvmLibraryComponent extends Component {
+    Set<SourcesArtifact> getSourcesArtifacts();
+    Set<JavadocArtifact> getJavadocArtifacts();
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/SourcesArtifact.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/SourcesArtifact.java
new file mode 100644
index 000000000000..cd3980df98a6
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/SourcesArtifact.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.artifacts.result.jvm;
+
+import org.gradle.api.Incubating;
+import org.gradle.api.artifacts.result.Artifact;
+
+/**
+ * An artifact containing sources for a software component.
+ *
+ * @since 2.0
+ */
+@Incubating
+public interface SourcesArtifact extends Artifact {
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/package-info.java b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/package-info.java
new file mode 100644
index 000000000000..28bd967ba26a
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/artifacts/result/jvm/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Classes comprising the JVM library model for the artifact resolution API.
+ */
+// TODO:DAZ These should live with the rest of the Java language/platform stuff
+package org.gradle.api.artifacts.result.jvm;
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassGenerator.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassGenerator.java
index cf3b497d88eb..e3b7c5af7926 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassGenerator.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassGenerator.java
@@ -16,27 +16,38 @@
 
 package org.gradle.api.internal;
 
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import groovy.lang.*;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.SetMultimap;
+import groovy.lang.Closure;
+import groovy.lang.GroovyObject;
 import org.apache.commons.collections.map.AbstractReferenceMap;
 import org.apache.commons.collections.map.ReferenceMap;
-import org.codehaus.groovy.reflection.CachedClass;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
+import org.gradle.api.NonExtensible;
+import org.gradle.api.Nullable;
 import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.internal.reflect.DirectInstantiator;
 import org.gradle.internal.reflect.Instantiator;
+import org.gradle.internal.reflect.JavaReflectionUtil;
 
+import javax.inject.Inject;
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.*;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+/**
+ * Generates a subclass of the target class to mix-in some DSL behaviour.
+ *
+ * <p>By default, for each property, a convention mapping is applied. If {@code @Inject} is attached to a getter, the appropriate service instance will be injected instead.</p>
+ */
 public abstract class AbstractClassGenerator implements ClassGenerator {
     private static final Map<Class<?>, Map<Class<?>, Class<?>>> GENERATED_CLASSES = new HashMap<Class<?>, Map<Class<?>, Class<?>>>();
     private static final Lock CACHE_LOCK = new ReentrantLock();
+    private static final Collection<String> SKIP_PROPERTIES = Arrays.asList("class", "metaClass", "conventionMapping", "convention", "asDynamicObject", "extensions");
 
     public <T> T newInstance(Class<T> type, Object... parameters) {
         Instantiator instantiator = new DirectInstantiator();
@@ -56,7 +67,7 @@ private <T> Class<? extends T> generateUnderLock(Class<T> type) {
         Map<Class<?>, Class<?>> cache = GENERATED_CLASSES.get(getClass());
         if (cache == null) {
             // WeakHashMap won't work here. It keeps a strong reference to the mapping value, which is the generated class in this case
-            // However, the generated class has a strong reference to the source class (it extends it), so the keys will always be
+            // However, the generated class has a strong reference to the source class (by extending it), so the keys will always be
             // strongly reachable while this Class is strongly reachable. Use weak references for both key and value of the mapping instead.
             cache = new ReferenceMap(AbstractReferenceMap.WEAK, AbstractReferenceMap.WEAK);
             GENERATED_CLASSES.put(getClass(), cache);
@@ -77,11 +88,11 @@ private <T> Class<? extends T> generateUnderLock(Class<T> type) {
 
         Class<? extends T> subclass;
         try {
-            ClassBuilder<T> builder = start(type);
+            ClassMetaData classMetaData = inspectType(type);
 
-            boolean isConventionAware = type.getAnnotation(NoConventionMapping.class) == null;
+            ClassBuilder<T> builder = start(type, classMetaData);
 
-            builder.startClass(isConventionAware);
+            builder.startClass();
 
             if (!DynamicObjectAware.class.isAssignableFrom(type)) {
                 if (ExtensionAware.class.isAssignableFrom(type)) {
@@ -93,7 +104,7 @@ private <T> Class<? extends T> generateUnderLock(Class<T> type) {
                 builder.mixInGroovyObject();
             }
             builder.addDynamicMethods();
-            if (isConventionAware && !IConventionAware.class.isAssignableFrom(type)) {
+            if (classMetaData.conventionAware && !IConventionAware.class.isAssignableFrom(type)) {
                 builder.mixInConventionAware();
             }
 
@@ -104,109 +115,72 @@ private <T> Class<? extends T> generateUnderLock(Class<T> type) {
                 }
             }
 
-            Collection<String> skipProperties = Arrays.asList("metaClass", "conventionMapping", "convention", "asDynamicObject", "extensions");
+            Set<PropertyMetaData> conventionProperties = new HashSet<PropertyMetaData>();
 
-            Set<MetaBeanProperty> settableProperties = new HashSet<MetaBeanProperty>();
-            Set<MetaBeanProperty> conventionProperties = new HashSet<MetaBeanProperty>();
-
-            MetaClass metaClass = GroovySystem.getMetaClassRegistry().getMetaClass(type);
-            for (MetaProperty property : metaClass.getProperties()) {
-                if (skipProperties.contains(property.getName())) {
+            for (PropertyMetaData property : classMetaData.properties.values()) {
+                if (SKIP_PROPERTIES.contains(property.name)) {
                     continue;
                 }
-                if (property instanceof MetaBeanProperty) {
-                    MetaBeanProperty metaBeanProperty = (MetaBeanProperty) property;
-
-                    boolean needsConventionMapping = true;
-                    MetaMethod getter = metaBeanProperty.getGetter();
-                    if (getter == null) {
-                        needsConventionMapping = false;
-                    } else {
-                        if (Modifier.isFinal(getter.getModifiers()) || Modifier.isPrivate(getter.getModifiers())) {
-                            needsConventionMapping = false;
-                        } else {
-                            Class declaringClass = getter.getDeclaringClass().getTheClass();
-                            if (declaringClass.isAssignableFrom(noMappingClass)) {
-                                needsConventionMapping = false;
-                            }
-                        }
-                    }
 
-                    if (needsConventionMapping) {
-                        conventionProperties.add(metaBeanProperty);
-                        builder.addGetter(metaBeanProperty);
+                if (property.injector) {
+                    builder.addInjectorProperty(property);
+                    for (Method getter : property.getters) {
+                        builder.applyServiceInjectionToGetter(property, getter);
                     }
+                    continue;
+                }
 
-                    MetaMethod setter = metaBeanProperty.getSetter();
-                    if (setter == null || Modifier.isPrivate(setter.getModifiers())) {
-                        continue;
+                boolean needsConventionMapping = false;
+                if (classMetaData.isExtensible()) {
+                    for (Method getter : property.getters) {
+                        if (!Modifier.isFinal(getter.getModifiers()) && !getter.getDeclaringClass().isAssignableFrom(noMappingClass)) {
+                            needsConventionMapping = true;
+                            break;
+                        }
                     }
+                }
 
-                    if (needsConventionMapping && !Modifier.isFinal(setter.getModifiers())) {
-                        builder.addSetter(metaBeanProperty);
+                if (needsConventionMapping) {
+                    conventionProperties.add(property);
+                    builder.addConventionProperty(property);
+                    for (Method getter : property.getters) {
+                        builder.applyConventionMappingToGetter(property, getter);
                     }
+                }
 
-                    if (Iterable.class.isAssignableFrom(property.getType())) {
-                        continue;
+                if (needsConventionMapping) {
+                    for (Method setter : property.setters) {
+                        if (!Modifier.isFinal(setter.getModifiers())) {
+                            builder.applyConventionMappingToSetter(property, setter);
+                        }
                     }
-
-                    settableProperties.add(metaBeanProperty);
                 }
             }
 
-            Multimap<String, MetaMethod> methods = HashMultimap.create();
-            Set<MetaMethod> actionMethods = new HashSet<MetaMethod>();
+            Set<Method> actionMethods = classMetaData.missingOverloads;
+            for (Method method : actionMethods) {
+                builder.addActionMethod(method);
+            }
 
-            for (MetaMethod method : metaClass.getMethods()) {
-                if (method.isPrivate()) {
+            // Adds a set method for each mutable property
+            for (PropertyMetaData property : classMetaData.properties.values()) {
+                if (property.setters.isEmpty()) {
                     continue;
                 }
-                CachedClass[] parameterTypes = method.getParameterTypes();
-                if (parameterTypes.length == 0) {
+                if (Iterable.class.isAssignableFrom(property.getType())) {
+                    // Currently not supported
                     continue;
                 }
-                methods.put(method.getName(), method);
-
-                CachedClass lastParameter = parameterTypes[parameterTypes.length - 1];
-                if (lastParameter.getTheClass().equals(Action.class)) {
-                    actionMethods.add(method);
-                }
-            }
 
-            for (MetaMethod method : actionMethods) {
-                boolean hasClosure = false;
-                Class[] actionMethodParameterTypes = method.getNativeParameterTypes();
-                int numParams = actionMethodParameterTypes.length;
-                Class[] closureMethodParameterTypes = new Class[actionMethodParameterTypes.length];
-                System.arraycopy(actionMethodParameterTypes, 0, closureMethodParameterTypes, 0, actionMethodParameterTypes.length);
-                closureMethodParameterTypes[numParams - 1] = Closure.class;
-                for (MetaMethod otherMethod : methods.get(method.getName())) {
-                    if (Arrays.equals(otherMethod.getNativeParameterTypes(), closureMethodParameterTypes)) {
-                        hasClosure = true;
-                        break;
+                if (property.setMethods.isEmpty()) {
+                    for (Method setter : property.setters) {
+                        builder.addSetMethod(property, setter);
                     }
-                }
-                if (!hasClosure) {
-                    builder.addActionMethod(method);
-                }
-            }
-
-            // Adds a set method for each mutable property
-            for (MetaBeanProperty property : settableProperties) {
-                Collection<MetaMethod> methodsForProperty = methods.get(property.getName());
-                boolean hasSetMethod = false;
-                for (MetaMethod method : methodsForProperty) {
-                    if (method.getParameterTypes().length == 1) {
-                        if (conventionProperties.contains(property)) {
-                            builder.overrideSetMethod(property, method);
-                        }
-                        hasSetMethod = true;
+                } else if (conventionProperties.contains(property)) {
+                    for (Method setMethod : property.setMethods) {
+                        builder.applyConventionMappingToSetMethod(property, setMethod);
                     }
                 }
-
-                if (!hasSetMethod) {
-                    builder.addSetMethod(property);
-                }
             }
 
             for (Constructor<?> constructor : type.getConstructors()) {
@@ -225,10 +199,264 @@ private <T> Class<? extends T> generateUnderLock(Class<T> type) {
         return subclass;
     }
 
-    protected abstract <T> ClassBuilder<T> start(Class<T> type);
+    protected abstract <T> ClassBuilder<T> start(Class<T> type, ClassMetaData classMetaData);
+
+    private ClassMetaData inspectType(Class<?> type) {
+        boolean isConventionAware = type.getAnnotation(NoConventionMapping.class) == null;
+        boolean extensible = JavaReflectionUtil.getAnnotation(type, NonExtensible.class) == null;
+
+        ClassMetaData classMetaData = new ClassMetaData(extensible, isConventionAware);
+        for (Class<?> current = type; current != Object.class; current = current.getSuperclass()) {
+            inspectType(current, classMetaData);
+        }
+        attachSetMethods(classMetaData);
+        findMissingClosureOverloads(classMetaData);
+        classMetaData.complete();
+        return classMetaData;
+    }
+
+    private void findMissingClosureOverloads(ClassMetaData classMetaData) {
+        for (Method method : classMetaData.actionMethods) {
+            Method overload = findClosureOverload(method, classMetaData.closureMethods.get(method.getName()));
+            if (overload == null) {
+                classMetaData.actionMethodRequiresOverload(method);
+            }
+        }
+    }
+
+    private Method findClosureOverload(Method method, Collection<Method> candidates) {
+        for (Method candidate : candidates) {
+            if (candidate.getParameterTypes().length != method.getParameterTypes().length) {
+                continue;
+            }
+            boolean matches = true;
+            for (int i = 0; matches && i < candidate.getParameterTypes().length - 1; i++) {
+                if (!candidate.getParameterTypes()[i].equals(method.getParameterTypes()[i])) {
+                    matches = false;
+                }
+            }
+            if (matches) {
+                return candidate;
+            }
+        }
+        return null;
+    }
+
+    private void attachSetMethods(ClassMetaData classMetaData) {
+        for (Method method : classMetaData.setMethods) {
+            PropertyMetaData property = classMetaData.getProperty(method.getName());
+            if (property != null) {
+                property.addSetMethod(method);
+            }
+        }
+    }
+
+    private void inspectType(Class<?> type, ClassMetaData classMetaData) {
+        for (Method method : type.getDeclaredMethods()) {
+            if (method.getAnnotation(Inject.class) != null) {
+                if (!Modifier.isPublic(method.getModifiers()) && !Modifier.isProtected(method.getModifiers())){
+                    throw new UnsupportedOperationException(String.format("Cannot attach @Inject to method %s.%s() as it is not public or protected.", method.getDeclaringClass().getSimpleName(), method.getName()));
+                }
+                if (Modifier.isStatic(method.getModifiers())) {
+                    throw new UnsupportedOperationException(String.format("Cannot attach @Inject to method %s.%s() as it is static.", method.getDeclaringClass().getSimpleName(), method.getName()));
+                }
+            }
+            if (Modifier.isPrivate(method.getModifiers()) || Modifier.isStatic(method.getModifiers()) || method.isBridge()) {
+                continue;
+            }
+
+            Class<?>[] parameterTypes = method.getParameterTypes();
+            if (method.getName().startsWith("get")
+                    && method.getName().length() > 3
+                    && !method.getReturnType().equals(Void.TYPE)
+                    && parameterTypes.length == 0) {
+                String propertyName = method.getName().substring(3);
+                propertyName = Character.toLowerCase(propertyName.charAt(0)) + propertyName.substring(1);
+                classMetaData.property(propertyName).addGetter(method);
+            } else if (method.getName().startsWith("is")
+                    && method.getName().length() > 2
+                    && (method.getReturnType().equals(Boolean.class) || method.getReturnType().equals(Boolean.TYPE))
+                    && parameterTypes.length == 0) {
+                String propertyName = method.getName().substring(2);
+                propertyName = Character.toLowerCase(propertyName.charAt(0)) + propertyName.substring(1);
+                classMetaData.property(propertyName).addGetter(method);
+            } else if (method.getName().startsWith("set")
+                    && method.getName().length() > 3
+                    && parameterTypes.length == 1) {
+                String propertyName = method.getName().substring(3);
+                propertyName = Character.toLowerCase(propertyName.charAt(0)) + propertyName.substring(1);
+                classMetaData.property(propertyName).addSetter(method);
+            } else {
+                if (parameterTypes.length == 1) {
+                    classMetaData.addCandidateSetMethod(method);
+                }
+                if (parameterTypes.length > 0 && parameterTypes[parameterTypes.length-1].equals(Action.class)) {
+                    classMetaData.addActionMethod(method);
+                } else if (parameterTypes.length > 0 && parameterTypes[parameterTypes.length-1].equals(Closure.class)) {
+                    classMetaData.addClosureMethod(method);
+                }
+            }
+        }
+    }
+
+    protected static class ClassMetaData {
+        private final Map<String, PropertyMetaData> properties = new LinkedHashMap<String, PropertyMetaData>();
+        private final Set<Method> missingOverloads = new LinkedHashSet<Method>();
+        private final boolean extensible;
+        private final boolean conventionAware;
+        private MethodSet actionMethods = new MethodSet();
+        private SetMultimap<String, Method> closureMethods = LinkedHashMultimap.create();
+        private MethodSet setMethods = new MethodSet();
+
+        public ClassMetaData(boolean extensible, boolean conventionAware) {
+            this.extensible = extensible;
+            this.conventionAware = conventionAware;
+        }
+
+        @Nullable
+        public PropertyMetaData getProperty(String name) {
+            return properties.get(name);
+        }
+
+        public PropertyMetaData property(String name) {
+            PropertyMetaData property = properties.get(name);
+            if (property == null) {
+                property = new PropertyMetaData(name);
+                properties.put(name, property);
+            }
+            return property;
+        }
+
+        public void addActionMethod(Method method) {
+            actionMethods.add(method);
+        }
+
+        public void addClosureMethod(Method method) {
+            closureMethods.put(method.getName(), method);
+        }
+
+        public void addCandidateSetMethod(Method method) {
+            setMethods.add(method);
+        }
+
+        public void complete() {
+            setMethods = null;
+            actionMethods = null;
+            closureMethods = null;
+        }
+
+        public void actionMethodRequiresOverload(Method method) {
+            missingOverloads.add(method);
+        }
+
+        public boolean providesDynamicObjectImplementation() {
+            PropertyMetaData property = properties.get("asDynamicObject");
+            return property != null && !property.getters.isEmpty();
+        }
+
+        public boolean isExtensible() {
+            return extensible;
+        }
+
+        public boolean isConventionAware() {
+            return conventionAware;
+        }
+    }
+
+    protected static class PropertyMetaData {
+        final String name;
+        final MethodSet getters = new MethodSet();
+        final MethodSet setters = new MethodSet();
+        final MethodSet setMethods = new MethodSet();
+        boolean injector;
+
+        private PropertyMetaData(String name) {
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("[property %s]", name);
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Class<?> getType() {
+            if (!getters.isEmpty()) {
+                return getters.getValues().get(0).getReturnType();
+            }
+            return setters.getValues().get(0).getParameterTypes()[0];
+        }
+
+        public void addGetter(Method method) {
+            if (getters.add(method) && method.getAnnotation(Inject.class) != null) {
+                injector = true;
+            }
+        }
+
+        public void addSetter(Method method) {
+            setters.add(method);
+        }
+
+        public void addSetMethod(Method method) {
+            setMethods.add(method);
+        }
+    }
+
+    private static class MethodSet implements Iterable<Method> {
+        private final Set<MethodSignature> signatures = new HashSet<MethodSignature>();
+        private final List<Method> methods = new ArrayList<Method>();
+
+        /**
+         * @return true if the method was added, false if not
+         */
+        public boolean add(Method method) {
+            MethodSignature methodSignature = new MethodSignature(method.getName(), method.getParameterTypes());
+            if (signatures.add(methodSignature)) {
+                methods.add(method);
+                return true;
+            }
+            return false;
+        }
+
+        public Iterator<Method> iterator() {
+            return methods.iterator();
+        }
+
+        public List<Method> getValues() {
+            return methods;
+        }
+
+        public boolean isEmpty() {
+            return methods.isEmpty();
+        }
+    }
+
+    private static class MethodSignature {
+        final String name;
+        final Class<?>[] params;
+
+        private MethodSignature(String name, Class<?>[] params) {
+            this.name = name;
+            this.params = params;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            MethodSignature other = (MethodSignature) obj;
+            return other.name.equals(name) && Arrays.equals(params, other.params);
+        }
+
+        @Override
+        public int hashCode() {
+            return name.hashCode() ^ Arrays.hashCode(params);
+        }
+    }
 
     protected interface ClassBuilder<T> {
-        void startClass(boolean isConventionAware);
+        void startClass();
 
         void addConstructor(Constructor<?> constructor) throws Exception;
 
@@ -240,16 +468,22 @@ protected interface ClassBuilder<T> {
 
         void addDynamicMethods() throws Exception;
 
-        void addGetter(MetaBeanProperty property) throws Exception;
+        void addInjectorProperty(PropertyMetaData property);
 
-        void addSetter(MetaBeanProperty property) throws Exception;
+        void applyServiceInjectionToGetter(PropertyMetaData property, Method getter) throws Exception;
 
-        void overrideSetMethod(MetaBeanProperty property, MetaMethod metaMethod) throws Exception;
+        void addConventionProperty(PropertyMetaData property) throws Exception;
 
-        void addSetMethod(MetaBeanProperty property) throws Exception;
+        void applyConventionMappingToGetter(PropertyMetaData property, Method getter) throws Exception;
 
-        Class<? extends T> generate() throws Exception;
+        void applyConventionMappingToSetter(PropertyMetaData property, Method setter) throws Exception;
+
+        void applyConventionMappingToSetMethod(PropertyMetaData property, Method metaMethod) throws Exception;
 
-        void addActionMethod(MetaMethod method) throws Exception;
+        void addSetMethod(PropertyMetaData propertyMetaData, Method setter) throws Exception;
+
+        void addActionMethod(Method method) throws Exception;
+
+        Class<? extends T> generate() throws Exception;
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractPolymorphicDomainObjectContainer.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractPolymorphicDomainObjectContainer.java
index 72d35c410b71..d7e99fbca89d 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractPolymorphicDomainObjectContainer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractPolymorphicDomainObjectContainer.java
@@ -15,6 +15,8 @@
  */
 package org.gradle.api.internal;
 
+import groovy.lang.Closure;
+import groovy.lang.MissingPropertyException;
 import org.gradle.api.*;
 import org.gradle.api.internal.plugins.DefaultConvention;
 import org.gradle.api.plugins.Convention;
@@ -22,10 +24,7 @@
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.util.ConfigureUtil;
 
-import groovy.lang.Closure;
-import groovy.lang.MissingPropertyException;
-
-import java.util.Map;
+import java.util.*;
 
 public abstract class AbstractPolymorphicDomainObjectContainer<T>
         extends AbstractNamedDomainObjectContainer<T> implements PolymorphicDomainObjectContainer<T> {
@@ -150,4 +149,9 @@ private boolean isConfigureMethod(String name, Object... arguments) {
                     && hasProperty(name);
         }
     }
+
+    public <U extends T> NamedDomainObjectContainer<U> containerWithType(Class<U> type) {
+        return getInstantiator().newInstance(TypedDomainObjectContainerWrapper.class, type, this, getInstantiator());
+    }
+
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractTask.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractTask.java
index e53e9ecf1919..6c4771a22e49 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractTask.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractTask.java
@@ -30,7 +30,6 @@
 import org.gradle.api.internal.tasks.execution.TaskValidator;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
-import org.gradle.api.logging.LoggingManager;
 import org.gradle.api.plugins.Convention;
 import org.gradle.api.plugins.ExtensionContainer;
 import org.gradle.api.specs.AndSpec;
@@ -47,6 +46,7 @@
 import org.gradle.util.ConfigureUtil;
 import org.gradle.util.GFileUtils;
 
+import javax.inject.Inject;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
@@ -85,18 +85,12 @@ public abstract class AbstractTask implements TaskInternal, DynamicObjectAware {
 
     private AndSpec<Task> onlyIfSpec = new AndSpec<Task>(createNewOnlyIfSpec());
 
-    private final TaskOutputsInternal outputs;
-
-    private final TaskInputs inputs;
-
     private TaskExecuter executer;
 
     private final ServiceRegistry services;
 
     private final TaskStateInternal state;
 
-    private final LoggingManagerInternal loggingManager;
-
     private List<TaskValidator> validators = new ArrayList<TaskValidator>();
 
     private final TaskStatusNagger taskStatusNagger;
@@ -126,11 +120,8 @@ private AbstractTask(TaskInfo taskInfo) {
         finalizedBy = new DefaultTaskDependency(project.getTasks());
         shouldRunAfter = new DefaultTaskDependency(project.getTasks());
         services = project.getServiceRegistryFactory().createFor(this);
-        extensibleDynamicObject = new ExtensibleDynamicObject(this, getServices().get(Instantiator.class));
+        extensibleDynamicObject = new ExtensibleDynamicObject(this, services.get(Instantiator.class));
         taskStatusNagger = services.get(TaskStatusNagger.class);
-        outputs = services.get(TaskOutputsInternal.class);
-        inputs = services.get(TaskInputs.class);
-        executer = services.get(TaskExecuter.class);
 
         observableActionList = new ObservableActionWrapperList(actions);
         observableActionList.addPropertyChangeListener(new PropertyChangeListener() {
@@ -138,7 +129,6 @@ public void propertyChange(PropertyChangeEvent evt) {
                 taskStatusNagger.nagAboutMutatingListIfTaskNotInConfigurableState("Task.getActions()", evt);
             }
         });
-        loggingManager = services.get(LoggingManagerInternal.class);
     }
 
     public static <T extends Task> T injectIntoNewInstance(ProjectInternal project, String name, Callable<T> factory) {
@@ -286,10 +276,13 @@ public final void execute() {
     }
 
     public void executeWithoutThrowingTaskFailure() {
-        executer.execute(this, state, new DefaultTaskExecutionContext());
+        getExecuter().execute(this, state, new DefaultTaskExecutionContext());
     }
 
     public TaskExecuter getExecuter() {
+        if (executer == null) {
+            executer = services.get(TaskExecuter.class);
+        }
         return executer;
     }
 
@@ -338,12 +331,14 @@ public Logger getLogger() {
         return buildLogger;
     }
 
-    public LoggingManager getLogging() {
-        return loggingManager;
+    @Inject
+    public LoggingManagerInternal getLogging() {
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     public StandardOutputCapture getStandardOutputCapture() {
-        return loggingManager;
+        return getLogging();
     }
 
     public Object property(String propertyName) throws MissingPropertyException {
@@ -386,12 +381,16 @@ public void setGroup(String group) {
         this.group = group;
     }
 
+    @Inject
     public TaskInputs getInputs() {
-        return inputs;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
+    @Inject
     public TaskOutputsInternal getOutputs() {
-        return outputs;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     protected ServiceRegistry getServices() {
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/AsmBackedClassGenerator.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/AsmBackedClassGenerator.java
index 7e87be7fd3c8..64835b7aea8c 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/AsmBackedClassGenerator.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/AsmBackedClassGenerator.java
@@ -16,13 +16,13 @@
 package org.gradle.api.internal;
 
 import groovy.lang.*;
-import org.gradle.api.NonExtensible;
 import org.gradle.api.Transformer;
 import org.gradle.api.plugins.Convention;
 import org.gradle.api.plugins.ExtensionAware;
+import org.gradle.internal.reflect.JavaMethod;
 import org.gradle.internal.reflect.JavaReflectionUtil;
+import org.gradle.internal.service.ServiceRegistry;
 import org.gradle.util.CollectionUtils;
-import org.gradle.internal.reflect.JavaMethod;
 import org.objectweb.asm.*;
 import org.objectweb.asm.Type;
 
@@ -38,11 +38,14 @@ public class AsmBackedClassGenerator extends AbstractClassGenerator {
     private static final JavaMethod<ClassLoader, Class> DEFINE_CLASS_METHOD = JavaReflectionUtil.method(ClassLoader.class, Class.class, "defineClass", String.class, byte[].class, Integer.TYPE, Integer.TYPE);
 
     @Override
-    protected <T> ClassBuilder<T> start(Class<T> type) {
-        return new ClassBuilderImpl<T>(type);
+    protected <T> ClassBuilder<T> start(Class<T> type, ClassMetaData classMetaData) {
+        return new ClassBuilderImpl<T>(type, classMetaData);
     }
 
     private static class ClassBuilderImpl<T> implements ClassBuilder<T> {
+        private static final String DYNAMIC_OBJECT_HELPER_FIELD = "__dyn_obj__";
+        private static final String MAPPING_FIELD = "__mapping__";
+        private static final String META_CLASS_FIELD = "__meta_class__";
         private final ClassWriter visitor;
         private final Class<T> type;
         private final String typeName;
@@ -62,22 +65,25 @@ private static class ClassBuilderImpl<T> implements ClassBuilder<T> {
         private final Type extensibleDynamicObjectHelperType = Type.getType(MixInExtensibleDynamicObject.class);
         private final Type nonExtensibleDynamicObjectHelperType = Type.getType(BeanDynamicObject.class);
 
+        private final boolean conventionAware;
         private final boolean extensible;
+        private final boolean providesOwnDynamicObject;
 
-        private ClassBuilderImpl(Class<T> type) {
+        private ClassBuilderImpl(Class<T> type, ClassMetaData classMetaData) {
             this.type = type;
 
             visitor = new ClassWriter(ClassWriter.COMPUTE_MAXS);
             typeName = type.getName() + "_Decorated";
             generatedType = Type.getType("L" + typeName.replaceAll("\\.", "/") + ";");
             superclassType = Type.getType(type);
-
-            extensible = JavaReflectionUtil.getAnnotation(type, NonExtensible.class) == null;
+            extensible = classMetaData.isExtensible();
+            conventionAware = classMetaData.isConventionAware();
+            providesOwnDynamicObject = classMetaData.providesDynamicObjectImplementation();
         }
 
-        public void startClass(boolean isConventionAware) {
+        public void startClass() {
             List<String> interfaceTypes = new ArrayList<String>();
-            if (isConventionAware && extensible) {
+            if (conventionAware && extensible) {
                 interfaceTypes.add(conventionAwareType.getInternalName());
             }
 
@@ -101,10 +107,7 @@ public void addConstructor(Constructor<?> constructor) throws Exception {
             String methodDescriptor = Type.getMethodDescriptor(Type.VOID_TYPE, paramTypes.toArray(
                     new Type[paramTypes.size()]));
 
-            String signature = signature(constructor);
-
-            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, "<init>", methodDescriptor, signature,
-                    new String[0]);
+            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, "<init>", methodDescriptor, signature(constructor), new String[0]);
 
             for (Annotation annotation : constructor.getDeclaredAnnotations()) {
                 if (annotation.annotationType().getAnnotation(Inherited.class) != null) {
@@ -145,9 +148,44 @@ public void addConstructor(Constructor<?> constructor) throws Exception {
          */
         private String signature(Constructor<?> constructor) {
             StringBuilder builder = new StringBuilder();
-            if (constructor.getTypeParameters().length > 0) {
+            visitFormalTypeParameters(builder, constructor.getTypeParameters());
+            visitParameters(builder, constructor.getGenericParameterTypes());
+            builder.append("V");
+            visitExceptions(builder, constructor.getGenericExceptionTypes());
+            return builder.toString();
+        }
+
+        /**
+         * Generates the signature for the given method
+         */
+        private String signature(Method method) {
+            StringBuilder builder = new StringBuilder();
+            visitFormalTypeParameters(builder, method.getTypeParameters());
+            visitParameters(builder, method.getGenericParameterTypes());
+            visitType(method.getGenericReturnType(), builder);
+            visitExceptions(builder, method.getGenericExceptionTypes());
+            return builder.toString();
+        }
+
+        private void visitExceptions(StringBuilder builder, java.lang.reflect.Type[] exceptionTypes) {
+            for (java.lang.reflect.Type exceptionType : exceptionTypes) {
+                builder.append('^');
+                visitType(exceptionType, builder);
+            }
+        }
+
+        private void visitParameters(StringBuilder builder, java.lang.reflect.Type[] parameterTypes) {
+            builder.append('(');
+            for (java.lang.reflect.Type paramType : parameterTypes) {
+                visitType(paramType, builder);
+            }
+            builder.append(")");
+        }
+
+        private void visitFormalTypeParameters(StringBuilder builder, TypeVariable<?>[] typeParameters) {
+            if (typeParameters.length > 0) {
                 builder.append('<');
-                for (TypeVariable<?> typeVariable : constructor.getTypeParameters()) {
+                for (TypeVariable<?> typeVariable : typeParameters) {
                     builder.append(typeVariable.getName());
                     for (java.lang.reflect.Type bound : typeVariable.getBounds()) {
                         builder.append(':');
@@ -156,16 +194,6 @@ private String signature(Constructor<?> constructor) {
                 }
                 builder.append('>');
             }
-            builder.append('(');
-            for (java.lang.reflect.Type paramType : constructor.getGenericParameterTypes()) {
-                visitType(paramType, builder);
-            }
-            builder.append(")V");
-            for (java.lang.reflect.Type exceptionType : constructor.getGenericExceptionTypes()) {
-                builder.append('^');
-                visitType(exceptionType, builder);
-            }
-            return builder.toString();
         }
 
         private void visitType(java.lang.reflect.Type type, StringBuilder builder) {
@@ -239,13 +267,13 @@ public void mixInDynamicAware() throws Exception {
 
             // GENERATE private MixInExtensibleDynamicObject dynamicObjectHelper = new MixInExtensibleDynamicObject(this, super.getAsDynamicObject())
 
-            Class<?> extensibleObjectFieldType = extensible ? MixInExtensibleDynamicObject.class : BeanDynamicObject.class;
-            final String fieldSignature = Type.getDescriptor(extensibleObjectFieldType);
-            visitor.visitField(Opcodes.ACC_PRIVATE, "dynamicObjectHelper", fieldSignature, null, null);
+            Type extensibleObjectFieldType = extensible ? extensibleDynamicObjectHelperType : nonExtensibleDynamicObjectHelperType;
+            final String fieldSignature = extensibleObjectFieldType.getDescriptor();
+            visitor.visitField(Opcodes.ACC_PRIVATE, DYNAMIC_OBJECT_HELPER_FIELD, fieldSignature, null, null);
             initDynamicObjectHelper = new MethodCodeBody() {
                 public void add(MethodVisitor visitor) throws Exception {
                     generateCreateDynamicObject(visitor);
-                    visitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), "dynamicObjectHelper",
+                    visitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), DYNAMIC_OBJECT_HELPER_FIELD,
                             fieldSignature);
                     // END
                 }
@@ -262,10 +290,9 @@ public void add(MethodVisitor visitor) throws Exception {
                         // GENERATE dynamicObjectHelper.getConvention()
 
                         visitor.visitVarInsn(Opcodes.ALOAD, 0);
-                        visitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), "dynamicObjectHelper",
+                        visitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), DYNAMIC_OBJECT_HELPER_FIELD,
                                 fieldSignature);
-                        String getterDescriptor = Type.getMethodDescriptor(ExtensibleDynamicObject.class.getDeclaredMethod(
-                                "getConvention"));
+                        String getterDescriptor = Type.getMethodDescriptor(ExtensibleDynamicObject.class.getDeclaredMethod("getConvention"));
                         visitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, extensibleDynamicObjectHelperType.getInternalName(), "getConvention",
                                 getterDescriptor);
                     }
@@ -281,8 +308,7 @@ public void add(MethodVisitor visitor) throws Exception {
                         // GENERATE getConvention()
 
                         visitor.visitVarInsn(Opcodes.ALOAD, 0);
-                        String getterDescriptor = Type.getMethodDescriptor(ExtensibleDynamicObject.class.getDeclaredMethod(
-                                "getConvention"));
+                        String getterDescriptor = Type.getMethodDescriptor(ExtensibleDynamicObject.class.getDeclaredMethod("getConvention"));
                         visitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, generatedType.getInternalName(), "getConvention",
                                 getterDescriptor);
                     }
@@ -296,8 +322,7 @@ public void add(MethodVisitor visitor) throws Exception {
             addGetter(DynamicObjectAware.class.getDeclaredMethod("getAsDynamicObject"), new MethodCodeBody() {
                 public void add(MethodVisitor visitor) {
                     visitor.visitVarInsn(Opcodes.ALOAD, 0);
-                    visitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), "dynamicObjectHelper",
-                            fieldSignature);
+                    visitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), DYNAMIC_OBJECT_HELPER_FIELD, fieldSignature);
                 }
             });
 
@@ -307,9 +332,7 @@ public void add(MethodVisitor visitor) {
         private void generateCreateDynamicObject(MethodVisitor visitor) {
             if (extensible) {
 
-                String helperTypeConstructorDesc = Type.getMethodDescriptor(Type.VOID_TYPE, new Type[]{
-                        Type.getType(Object.class), dynamicObjectType
-                });
+                String helperTypeConstructorDesc = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Object.class), dynamicObjectType);
 
                 // GENERATE dynamicObjectHelper = new MixInExtensibleDynamicObject(this, super.getAsDynamicObject())
 
@@ -321,13 +344,11 @@ private void generateCreateDynamicObject(MethodVisitor visitor) {
 
                 visitor.visitVarInsn(Opcodes.ALOAD, 0);
 
-                boolean useInheritedDynamicObject = GroovySystem.getMetaClassRegistry().getMetaClass(type).pickMethod("getAsDynamicObject", new Class[0]) != null;
-
-                if (useInheritedDynamicObject) {
+                if (providesOwnDynamicObject) {
                     // GENERATE super.getAsDynamicObject()
                     visitor.visitVarInsn(Opcodes.ALOAD, 0);
                     visitor.visitMethodInsn(Opcodes.INVOKESPECIAL, Type.getType(type).getInternalName(),
-                            "getAsDynamicObject", Type.getMethodDescriptor(dynamicObjectType, new Type[0]));
+                            "getAsDynamicObject", Type.getMethodDescriptor(dynamicObjectType));
                 } else {
                     // GENERATE null
                     visitor.visitInsn(Opcodes.ACONST_NULL);
@@ -337,9 +358,7 @@ private void generateCreateDynamicObject(MethodVisitor visitor) {
                         helperTypeConstructorDesc);
                 // END
             } else {
-                String helperTypeConstructorDesc = Type.getMethodDescriptor(Type.VOID_TYPE, new Type[]{
-                        Type.getType(Object.class)
-                });
+                String helperTypeConstructorDesc = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(Object.class));
 
                 // GENERATE new BeanDynamicObject(this)
 
@@ -365,9 +384,9 @@ public void mixInConventionAware() throws Exception {
             // GENERATE private ConventionMapping mapping = new ConventionAwareHelper(this, getConvention())
 
             final String mappingFieldSignature = Type.getDescriptor(ConventionMapping.class);
-            final String getConventionDesc = Type.getMethodDescriptor(conventionType, new Type[0]);
+            final String getConventionDesc = Type.getMethodDescriptor(conventionType);
 
-            visitor.visitField(Opcodes.ACC_PRIVATE, "mapping", mappingFieldSignature, null, null);
+            visitor.visitField(Opcodes.ACC_PRIVATE, MAPPING_FIELD, mappingFieldSignature, null, null);
 
             initConventionAwareHelper = new MethodCodeBody() {
                 public void add(MethodVisitor visitor) throws Exception {
@@ -388,13 +407,11 @@ public void add(MethodVisitor visitor) throws Exception {
 
                     // END
 
-                    String constructorDesc = Type.getMethodDescriptor(Type.VOID_TYPE, new Type[]{
-                            conventionAwareType, conventionType
-                    });
+                    String constructorDesc = Type.getMethodDescriptor(Type.VOID_TYPE, conventionAwareType, conventionType);
                     visitor.visitMethodInsn(Opcodes.INVOKESPECIAL, helperType.getInternalName(), "<init>",
                             constructorDesc);
 
-                    visitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), "mapping",
+                    visitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), MAPPING_FIELD,
                             mappingFieldSignature);
 
                     // END
@@ -410,7 +427,7 @@ public void add(MethodVisitor visitor) throws Exception {
                 public void add(MethodVisitor visitor) {
                     // GENERATE if (mapping != null) {... }
                     visitor.visitVarInsn(Opcodes.ALOAD, 0);
-                    visitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), "mapping",
+                    visitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), MAPPING_FIELD,
                             mappingFieldSignature);
                     visitor.visitInsn(Opcodes.DUP);
                     Label nullBranch = new Label();
@@ -419,7 +436,7 @@ public void add(MethodVisitor visitor) {
                     // GENERATE else { return new ConventionAwareHelper(this); }
                     visitor.visitLabel(nullBranch);
                     Type conventionAwareHelperType = Type.getType(ConventionAwareHelper.class);
-                    String constructorDesc = Type.getMethodDescriptor(Type.VOID_TYPE, new Type[]{Type.getType(IConventionAware.class)});
+                    String constructorDesc = Type.getMethodDescriptor(Type.VOID_TYPE, Type.getType(IConventionAware.class));
                     visitor.visitTypeInsn(Opcodes.NEW, conventionAwareHelperType.getInternalName());
                     visitor.visitInsn(Opcodes.DUP);
                     visitor.visitVarInsn(Opcodes.ALOAD, 0);
@@ -434,7 +451,7 @@ public void mixInGroovyObject() throws Exception {
             // GENERATE private MetaClass metaClass = GroovySystem.getMetaClassRegistry().getMetaClass(getClass())
 
             final String metaClassFieldSignature = Type.getDescriptor(MetaClass.class);
-            visitor.visitField(Opcodes.ACC_PRIVATE, "metaClass", metaClassFieldSignature, null, null);
+            visitor.visitField(Opcodes.ACC_PRIVATE, META_CLASS_FIELD, metaClassFieldSignature, null, null);
 
             initMetaClass = new MethodCodeBody() {
                 public void add(MethodVisitor visitor) throws Exception {
@@ -458,7 +475,7 @@ public void add(MethodVisitor visitor) throws Exception {
                     visitor.visitMethodInsn(Opcodes.INVOKEINTERFACE, Type.getType(
                             MetaClassRegistry.class).getInternalName(), "getMetaClass", getMetaClassDesc);
 
-                    visitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), "metaClass",
+                    visitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), META_CLASS_FIELD,
                             metaClassFieldSignature);
                 }
             };
@@ -468,7 +485,7 @@ public void add(MethodVisitor visitor) throws Exception {
             addGetter(GroovyObject.class.getDeclaredMethod("getMetaClass"), new MethodCodeBody() {
                 public void add(MethodVisitor visitor) throws Exception {
                     visitor.visitVarInsn(Opcodes.ALOAD, 0);
-                    visitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), "metaClass",
+                    visitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), META_CLASS_FIELD,
                             metaClassFieldSignature);
                 }
             });
@@ -479,7 +496,7 @@ public void add(MethodVisitor visitor) throws Exception {
                 public void add(MethodVisitor visitor) throws Exception {
                     visitor.visitVarInsn(Opcodes.ALOAD, 0);
                     visitor.visitVarInsn(Opcodes.ALOAD, 1);
-                    visitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), "metaClass",
+                    visitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), META_CLASS_FIELD,
                             metaClassFieldSignature);
                 }
             });
@@ -487,8 +504,7 @@ public void add(MethodVisitor visitor) throws Exception {
 
         private void addSetter(Method method, MethodCodeBody body) throws Exception {
             String methodDescriptor = Type.getMethodDescriptor(method);
-            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, method.getName(), methodDescriptor,
-                    null, new String[0]);
+            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, method.getName(), methodDescriptor, null, new String[0]);
             methodVisitor.visitCode();
             body.add(methodVisitor);
             methodVisitor.visitInsn(Opcodes.RETURN);
@@ -503,8 +519,7 @@ private void addGetter(Method method, MethodCodeBody body) throws Exception {
         }
 
         private void addGetter(String methodName, String methodDescriptor, MethodCodeBody body) throws Exception {
-            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, methodName, methodDescriptor,
-                    null, new String[0]);
+            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, methodName, methodDescriptor, null, new String[0]);
             methodVisitor.visitCode();
             body.add(methodVisitor);
             methodVisitor.visitInsn(Opcodes.ARETURN);
@@ -538,7 +553,7 @@ public void add(MethodVisitor methodVisitor) throws Exception {
 
             // GENERATE public boolean hasProperty(String name) { return getAsDynamicObject().hasProperty(name) }
 
-            String methodDescriptor = Type.getMethodDescriptor(Type.getType(Boolean.TYPE), new Type[]{Type.getType(String.class)});
+            String methodDescriptor = Type.getMethodDescriptor(Type.getType(Boolean.TYPE), Type.getType(String.class));
             MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, "hasProperty", methodDescriptor, null, new String[0]);
             methodVisitor.visitCode();
 
@@ -590,9 +605,7 @@ public void add(MethodVisitor methodVisitor) throws Exception {
             addGetter(GroovyObject.class.getDeclaredMethod("invokeMethod", String.class, Object.class),
                     new MethodCodeBody() {
                         public void add(MethodVisitor methodVisitor) throws Exception {
-                            String invokeMethodDesc = Type.getMethodDescriptor(Type.getType(Object.class), new Type[]{
-                                    Type.getType(String.class), Type.getType(Object[].class)
-                            });
+                            String invokeMethodDesc = Type.getMethodDescriptor(Type.getType(Object.class), Type.getType(String.class), Type.getType(Object[].class));
                             String objArrayDesc = Type.getType(Object[].class).getDescriptor();
 
                             // GENERATE getAsDynamicObject().invokeMethod(name, (args instanceof Object[]) ? args : new Object[] { args })
@@ -613,7 +626,6 @@ public void add(MethodVisitor methodVisitor) throws Exception {
                             methodVisitor.visitJumpInsn(Opcodes.IFEQ, notArray);
 
                             // Generate args
-//                            methodVisitor.visitInsn(Opcodes.ACONST_NULL);
                             methodVisitor.visitVarInsn(Opcodes.ALOAD, 2);
                             methodVisitor.visitTypeInsn(Opcodes.CHECKCAST, objArrayDesc);
                             methodVisitor.visitJumpInsn(Opcodes.GOTO, end);
@@ -635,51 +647,97 @@ public void add(MethodVisitor methodVisitor) throws Exception {
                     });
         }
 
-        public void addGetter(MetaBeanProperty property) throws Exception {
-            if (!extensible) {
-                return;
-            }
-            MetaMethod getter = property.getGetter();
-
-            // GENERATE private boolean <prop>Set;
+        public void addInjectorProperty(PropertyMetaData property) {
+            // GENERATE private <type> <property-field-name>;
+            String flagName = propFieldName(property);
+            visitor.visitField(Opcodes.ACC_PRIVATE, flagName, Type.getDescriptor(property.getType()), null, null);
+        }
 
-            String flagName = String.format("%sSet", property.getName());
-            visitor.visitField(Opcodes.ACC_PRIVATE, flagName, Type.BOOLEAN_TYPE.getDescriptor(), null, null);
+        public void applyServiceInjectionToGetter(PropertyMetaData property, Method getter) throws Exception {
+            // GENERATE public <type> <getter>() { if (<field> == null) { <field> = getServices().get(getClass().getDeclaredMethod(<getter-name>).getGenericReturnType()); } return <field> }
 
-            addConventionGetter(getter.getName(), flagName, property);
+            Type serviceRegistryType = Type.getType(ServiceRegistry.class);
+            Type classType = Type.getType(Class.class);
+            Type methodType = Type.getType(Method.class);
+            Type typeType = Type.getType(java.lang.reflect.Type.class);
 
             String getterName = getter.getName();
-            Class<?> returnType = getter.getReturnType();
-
-            // If it's a boolean property, there can be get or is type variants.
-            // If this class has both, decorate both.
-            if (returnType.equals(Boolean.TYPE)) {
-                boolean getterIsIsMethod = getterName.startsWith("is");
-                String propertyNameComponent = getterName.substring(getterIsIsMethod ? 2 : 3);
-                String alternativeGetterName = String.format("%s%s", getterIsIsMethod ? "get" : "is", propertyNameComponent);
-
-                try {
-                    type.getMethod(alternativeGetterName);
-                    addConventionGetter(alternativeGetterName, flagName, property);
-                } catch (NoSuchMethodException e) {
-                    // ignore, no method to override
-                }
-            }
+            Type returnType = Type.getType(getter.getReturnType());
+            String methodDescriptor = Type.getMethodDescriptor(returnType);
+            Type serviceType = Type.getType(property.getType());
+
+            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, getterName, methodDescriptor, signature(getter), new String[0]);
+            methodVisitor.visitCode();
+
+            // if (this.<field> == null) { ...  }
+
+            // this.field
+            methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
+            methodVisitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), propFieldName(property), serviceType.getDescriptor());
+
+            Label alreadyLoaded = new Label();
+            methodVisitor.visitJumpInsn(Opcodes.IFNONNULL, alreadyLoaded);
+
+            methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
+
+            // this.getServices()
+            methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
+            methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, generatedType.getInternalName(), "getServices", Type.getMethodDescriptor(serviceRegistryType));
+
+            // this.getClass()
+            methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
+            methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, generatedType.getInternalName(), "getClass", Type.getMethodDescriptor(classType));
+
+            // <class>.getDeclaredMethod(<getter-name>)
+            methodVisitor.visitLdcInsn(getterName);
+            methodVisitor.visitInsn(Opcodes.ICONST_0);
+            methodVisitor.visitTypeInsn(Opcodes.ANEWARRAY, classType.getInternalName());
+            methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, classType.getInternalName(), "getDeclaredMethod", Type.getMethodDescriptor(methodType, Type.getType(String.class), Type.getType(Class[].class)));
+
+            // <method>.getGenericReturnType()
+            methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, methodType.getInternalName(), "getGenericReturnType", Type.getMethodDescriptor(typeType));
+
+            // get(<type>)
+            methodVisitor.visitMethodInsn(Opcodes.INVOKEINTERFACE, serviceRegistryType.getInternalName(), "get", Type.getMethodDescriptor(Type.getType(Object.class), typeType));
+
+            // this.field = (<type>)<service>
+            methodVisitor.visitTypeInsn(Opcodes.CHECKCAST, serviceType.getInternalName());
+            methodVisitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), propFieldName(property), serviceType.getDescriptor());
+
+            // this.field
+            methodVisitor.visitLabel(alreadyLoaded);
+            methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
+            methodVisitor.visitFieldInsn(Opcodes.GETFIELD, generatedType.getInternalName(), propFieldName(property), serviceType.getDescriptor());
+
+            // return
+            methodVisitor.visitInsn(returnType.getOpcode(Opcodes.IRETURN));
+            methodVisitor.visitMaxs(0, 0);
+            methodVisitor.visitEnd();
+        }
+
+        public void addConventionProperty(PropertyMetaData property) throws Exception {
+            // GENERATE private boolean <flag-name>;
+            String flagName = propFieldName(property);
+            visitor.visitField(Opcodes.ACC_PRIVATE, flagName, Type.BOOLEAN_TYPE.getDescriptor(), null, null);
         }
 
-        private void addConventionGetter(String getterName, String flagName, MetaBeanProperty property) throws Exception {
+        private String propFieldName(PropertyMetaData property) {
+            return String.format("__%s__", property.getName());
+        }
+
+        public void applyConventionMappingToGetter(PropertyMetaData property, Method getter) throws Exception {
             // GENERATE public <type> <getter>() { return (<type>)getConventionMapping().getConventionValue(super.<getter>(), '<prop>', <prop>Set); }
-            MetaMethod getter = property.getGetter();
+            String flagName = propFieldName(property);
+            String getterName = getter.getName();
 
             Type returnType = Type.getType(getter.getReturnType());
-            String methodDescriptor = Type.getMethodDescriptor(returnType, new Type[0]);
-            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, getterName, methodDescriptor,
-                    null, new String[0]);
+            String methodDescriptor = Type.getMethodDescriptor(returnType);
+            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, getterName, methodDescriptor, null, new String[0]);
             methodVisitor.visitCode();
 
             methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
             methodVisitor.visitMethodInsn(Opcodes.INVOKEINTERFACE, conventionAwareType.getInternalName(),
-                    "getConventionMapping", Type.getMethodDescriptor(conventionMappingType, new Type[0]));
+                    "getConventionMapping", Type.getMethodDescriptor(conventionMappingType));
 
             methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
             methodVisitor.visitMethodInsn(Opcodes.INVOKESPECIAL, superclassType.getInternalName(), getterName,
@@ -689,7 +747,7 @@ private void addConventionGetter(String getterName, String flagName, MetaBeanPro
             if (getter.getReturnType().isPrimitive()) {
                 // Box value
                 boxedType = Type.getType(JavaReflectionUtil.getWrapperTypeForPrimitiveType(getter.getReturnType()));
-                String valueOfMethodDescriptor = Type.getMethodDescriptor(boxedType, new Type[]{returnType});
+                String valueOfMethodDescriptor = Type.getMethodDescriptor(boxedType, returnType);
                 methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, boxedType.getInternalName(), "valueOf", valueOfMethodDescriptor);
             }
 
@@ -707,7 +765,7 @@ private void addConventionGetter(String getterName, String flagName, MetaBeanPro
             if (getter.getReturnType().isPrimitive()) {
                 // Unbox value
                 methodVisitor.visitTypeInsn(Opcodes.CHECKCAST, boxedType.getInternalName());
-                String valueMethodDescriptor = Type.getMethodDescriptor(returnType, new Type[0]);
+                String valueMethodDescriptor = Type.getMethodDescriptor(returnType);
                 methodVisitor.visitMethodInsn(Opcodes.INVOKEVIRTUAL, boxedType.getInternalName(), getter.getReturnType().getName() + "Value", valueMethodDescriptor);
             } else {
                 // Cast to return type
@@ -721,17 +779,12 @@ private void addConventionGetter(String getterName, String flagName, MetaBeanPro
             methodVisitor.visitEnd();
         }
 
-        public void addSetter(MetaBeanProperty property) throws Exception {
-            if (!extensible) {
-                return;
-            }
-            MetaMethod setter = property.getSetter();
-
+        public void applyConventionMappingToSetter(PropertyMetaData property, Method setter) throws Exception {
             // GENERATE public <return-type> <setter>(<type> v) { <return-type> v = super.<setter>(v); <prop>Set = true; return v; }
 
-            Type paramType = Type.getType(setter.getParameterTypes()[0].getTheClass());
+            Type paramType = Type.getType(setter.getParameterTypes()[0]);
             Type returnType = Type.getType(setter.getReturnType());
-            String setterDescriptor = Type.getMethodDescriptor(returnType, new Type[]{paramType});
+            String setterDescriptor = Type.getMethodDescriptor(returnType, paramType);
             MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, setter.getName(), setterDescriptor, null, new String[0]);
             methodVisitor.visitCode();
 
@@ -748,8 +801,7 @@ public void addSetter(MetaBeanProperty property) throws Exception {
 
             methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
             methodVisitor.visitLdcInsn(true);
-            methodVisitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), String.format("%sSet",
-                    property.getName()), Type.BOOLEAN_TYPE.getDescriptor());
+            methodVisitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), propFieldName(property), Type.BOOLEAN_TYPE.getDescriptor());
 
             // END
 
@@ -758,14 +810,13 @@ public void addSetter(MetaBeanProperty property) throws Exception {
             methodVisitor.visitEnd();
         }
 
-        public void addSetMethod(MetaBeanProperty property) throws Exception {
-            MetaMethod setter = property.getSetter();
-            Type paramType = Type.getType(setter.getParameterTypes()[0].getTheClass());
+        public void addSetMethod(PropertyMetaData property, Method setter) throws Exception {
+            Type paramType = Type.getType(setter.getParameterTypes()[0]);
             Type returnType = Type.getType(setter.getReturnType());
-            String setterDescriptor = Type.getMethodDescriptor(returnType, new Type[]{paramType});
+            String setterDescriptor = Type.getMethodDescriptor(returnType, paramType);
 
             // GENERATE public void <propName>(<type> v) { <setter>(v) }
-            String setMethodDescriptor = Type.getMethodDescriptor(Type.VOID_TYPE, new Type[]{paramType});
+            String setMethodDescriptor = Type.getMethodDescriptor(Type.VOID_TYPE, paramType);
             MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, property.getName(), setMethodDescriptor, null, new String[0]);
             methodVisitor.visitCode();
 
@@ -783,18 +834,13 @@ public void addSetMethod(MetaBeanProperty property) throws Exception {
             methodVisitor.visitEnd();
         }
 
-        public void overrideSetMethod(MetaBeanProperty property, MetaMethod metaMethod) throws Exception {
-            if (metaMethod.getParameterTypes().length != 1) {
-                throw new IllegalArgumentException("Can only override set methods that take one argument: " + metaMethod.toString());
-            } else if (!extensible) {
-                return;
-            }
-            Type paramType = Type.getType(metaMethod.getParameterTypes()[0].getTheClass());
-            Type returnType = Type.getType(metaMethod.getReturnType());
-            String methodDescriptor = Type.getMethodDescriptor(returnType, new Type[]{paramType});
+        public void applyConventionMappingToSetMethod(PropertyMetaData property, Method method) throws Exception {
+            Type paramType = Type.getType(method.getParameterTypes()[0]);
+            Type returnType = Type.getType(method.getReturnType());
+            String methodDescriptor = Type.getMethodDescriptor(returnType, paramType);
 
             // GENERATE public <returnType> <propName>(<type> v) { val = super.<propName>(v); <prop>Set = true; return val; }
-            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, metaMethod.getName(), methodDescriptor, null, new String[0]);
+            MethodVisitor methodVisitor = visitor.visitMethod(Opcodes.ACC_PUBLIC, method.getName(), methodDescriptor, null, new String[0]);
             methodVisitor.visitCode();
 
             // GENERATE super.<propName>(v)
@@ -802,14 +848,13 @@ public void overrideSetMethod(MetaBeanProperty property, MetaMethod metaMethod)
             methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
             methodVisitor.visitVarInsn(paramType.getOpcode(Opcodes.ILOAD), 1);
 
-            methodVisitor.visitMethodInsn(Opcodes.INVOKESPECIAL, superclassType.getInternalName(), metaMethod.getName(), methodDescriptor);
+            methodVisitor.visitMethodInsn(Opcodes.INVOKESPECIAL, superclassType.getInternalName(), method.getName(), methodDescriptor);
 
             // GENERATE <prop>Set = true
 
             methodVisitor.visitVarInsn(Opcodes.ALOAD, 0);
             methodVisitor.visitLdcInsn(true);
-            methodVisitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), String.format("%sSet",
-                    property.getName()), Type.BOOLEAN_TYPE.getDescriptor());
+            methodVisitor.visitFieldInsn(Opcodes.PUTFIELD, generatedType.getInternalName(), propFieldName(property), Type.BOOLEAN_TYPE.getDescriptor());
 
             // END
 
@@ -818,11 +863,11 @@ public void overrideSetMethod(MetaBeanProperty property, MetaMethod metaMethod)
             methodVisitor.visitEnd();
         }
 
-        public void addActionMethod(MetaMethod method) throws Exception {
+        public void addActionMethod(Method method) throws Exception {
             Type actionImplType = Type.getType(ClosureBackedAction.class);
             Type closureType = Type.getType(Closure.class);
 
-            Type[] originalParameterTypes = CollectionUtils.collectArray(method.getNativeParameterTypes(), Type.class, new Transformer<Type, Class>() {
+            Type[] originalParameterTypes = CollectionUtils.collectArray(method.getParameterTypes(), Type.class, new Transformer<Type, Class>() {
                 public Type transform(Class clazz) {
                     return Type.getType(clazz);
                 }
@@ -849,7 +894,7 @@ public Type transform(Class clazz) {
             methodVisitor.visitTypeInsn(Opcodes.NEW, actionImplType.getInternalName());
             methodVisitor.visitInsn(Opcodes.DUP);
             methodVisitor.visitVarInsn(Opcodes.ALOAD, numParams);
-            String constuctorDescriptor = Type.getMethodDescriptor(Type.VOID_TYPE, new Type[]{closureType});
+            String constuctorDescriptor = Type.getMethodDescriptor(Type.VOID_TYPE, closureType);
             methodVisitor.visitMethodInsn(Opcodes.INVOKESPECIAL, actionImplType.getInternalName(), "<init>", constuctorDescriptor);
 
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/ClosureBackedAction.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/ClosureBackedAction.java
index db7cd91e2a2e..37c70dfe32b6 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/ClosureBackedAction.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/ClosureBackedAction.java
@@ -16,6 +16,7 @@
 
 package org.gradle.api.internal;
 
+import com.google.common.base.Objects;
 import groovy.lang.Closure;
 import org.gradle.api.Action;
 import org.gradle.api.InvalidActionClosureException;
@@ -47,7 +48,7 @@ public void execute(T delegate) {
 
         try {
             if (configureableAware && delegate instanceof Configurable) {
-                ((Configurable)delegate).configure(closure);
+                ((Configurable) delegate).configure(closure);
             } else {
                 Closure copy = (Closure) closure.clone();
                 copy.setResolveStrategy(resolveStrategy);
@@ -59,9 +60,10 @@ public void execute(T delegate) {
                 }
             }
         } catch (groovy.lang.MissingMethodException e) {
-            if (e.getType().equals(closure.getClass()) && e.getMethod().equals("doCall")) {
+            if (Objects.equal(e.getType(), closure.getClass()) && Objects.equal(e.getMethod(), "doCall")) {
                 throw new InvalidActionClosureException(closure, delegate);
             }
+            throw e;
         }
     }
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/ConfigureDelegate.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/ConfigureDelegate.java
index cf4de20402cd..f54ce6ef36a6 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/ConfigureDelegate.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/ConfigureDelegate.java
@@ -61,6 +61,11 @@ public Object invokeMethod(String name, Object paramsObj) {
             try {
                 return _delegate.invokeMethod(name, params);
             } catch (groovy.lang.MissingMethodException e) {
+                // TODO - should check the type as well, and below too, however we have no idea what the final type is going to be.
+                // Rework the DynamicObject contract to allow us to know if the method was found or not
+                if (!name.equals(e.getMethod())) {
+                    throw e;
+                }
                 failure = e;
             }
 
@@ -68,6 +73,9 @@ public Object invokeMethod(String name, Object paramsObj) {
             try {
                 return _owner.invokeMethod(name, params);
             } catch (groovy.lang.MissingMethodException e) {
+                if (!name.equals(e.getMethod())) {
+                    throw e;
+                }
                 // ignore
             }
 
@@ -89,6 +97,9 @@ public Object get(String name) {
             try {
                 return _delegate.getProperty(name);
             } catch (MissingPropertyException e) {
+                if (!name.equals(e.getProperty())) {
+                    throw e;
+                }
                 failure = e;
             }
 
@@ -96,6 +107,9 @@ public Object get(String name) {
             try {
                 return _owner.getProperty(name);
             } catch (MissingPropertyException e) {
+                if (!name.equals(e.getProperty())) {
+                    throw e;
+                }
                 // Ignore
             }
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/DependencyClassPathProvider.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/DependencyClassPathProvider.java
index 5423975016b6..ed1c1af46146 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/DependencyClassPathProvider.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/DependencyClassPathProvider.java
@@ -19,10 +19,11 @@
 import org.gradle.api.internal.classpath.Module;
 import org.gradle.api.internal.classpath.ModuleRegistry;
 import org.gradle.api.internal.classpath.PluginModuleRegistry;
-import org.gradle.api.internal.classpath.UnknownModuleException;
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.classpath.DefaultClassPath;
 
+import java.util.Arrays;
+
 import static org.gradle.api.internal.artifacts.dsl.dependencies.DependencyFactory.ClassPathNotation.GRADLE_API;
 import static org.gradle.api.internal.artifacts.dsl.dependencies.DependencyFactory.ClassPathNotation.LOCAL_GROOVY;
 
@@ -38,15 +39,10 @@ public DependencyClassPathProvider(ModuleRegistry moduleRegistry, PluginModuleRe
     public ClassPath findClassPath(String name) {
         if (name.equals(GRADLE_API.name())) {
             ClassPath classpath = new DefaultClassPath();
-            Module core = moduleRegistry.getModule("gradle-core");
-            for (Module module : core.getAllRequiredModules()) {
-                classpath = classpath.plus(module.getClasspath());
-            }
-            classpath = classpath.plus(moduleRegistry.getModule("gradle-core-impl").getClasspath());
-            try {
-                classpath = classpath.plus(moduleRegistry.getModule("gradle-tooling-api").getImplementationClasspath());
-            } catch (UnknownModuleException e) {
-                // Ignore
+            for (String moduleName : Arrays.asList("gradle-core", "gradle-core-impl", "gradle-plugin-use", "gradle-tooling-api")) {
+                for (Module module : moduleRegistry.getModule(moduleName).getAllRequiredModules()) {
+                    classpath = classpath.plus(module.getClasspath());
+                }
             }
             for (Module pluginModule : pluginModuleRegistry.getPluginModules()) {
                 classpath = classpath.plus(pluginModule.getClasspath());
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicModulesClassPathProvider.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicModulesClassPathProvider.java
index dfca66a233b7..1c44edf4f970 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicModulesClassPathProvider.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/DynamicModulesClassPathProvider.java
@@ -21,6 +21,9 @@
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.classpath.DefaultClassPath;
 
+import java.util.Arrays;
+import java.util.Set;
+
 public class DynamicModulesClassPathProvider implements ClassPathProvider {
     private final ModuleRegistry moduleRegistry;
     private final PluginModuleRegistry pluginModuleRegistry;
@@ -39,7 +42,16 @@ public ClassPath findClassPath(String name) {
             return classpath;
         }
         if (name.equals("GRADLE_CORE_IMPL")) {
-            return moduleRegistry.getModule("gradle-core-impl").getClasspath();
+            Set<Module> coreModules = moduleRegistry.getModule("gradle-core").getAllRequiredModules();
+            ClassPath classpath = new DefaultClassPath();
+            for (String moduleName : Arrays.asList("gradle-core-impl", "gradle-plugin-use")) {
+                for (Module module : moduleRegistry.getModule(moduleName).getAllRequiredModules()) {
+                    if (!coreModules.contains(module)) {
+                        classpath = classpath.plus(module.getClasspath());
+                    }
+                }
+            }
+            return classpath;
         }
 
         return null;
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapper.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapper.java
new file mode 100644
index 000000000000..6142dff69ee6
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapper.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal;
+
+import groovy.lang.Closure;
+import org.gradle.api.*;
+import org.gradle.api.internal.plugins.DefaultConvention;
+import org.gradle.api.plugins.Convention;
+import org.gradle.api.specs.Spec;
+import org.gradle.internal.reflect.Instantiator;
+import org.gradle.util.ConfigureUtil;
+
+import java.util.*;
+
+public class TypedDomainObjectContainerWrapper<U> implements NamedDomainObjectContainer<U>, DynamicObjectAware {
+    private final Class<U> type;
+    private final PolymorphicDomainObjectContainer<? super U> parent;
+    private final NamedDomainObjectSet<U> delegate;
+    private final Convention convention;
+
+    public TypedDomainObjectContainerWrapper(Class<U> type, PolymorphicDomainObjectContainer<? super U> parent, Instantiator instantiator) {
+        this.parent = parent;
+        this.type = type;
+        this.delegate = parent.withType(type);
+        this.convention = new DefaultConvention(instantiator);
+    }
+
+    public Convention getConvention() {
+        return convention;
+    }
+
+    public U create(String name) throws InvalidUserDataException {
+        return parent.create(name, type);
+    }
+
+    public U create(String name, Action<? super U> configureAction) throws InvalidUserDataException {
+        return parent.create(name, type, configureAction);
+    }
+
+    public U create(String name, Closure configureClosure) throws InvalidUserDataException {
+        return parent.create(name, type, new ClosureBackedAction<U>(configureClosure));
+    }
+
+    public U maybeCreate(String name) {
+        return parent.maybeCreate(name, type);
+    }
+
+    public DynamicObject getAsDynamicObject() {
+        return ((DynamicObjectAware) delegate).getAsDynamicObject();
+    }
+
+    public NamedDomainObjectContainer<U> configure(Closure configureClosure) {
+        NamedDomainObjectContainerConfigureDelegate delegate = new NamedDomainObjectContainerConfigureDelegate(configureClosure.getOwner(), this);
+        ConfigureUtil.configure(configureClosure, delegate);
+        return this;
+    }
+
+    public Set<U> findAll(Closure spec) {
+        return delegate.findAll(spec);
+    }
+
+    public NamedDomainObjectSet<U> matching(Closure spec) {
+        return delegate.matching(spec);
+    }
+
+    public NamedDomainObjectSet<U> matching(Spec<? super U> spec) {
+        return delegate.matching(spec);
+    }
+
+    public <S extends U> NamedDomainObjectSet<S> withType(Class<S> type) {
+        return delegate.withType(type);
+    }
+
+    public boolean add(U e) {
+        return delegate.add(e);
+    }
+
+    public boolean addAll(Collection<? extends U> c) {
+        return delegate.addAll(c);
+    }
+
+    public Rule addRule(String description, Closure ruleAction) {
+        return delegate.addRule(description, ruleAction);
+    }
+
+    public Rule addRule(Rule rule) {
+        return delegate.addRule(rule);
+    }
+
+    public U findByName(String name) {
+        return delegate.findByName(name);
+    }
+
+    public SortedMap<String, U> getAsMap() {
+        return delegate.getAsMap();
+    }
+
+    public U getAt(String name) throws UnknownDomainObjectException {
+        return delegate.getAt(name);
+    }
+
+    public U getByName(String name) throws UnknownDomainObjectException {
+        return delegate.getByName(name);
+    }
+
+    public U getByName(String name, Closure configureClosure) throws UnknownDomainObjectException {
+        return delegate.getByName(name, configureClosure);
+    }
+
+    public Namer<U> getNamer() {
+        return delegate.getNamer();
+    }
+
+    public SortedSet<String> getNames() {
+        return delegate.getNames();
+    }
+
+    public List<Rule> getRules() {
+        return delegate.getRules();
+    }
+
+    public void all(Action<? super U> action) {
+        delegate.all(action);
+    }
+
+    public void all(Closure action) {
+        delegate.all(action);
+    }
+
+    public Action<? super U> whenObjectAdded(Action<? super U> action) {
+        return delegate.whenObjectAdded(action);
+    }
+
+    public void whenObjectAdded(Closure action) {
+        delegate.whenObjectAdded(action);
+    }
+
+    public Action<? super U> whenObjectRemoved(Action<? super U> action) {
+        return delegate.whenObjectRemoved(action);
+    }
+
+    public void whenObjectRemoved(Closure action) {
+        delegate.whenObjectRemoved(action);
+    }
+
+    public <S extends U> DomainObjectCollection<S> withType(Class<S> type, Action<? super S> configureAction) {
+        return delegate.withType(type, configureAction);
+    }
+
+    public <S extends U> DomainObjectCollection<S> withType(Class<S> type, Closure configureClosure) {
+        return delegate.withType(type, configureClosure);
+    }
+
+    public void clear() {
+        delegate.clear();
+    }
+
+    public boolean contains(Object o) {
+        return delegate.contains(o);
+    }
+
+    public boolean containsAll(Collection<?> c) {
+        return delegate.containsAll(c);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return delegate.equals(o);
+    }
+
+    @Override
+    public int hashCode() {
+        return delegate.hashCode();
+    }
+
+    public boolean isEmpty() {
+        return delegate.isEmpty();
+    }
+
+    public Iterator<U> iterator() {
+        return delegate.iterator();
+    }
+
+    public boolean remove(Object o) {
+        return delegate.remove(o);
+    }
+
+    public boolean removeAll(Collection<?> c) {
+        return delegate.removeAll(c);
+    }
+
+    public boolean retainAll(Collection<?> c) {
+        return delegate.retainAll(c);
+    }
+
+    public int size() {
+        return delegate.size();
+    }
+
+    public Object[] toArray() {
+        return delegate.toArray();
+    }
+
+    public <T> T[] toArray(T[] a) {
+        return delegate.toArray(a);
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/BaseRepositoryFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/BaseRepositoryFactory.java
index 31a266169f7e..d8ac5a135a20 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/BaseRepositoryFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/BaseRepositoryFactory.java
@@ -20,15 +20,12 @@
 import org.gradle.api.artifacts.repositories.FlatDirectoryArtifactRepository;
 import org.gradle.api.artifacts.repositories.IvyArtifactRepository;
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
-import org.gradle.plugin.internal.PluginResolverFactory;
 
 /**
  * Factory for {@link ArtifactRepository} implementations.
  */
 public interface BaseRepositoryFactory {
 
-    String JCENTER_REPO_OVERRIDE_URL_PROPERTY = PluginResolverFactory.class.getName() + ".jcenter.override";
-
     ArtifactRepository createRepository(Object userDescription);
 
     FlatDirectoryArtifactRepository createFlatDirRepository();
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DependencyResolutionServices.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DependencyResolutionServices.java
index df3e93146144..028675486c9f 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DependencyResolutionServices.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/DependencyResolutionServices.java
@@ -25,4 +25,5 @@ public interface DependencyResolutionServices {
     ConfigurationContainerInternal getConfigurationContainer();
 
     DependencyHandler getDependencyHandler();
+
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/configurations/dynamicversion/CachePolicy.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/configurations/dynamicversion/CachePolicy.java
index 2fa2ad79ef1c..4e22907b9f9a 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/configurations/dynamicversion/CachePolicy.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/configurations/dynamicversion/CachePolicy.java
@@ -15,11 +15,11 @@
  */
 package org.gradle.api.internal.artifacts.configurations.dynamicversion;
 
-import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.gradle.api.artifacts.ArtifactIdentifier;
 import org.gradle.api.artifacts.ModuleIdentifier;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.ResolvedModuleVersion;
+import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 
 import java.io.File;
 import java.util.Set;
@@ -27,9 +27,11 @@
 public interface CachePolicy {
     boolean mustRefreshVersionList(ModuleIdentifier selector, Set<ModuleVersionIdentifier> moduleVersions, long ageMillis);
 
-    boolean mustRefreshModule(ModuleVersionIdentifier moduleVersionId, ResolvedModuleVersion resolvedModuleVersion, ModuleRevisionId moduleRevisionId, long ageMillis);
+    boolean mustRefreshMissingModule(ModuleComponentIdentifier component, long ageMillis);
 
-    boolean mustRefreshChangingModule(ModuleVersionIdentifier moduleVersionId, ResolvedModuleVersion resolvedModuleVersion, long ageMillis);
+    boolean mustRefreshModule(ModuleComponentIdentifier component, ResolvedModuleVersion resolvedModuleVersion, long ageMillis);
+
+    boolean mustRefreshChangingModule(ModuleComponentIdentifier component, ResolvedModuleVersion resolvedModuleVersion, long ageMillis);
 
     boolean mustRefreshModuleArtifacts(ModuleVersionIdentifier moduleVersionId, Set<ArtifactIdentifier> artifacts, long ageMillis, boolean belongsToChangingModule, boolean moduleDescriptorInSync);
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractExternalDependency.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractExternalDependency.java
deleted file mode 100644
index 1d60c372dfe2..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractExternalDependency.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.dependencies;
-
-import org.gradle.api.artifacts.ExternalDependency;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
-import org.gradle.api.internal.artifacts.ModuleVersionSelectorStrictSpec;
-
-public abstract class AbstractExternalDependency extends AbstractModuleDependency implements ExternalDependency {
-    public AbstractExternalDependency(String configuration) {
-        super(configuration);
-    }
-
-    protected void copyTo(AbstractExternalDependency target) {
-        super.copyTo(target);
-        target.setForce(isForce());
-    }
-
-    protected boolean isContentEqualsFor(ExternalDependency dependencyRhs) {
-        if (!isKeyEquals(dependencyRhs) || !isCommonContentEquals(dependencyRhs)) {
-            return false;
-        }
-        return isForce() == dependencyRhs.isForce();
-    }
-
-    public boolean matchesStrictly(ModuleVersionIdentifier identifier) {
-        return new ModuleVersionSelectorStrictSpec(this).isSatisfiedBy(identifier);
-    }
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractExternalModuleDependency.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractExternalModuleDependency.java
new file mode 100644
index 000000000000..b7ee7efd70d6
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractExternalModuleDependency.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2009 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.artifacts.dependencies;
+
+import org.gradle.api.InvalidUserDataException;
+import org.gradle.api.artifacts.ExternalModuleDependency;
+import org.gradle.api.artifacts.ModuleVersionIdentifier;
+import org.gradle.api.internal.artifacts.ModuleVersionSelectorStrictSpec;
+
+public abstract class AbstractExternalModuleDependency extends AbstractModuleDependency implements ExternalModuleDependency {
+    private String group;
+    private String name;
+    private String version;
+    private boolean changing;
+    private boolean force;
+
+    public AbstractExternalModuleDependency(String group, String name, String version, String configuration) {
+        super(configuration);
+        if (name == null) {
+            throw new InvalidUserDataException("Name must not be null!");
+        }
+        this.group = group;
+        this.name = name;
+        this.version = version;
+    }
+
+    protected void copyTo(AbstractExternalModuleDependency target) {
+        super.copyTo(target);
+        target.setForce(isForce());
+        target.setChanging(isChanging());
+    }
+
+    protected boolean isContentEqualsFor(ExternalModuleDependency dependencyRhs) {
+        if (!isKeyEquals(dependencyRhs) || !isCommonContentEquals(dependencyRhs)) {
+            return false;
+        }
+        return force == dependencyRhs.isForce() && changing == dependencyRhs.isChanging();
+    }
+
+    public boolean matchesStrictly(ModuleVersionIdentifier identifier) {
+        return new ModuleVersionSelectorStrictSpec(this).isSatisfiedBy(identifier);
+    }
+
+    public String getGroup() {
+        return group;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public boolean isForce() {
+        return force;
+    }
+
+    public ExternalModuleDependency setForce(boolean force) {
+        this.force = force;
+        return this;
+    }
+
+    public boolean isChanging() {
+        return changing;
+    }
+
+    public ExternalModuleDependency setChanging(boolean changing) {
+        this.changing = changing;
+        return this;
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultClientModule.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultClientModule.java
index 3de71340745e..7cc7c9837758 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultClientModule.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultClientModule.java
@@ -16,7 +16,6 @@
 
 package org.gradle.api.internal.artifacts.dependencies;
 
-import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.artifacts.ClientModule;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ModuleDependency;
@@ -24,15 +23,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class DefaultClientModule extends AbstractExternalDependency implements ClientModule {
-
-    private String group;
-
-    private String name;
-
-    private String version;
-
-    private boolean force;
+public class DefaultClientModule extends AbstractExternalModuleDependency implements ClientModule {
 
     private Set<ModuleDependency> dependencies = new HashSet<ModuleDependency>();
 
@@ -41,13 +32,11 @@ public DefaultClientModule(String group, String name, String version) {
     }
 
     public DefaultClientModule(String group, String name, String version, String configuration) {
-        super(configuration);
-        if (name == null) {
-            throw new InvalidUserDataException("Name must not be null!");
-        }
-        this.group = group;
-        this.name = name;
-        this.version = version;
+        super(group, name, version, configuration);
+    }
+
+    public String getId() {
+        return emptyStringIfNull(getGroup()) + ":" + getName() + ":" + emptyStringIfNull(getVersion());
     }
 
     private String emptyStringIfNull(String value) {
@@ -58,53 +47,12 @@ public Set<ModuleDependency> getDependencies() {
         return dependencies;
     }
 
-    public String getId() {
-        return emptyStringIfNull(group) + ":" + emptyStringIfNull(name) + ":" + emptyStringIfNull(version);
-    }
-
-    public String getGroup() {
-        return group;
-    }
-
-    public ClientModule setGroup(String group) {
-        this.group = group;
-        return this;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public ClientModule setName(String name) {
-        this.name = name;
-        return this;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public ClientModule setVersion(String version) {
-        this.version = version;
-        return this;
-    }
-
-    public boolean isForce() {
-        return force;
-    }
-
-    public ClientModule setForce(boolean force) {
-        this.force = force;
-        return this;
-    }
-
     public void addDependency(ModuleDependency dependency) {
         this.dependencies.add(dependency);
     }
 
     public ClientModule copy() {
-        DefaultClientModule copiedClientModule = new DefaultClientModule(getGroup(), getName(), getVersion(),
-                getConfiguration());
+        DefaultClientModule copiedClientModule = new DefaultClientModule(getGroup(), getName(), getVersion(), getConfiguration());
         copyTo(copiedClientModule);
         for (ModuleDependency dependency : dependencies) {
             copiedClientModule.addDependency(dependency.copy());
@@ -121,11 +69,8 @@ public boolean contentEquals(Dependency dependency) {
         }
 
         ClientModule that = (ClientModule) dependency;
-        if (!isContentEqualsFor(that)) {
-            return false;
-        }
+        return isContentEqualsFor(that) && dependencies.equals(that.getDependencies());
 
-        return dependencies.equals(that.getDependencies());
     }
 
     @Override
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependency.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependency.java
index 4de84460874b..05099aa97b57 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependency.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependency.java
@@ -16,67 +16,22 @@
 
 package org.gradle.api.internal.artifacts.dependencies;
 
-import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ExternalModuleDependency;
 
-public class DefaultExternalModuleDependency extends AbstractExternalDependency implements ExternalModuleDependency {
-    private String group;
-    private String name;
-    private String version;
-
-    private boolean force;
-    private boolean changing;
+public class DefaultExternalModuleDependency extends AbstractExternalModuleDependency implements ExternalModuleDependency {
 
     public DefaultExternalModuleDependency(String group, String name, String version) {
         this(group, name, version, null);
     }
 
     public DefaultExternalModuleDependency(String group, String name, String version, String configuration) {
-        super(configuration);
-        if (name == null) {
-            throw new InvalidUserDataException("Name must not be null!");
-        }
-        this.group = group;
-        this.name = name;
-        this.version = version;
-    }
-
-    public String getGroup() {
-        return group;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public boolean isForce() {
-        return force;
-    }
-
-    public DefaultExternalModuleDependency setForce(boolean force) {
-        this.force = force;
-        return this;
-    }
-
-    public boolean isChanging() {
-        return changing;
-    }
-
-    public DefaultExternalModuleDependency setChanging(boolean changing) {
-        this.changing = changing;
-        return this;
+        super(group, name, version, configuration);
     }
 
     public DefaultExternalModuleDependency copy() {
-        DefaultExternalModuleDependency copiedModuleDependency = new DefaultExternalModuleDependency(getGroup(),
-                getName(), getVersion(), getConfiguration());
+        DefaultExternalModuleDependency copiedModuleDependency = new DefaultExternalModuleDependency(getGroup(), getName(), getVersion(), getConfiguration());
         copyTo(copiedModuleDependency);
-        copiedModuleDependency.setChanging(isChanging());
         return copiedModuleDependency;
     }
 
@@ -88,12 +43,9 @@ public boolean contentEquals(Dependency dependency) {
             return false;
         }
 
-        DefaultExternalModuleDependency that = (DefaultExternalModuleDependency) dependency;
-        if (!isContentEqualsFor(that)) {
-            return false;
-        }
+        ExternalModuleDependency that = (ExternalModuleDependency) dependency;
+        return isContentEqualsFor(that);
 
-        return changing == that.isChanging();
     }
 
     @Override
@@ -116,7 +68,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "DefaultExternalModuleDependency{" + "group='" + group + '\'' + ", name='" + name + '\'' + ", version='"
-                + version + '\'' + ", configuration='" + getConfiguration() + '\'' + '}';
+        return String.format("DefaultExternalModuleDependency{group='%s', name='%s', version='%s', configuration='%s'}",
+                getGroup(), getName(), getVersion(), getConfiguration());
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/ArtifactResolutionQueryFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/ArtifactResolutionQueryFactory.java
index af9ded5e4cb3..c5959b1d4bc8 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/ArtifactResolutionQueryFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/ArtifactResolutionQueryFactory.java
@@ -15,7 +15,7 @@
  */
 package org.gradle.api.internal.artifacts.dsl.dependencies;
 
-import org.gradle.api.artifacts.resolution.ArtifactResolutionQuery;
+import org.gradle.api.artifacts.dsl.ArtifactResolutionQuery;
 
 public interface ArtifactResolutionQueryFactory {
     ArtifactResolutionQuery createArtifactResolutionQuery();
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyHandler.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyHandler.java
index c53f1830dc58..01df562f3b63 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyHandler.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyHandler.java
@@ -25,7 +25,7 @@
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.dsl.ComponentMetadataHandler;
 import org.gradle.api.artifacts.dsl.DependencyHandler;
-import org.gradle.api.artifacts.resolution.ArtifactResolutionQuery;
+import org.gradle.api.artifacts.dsl.ArtifactResolutionQuery;
 import org.gradle.util.CollectionUtils;
 import org.gradle.util.ConfigureUtil;
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CacheBackedTaskHistoryRepository.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CacheBackedTaskHistoryRepository.java
index dd6795a18024..6ee472c8b6da 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CacheBackedTaskHistoryRepository.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/CacheBackedTaskHistoryRepository.java
@@ -19,7 +19,6 @@
 import org.gradle.cache.PersistentIndexedCache;
 import org.gradle.internal.Factory;
 import org.gradle.messaging.serialize.Decoder;
-import org.gradle.messaging.serialize.DefaultSerializer;
 import org.gradle.messaging.serialize.Encoder;
 import org.gradle.messaging.serialize.Serializer;
 
@@ -229,10 +228,10 @@ public void setOutputFilesSnapshot(FileCollectionSnapshot outputFilesSnapshot) {
         }
 
         static class TaskHistorySerializer implements Serializer<LazyTaskExecution> {
-            private ClassLoader classLoader;
+            private InputPropertiesSerializer inputPropertiesSerializer;
 
             public TaskHistorySerializer(ClassLoader classLoader) {
-                this.classLoader = classLoader;
+                this.inputPropertiesSerializer = new InputPropertiesSerializer(classLoader);
             }
 
             public LazyTaskExecution read(Decoder decoder) throws Exception {
@@ -249,8 +248,7 @@ public LazyTaskExecution read(Decoder decoder) throws Exception {
 
                 boolean inputProperties = decoder.readBoolean();
                 if (inputProperties) {
-                    DefaultSerializer<Map> defaultSerializer = new DefaultSerializer<Map>(classLoader);
-                    Map<String, Object> map = defaultSerializer.read(decoder);
+                    Map<String, Object> map = inputPropertiesSerializer.read(decoder);
                     execution.setInputProperties(map);
                 } else {
                     execution.setInputProperties(new HashMap<String, Object>());
@@ -270,8 +268,7 @@ public void write(Encoder encoder, LazyTaskExecution execution) throws Exception
                     encoder.writeBoolean(false);
                 } else {
                     encoder.writeBoolean(true);
-                    DefaultSerializer<Map> defaultSerializer = new DefaultSerializer<Map>(classLoader);
-                    defaultSerializer.write(encoder, execution.getInputProperties());
+                    inputPropertiesSerializer.write(encoder, execution.getInputProperties());
                 }
             }
         }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/InputPropertiesSerializer.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/InputPropertiesSerializer.java
new file mode 100644
index 000000000000..8327dd86b82a
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/changedetection/state/InputPropertiesSerializer.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.changedetection.state;
+
+import org.gradle.api.GradleException;
+import org.gradle.messaging.serialize.*;
+
+import java.util.Map;
+
+import static java.lang.String.format;
+
+class InputPropertiesSerializer implements Serializer<Map<String, Object>> {
+
+    private final MapSerializer<String, Object> serializer;
+
+    InputPropertiesSerializer(ClassLoader classloader) {
+        this.serializer = new MapSerializer<String, Object>(BaseSerializerFactory.STRING_SERIALIZER, new DefaultSerializer<Object>(classloader));
+    }
+
+    public Map<String, Object> read(Decoder decoder) throws Exception {
+        return serializer.read(decoder);
+    }
+
+    public void write(Encoder encoder, Map<String, Object> properties) throws Exception {
+        try {
+            serializer.write(encoder, properties);
+        } catch (MapSerializer.EntrySerializationException e) {
+            throw new GradleException(format("Unable to store task input properties. Property '%s' with value '%s' cannot be serialized.", e.getKey(), e.getValue()), e);
+        }
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/BasicFileResolver.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/BasicFileResolver.java
new file mode 100644
index 000000000000..e59319b41016
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/BasicFileResolver.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.file;
+
+import org.gradle.api.InvalidUserDataException;
+import org.gradle.api.Transformer;
+import org.gradle.internal.UncheckedException;
+import org.gradle.util.GFileUtils;
+
+import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.regex.Pattern;
+
+/**
+ * A minimal resolver, which does not use any native services. Used during bootstrap only. You should generally use {@link FileResolver} instead.
+ *
+ * TODO - share more stuff with AbstractFileResolver.
+ */
+public class BasicFileResolver implements Transformer<File, String> {
+    private static final Pattern URI_SCHEME = Pattern.compile("[a-zA-Z][a-zA-Z0-9+-\\.]*:.+");
+    private final File baseDir;
+
+    public BasicFileResolver(File baseDir) {
+        this.baseDir = baseDir;
+    }
+
+    public File transform(String original) {
+        if (original.startsWith("file:")) {
+            try {
+                return GFileUtils.canonicalise(new File(new URI(original)));
+            } catch (URISyntaxException e) {
+                throw UncheckedException.throwAsUncheckedException(e);
+            }
+        }
+
+        File file = new File(original);
+        if (file.isAbsolute()) {
+            return GFileUtils.canonicalise(file);
+        }
+
+        if (URI_SCHEME.matcher(original).matches()) {
+            throw new InvalidUserDataException(String.format("Cannot convert URL '%s' to a file.", original));
+        }
+
+        file = new File(baseDir, original);
+        return GFileUtils.canonicalise(file);
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultFileTreeElement.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultFileTreeElement.java
index f549091d30c3..dccefbcaf258 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultFileTreeElement.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/DefaultFileTreeElement.java
@@ -15,14 +15,12 @@
  */
 package org.gradle.api.internal.file;
 
-import org.gradle.api.UncheckedIOException;
 import org.gradle.api.file.RelativePath;
 import org.gradle.internal.nativeplatform.filesystem.Chmod;
 import org.gradle.internal.nativeplatform.filesystem.Stat;
 import org.gradle.util.GFileUtils;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 
 public class DefaultFileTreeElement extends AbstractFileTreeElement {
@@ -66,10 +64,6 @@ public RelativePath getRelativePath() {
     }
 
     public int getMode() {
-        try {
-            return stat.getUnixMode(file);
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
+        return stat.getUnixMode(file);
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImpl.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImpl.java
index 6b2218911174..0c9e4e703b04 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImpl.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImpl.java
@@ -24,13 +24,13 @@
 import org.gradle.internal.reflect.Instantiator;
 
 public class CopyFileVisitorImpl implements FileVisitor {
-    private final CopySpecInternal spec;
+    private final CopySpecResolver copySpecResolver;
     private final CopyActionProcessingStreamAction action;
     private final Instantiator instantiator;
     private final FileSystem fileSystem;
 
-    public CopyFileVisitorImpl(CopySpecInternal spec, CopyActionProcessingStreamAction action, Instantiator instantiator, FileSystem fileSystem) {
-        this.spec = spec;
+    public CopyFileVisitorImpl(CopySpecResolver spec, CopyActionProcessingStreamAction action, Instantiator instantiator, FileSystem fileSystem) {
+        this.copySpecResolver = spec;
         this.action = action;
         this.instantiator = instantiator;
         this.fileSystem = fileSystem;
@@ -51,7 +51,7 @@ private void processDir(FileVisitDetails visitDetails) {
 
     private void processFile(FileVisitDetails visitDetails) {
         DefaultFileCopyDetails details = createDefaultFileCopyDetails(visitDetails);
-        for (Action<? super FileCopyDetails> action : spec.getAllCopyActions()) {
+        for (Action<? super FileCopyDetails> action : copySpecResolver.getAllCopyActions()) {
             action.execute(details);
             if (details.isExcluded()) {
                 return;
@@ -61,6 +61,6 @@ private void processFile(FileVisitDetails visitDetails) {
     }
 
     private DefaultFileCopyDetails createDefaultFileCopyDetails(FileVisitDetails visitDetails) {
-        return instantiator.newInstance(DefaultFileCopyDetails.class, visitDetails, spec, fileSystem);
+        return instantiator.newInstance(DefaultFileCopyDetails.class, visitDetails, copySpecResolver, fileSystem);
     }
 }
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecActionImpl.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecActionImpl.java
index b4dbf05250b6..3503b20a5a04 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecActionImpl.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecActionImpl.java
@@ -21,7 +21,7 @@
 import org.gradle.internal.nativeplatform.filesystem.FileSystem;
 import org.gradle.internal.reflect.Instantiator;
 
-public class CopySpecActionImpl implements Action<CopySpecInternal> {
+public class CopySpecActionImpl implements Action<CopySpecResolver> {
     private final CopyActionProcessingStreamAction action;
     private final Instantiator instantiator;
     private final FileSystem fileSystem;
@@ -32,8 +32,8 @@ public CopySpecActionImpl(CopyActionProcessingStreamAction action, Instantiator
         this.fileSystem = fileSystem;
     }
 
-    public void execute(final CopySpecInternal spec) {
-        FileTree source = spec.getSource();
-        source.visit(new CopyFileVisitorImpl(spec, action, instantiator, fileSystem));
+    public void execute(final CopySpecResolver specResolver) {
+        FileTree source = specResolver.getSource();
+        source.visit(new CopyFileVisitorImpl(specResolver, action, instantiator, fileSystem));
     }
 }
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecInternal.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecInternal.java
index 0d82f79c6643..50b1be4a8af4 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecInternal.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecInternal.java
@@ -17,31 +17,24 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.file.CopySpec;
-import org.gradle.api.file.FileCopyDetails;
-import org.gradle.api.file.FileTree;
-import org.gradle.api.file.RelativePath;
-
-import java.util.Collection;
 
 public interface CopySpecInternal extends CopySpec {
 
-    RelativePath getDestPath();
-
-    FileTree getSource();
-
-    FileTree getAllSource();
-
+    //TODO - does this belong here or on the resolver? PEZ
     boolean hasSource();
 
-    Collection<? extends Action<? super FileCopyDetails>> getAllCopyActions();
-
     Iterable<CopySpecInternal> getChildren();
 
-    void walk(Action<? super CopySpecInternal> action);
-
     CopySpecInternal addChild();
 
     CopySpecInternal addChildBeforeSpec(CopySpecInternal childSpec);
 
     CopySpecInternal addFirst();
+
+    void walk(Action<? super CopySpecResolver> action);
+
+    CopySpecResolver buildRootResolver();
+
+    CopySpecResolver buildResolverRelativeToParent(CopySpecResolver parent);
+
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecResolver.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecResolver.java
new file mode 100644
index 000000000000..f8103ea415e4
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/CopySpecResolver.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.file.copy;
+
+
+import org.gradle.api.Action;
+import org.gradle.api.file.*;
+import org.gradle.api.specs.Spec;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface CopySpecResolver {
+
+    boolean isCaseSensitive();
+    Integer getFileMode();
+    Integer getDirMode();
+    boolean getIncludeEmptyDirs();
+
+    RelativePath getDestPath();
+
+    FileTree getSource();
+
+    FileTree getAllSource();
+
+    Collection<? extends Action<? super FileCopyDetails>> getAllCopyActions();
+
+    public List<String> getAllIncludes();
+
+    public List<String> getAllExcludes();
+
+    public List<Spec<FileTreeElement>> getAllIncludeSpecs();
+
+    public List<Spec<FileTreeElement>> getAllExcludeSpecs();
+
+    DuplicatesStrategy getDuplicatesStrategy();
+
+    void walk(Action<? super CopySpecResolver> action);
+
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultCopySpec.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultCopySpec.java
index 5b74c087f7fc..57eb76ae42d2 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultCopySpec.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultCopySpec.java
@@ -37,38 +37,30 @@
 
 @NonExtensible
 public class DefaultCopySpec implements CopySpecInternal {
-    private final FileResolver resolver;
+    protected final FileResolver fileResolver;
     private final Set<Object> sourcePaths;
     private Object destDir;
     private final PatternSet patternSet;
-    private final List<CopySpecInternal> childSpecs;
-    private final Instantiator instantiator;
-    private final DefaultCopySpec parentSpec;
-    private final List<Action<? super FileCopyDetails>> actions = new ArrayList<Action<? super FileCopyDetails>>();
+    protected final List<CopySpecInternal> childSpecs;
+    protected final Instantiator instantiator;
+    private final List<Action<? super FileCopyDetails>> copyActions = new ArrayList<Action<? super FileCopyDetails>>();
     private Integer dirMode;
     private Integer fileMode;
     private Boolean caseSensitive;
     private Boolean includeEmptyDirs;
-    private PathNotationParser<String> pathNotationParser;
     private DuplicatesStrategy duplicatesStrategy;
 
-    public DefaultCopySpec(FileResolver resolver, Instantiator instantiator, DefaultCopySpec parentSpec) {
-        this.parentSpec = parentSpec;
-        this.resolver = resolver;
+    public DefaultCopySpec(FileResolver resolver, Instantiator instantiator) {
+        this.fileResolver = resolver;
         this.instantiator = instantiator;
-        this.pathNotationParser = new PathNotationParser<String>();
         sourcePaths = new LinkedHashSet<Object>();
         childSpecs = new ArrayList<CopySpecInternal>();
         patternSet = new PatternSet();
-        duplicatesStrategy = null; //inherit from parent
-    }
-
-    public DefaultCopySpec(FileResolver resolver, Instantiator instantiator) {
-        this(resolver, instantiator, null);
+        duplicatesStrategy = null;
     }
 
-    protected FileResolver getResolver() {
-        return resolver;
+    protected List<Action<? super FileCopyDetails>> getCopyActions() {
+        return copyActions;
     }
 
     public CopySpec with(CopySpec... copySpecs) {
@@ -80,7 +72,7 @@ public CopySpec with(CopySpec... copySpecs) {
             } else {
                 copySpecInternal = (CopySpecInternal) copySpec;
             }
-            childSpecs.add(new RelativizedCopySpec(this, copySpecInternal));
+            childSpecs.add(copySpecInternal);
         }
         return this;
     }
@@ -107,14 +99,14 @@ public CopySpecInternal addFirst() {
         return addChildAtPosition(0);
     }
 
-    private CopySpecInternal addChildAtPosition(int position) {
-        DefaultCopySpec child = instantiator.newInstance(DefaultCopySpec.class, resolver, instantiator, this);
+    protected CopySpecInternal addChildAtPosition(int position) {
+        DefaultCopySpec child = instantiator.newInstance(SingleParentCopySpec.class, fileResolver, instantiator, buildRootResolver());
         childSpecs.add(position, child);
         return child;
     }
 
     public CopySpecInternal addChild() {
-        DefaultCopySpec child = new DefaultCopySpec(resolver, instantiator, this);
+        DefaultCopySpec child = new SingleParentCopySpec(fileResolver, instantiator, buildRootResolver());
         childSpecs.add(child);
         return child;
     }
@@ -128,20 +120,6 @@ public Set<Object> getSourcePaths() {
         return sourcePaths;
     }
 
-    public FileTree getSource() {
-        return resolver.resolveFilesAsTree(sourcePaths).matching(getPatternSet());
-    }
-
-    public FileTree getAllSource() {
-        final ImmutableList.Builder<FileTree> builder = ImmutableList.builder();
-        walk(new Action<CopySpecInternal>() {
-            public void execute(CopySpecInternal copySpecInternal) {
-                builder.add(copySpecInternal.getSource());
-            }
-        });
-
-        return resolver.compositeFileTree(builder.build());
-    }
 
     public DefaultCopySpec into(Object destDir) {
         this.destDir = destDir;
@@ -159,47 +137,8 @@ public CopySpec into(Object destPath, Closure configureClosure) {
         }
     }
 
-    public RelativePath getDestPath() {
-        RelativePath parentPath;
-        if (parentSpec == null) {
-            parentPath = new RelativePath(false);
-        } else {
-            parentPath = parentSpec.getDestPath();
-        }
-        if (destDir == null) {
-            return parentPath;
-        }
-
-        String path = resolveToPath(destDir);
-        if (path.startsWith("/") || path.startsWith(File.separator)) {
-            return RelativePath.parse(false, path);
-        }
-
-        return RelativePath.parse(false, parentPath, path);
-    }
-
-    private String resolveToPath(Object destDir) {
-        return pathNotationParser.parseNotation(destDir);
-    }
-
-    public PatternSet getPatternSet() {
-        PatternSet patterns = new PatternSet();
-        patterns.setCaseSensitive(isCaseSensitive());
-        patterns.include(getAllIncludes());
-        patterns.includeSpecs(getAllIncludeSpecs());
-        patterns.exclude(getAllExcludes());
-        patterns.excludeSpecs(getAllExcludeSpecs());
-        return patterns;
-    }
-
     public boolean isCaseSensitive() {
-        if (caseSensitive != null) {
-            return caseSensitive;
-        }
-        if (parentSpec != null) {
-            return parentSpec.isCaseSensitive();
-        }
-        return true;
+        return buildRootResolver().isCaseSensitive();
     }
 
     public void setCaseSensitive(boolean caseSensitive) {
@@ -207,13 +146,7 @@ public void setCaseSensitive(boolean caseSensitive) {
     }
 
     public boolean getIncludeEmptyDirs() {
-        if (includeEmptyDirs != null) {
-            return includeEmptyDirs;
-        }
-        if (parentSpec != null) {
-            return parentSpec.getIncludeEmptyDirs();
-        }
-        return true;
+        return buildRootResolver().getIncludeEmptyDirs();
     }
 
     public void setIncludeEmptyDirs(boolean includeEmptyDirs) {
@@ -221,13 +154,7 @@ public void setIncludeEmptyDirs(boolean includeEmptyDirs) {
     }
 
     public DuplicatesStrategy getDuplicatesStrategy() {
-        if (duplicatesStrategy != null) {
-            return duplicatesStrategy;
-        }
-        if (parentSpec != null) {
-            return parentSpec.getDuplicatesStrategy();
-        }
-        return DuplicatesStrategy.INCLUDE;
+        return buildRootResolver().getDuplicatesStrategy();
     }
 
     public void setDuplicatesStrategy(DuplicatesStrategy strategy) {
@@ -275,24 +202,6 @@ public CopySpec setIncludes(Iterable<String> includes) {
         return this;
     }
 
-    public List<String> getAllIncludes() {
-        List<String> result = new ArrayList<String>();
-        if (parentSpec != null) {
-            result.addAll(parentSpec.getAllIncludes());
-        }
-        result.addAll(getIncludes());
-        return result;
-    }
-
-    public List<Spec<FileTreeElement>> getAllIncludeSpecs() {
-        List<Spec<FileTreeElement>> result = new ArrayList<Spec<FileTreeElement>>();
-        if (parentSpec != null) {
-            result.addAll(parentSpec.getAllIncludeSpecs());
-        }
-        result.addAll(patternSet.getIncludeSpecs());
-        return result;
-    }
-
     public CopySpec exclude(String... excludes) {
         patternSet.exclude(excludes);
         return this;
@@ -323,17 +232,17 @@ public DefaultCopySpec setExcludes(Iterable<String> excludes) {
     }
 
     public CopySpec rename(String sourceRegEx, String replaceWith) {
-        actions.add(new RenamingCopyAction(new RegExpNameMapper(sourceRegEx, replaceWith)));
+        copyActions.add(new RenamingCopyAction(new RegExpNameMapper(sourceRegEx, replaceWith)));
         return this;
     }
 
     public CopySpec rename(Pattern sourceRegEx, String replaceWith) {
-        actions.add(new RenamingCopyAction(new RegExpNameMapper(sourceRegEx, replaceWith)));
+        copyActions.add(new RenamingCopyAction(new RegExpNameMapper(sourceRegEx, replaceWith)));
         return this;
     }
 
     public CopySpec filter(final Class<? extends FilterReader> filterType) {
-        actions.add(new Action<FileCopyDetails>() {
+        copyActions.add(new Action<FileCopyDetails>() {
             public void execute(FileCopyDetails fileCopyDetails) {
                 fileCopyDetails.filter(filterType);
             }
@@ -342,7 +251,7 @@ public void execute(FileCopyDetails fileCopyDetails) {
     }
 
     public CopySpec filter(final Closure closure) {
-        actions.add(new Action<FileCopyDetails>() {
+        copyActions.add(new Action<FileCopyDetails>() {
             public void execute(FileCopyDetails fileCopyDetails) {
                 fileCopyDetails.filter(closure);
             }
@@ -351,7 +260,7 @@ public void execute(FileCopyDetails fileCopyDetails) {
     }
 
     public CopySpec filter(final Map<String, ?> properties, final Class<? extends FilterReader> filterType) {
-        actions.add(new Action<FileCopyDetails>() {
+        copyActions.add(new Action<FileCopyDetails>() {
             public void execute(FileCopyDetails fileCopyDetails) {
                 fileCopyDetails.filter(properties, filterType);
             }
@@ -360,7 +269,7 @@ public void execute(FileCopyDetails fileCopyDetails) {
     }
 
     public CopySpec expand(final Map<String, ?> properties) {
-        actions.add(new Action<FileCopyDetails>() {
+        copyActions.add(new Action<FileCopyDetails>() {
             public void execute(FileCopyDetails fileCopyDetails) {
                 fileCopyDetails.expand(properties);
             }
@@ -371,28 +280,16 @@ public void execute(FileCopyDetails fileCopyDetails) {
     public CopySpec rename(Closure closure) {
         ChainingTransformer<String> transformer = new ChainingTransformer<String>(String.class);
         transformer.add(closure);
-        actions.add(new RenamingCopyAction(transformer));
+        copyActions.add(new RenamingCopyAction(transformer));
         return this;
     }
 
     public Integer getDirMode() {
-        if (dirMode != null) {
-            return dirMode;
-        }
-        if (parentSpec != null) {
-            return parentSpec.getDirMode();
-        }
-        return null;
+        return buildRootResolver().getDirMode();
     }
 
     public Integer getFileMode() {
-        if (fileMode != null) {
-            return fileMode;
-        }
-        if (parentSpec != null) {
-            return parentSpec.getFileMode();
-        }
-        return null;
+        return buildRootResolver().getFileMode();
     }
 
     public CopyProcessingSpec setDirMode(Integer mode) {
@@ -406,52 +303,21 @@ public CopyProcessingSpec setFileMode(Integer mode) {
     }
 
     public CopySpec eachFile(Action<? super FileCopyDetails> action) {
-        actions.add(action);
+        copyActions.add(action);
         return this;
     }
 
     public CopySpec eachFile(Closure closure) {
-        actions.add(new ClosureBackedAction<FileCopyDetails>(closure));
+        copyActions.add(new ClosureBackedAction<FileCopyDetails>(closure));
         return this;
     }
 
-    public List<String> getAllExcludes() {
-        List<String> result = new ArrayList<String>();
-        if (parentSpec != null) {
-            result.addAll(parentSpec.getAllExcludes());
-        }
-        result.addAll(getExcludes());
-        return result;
-    }
-
-    public List<Spec<FileTreeElement>> getAllExcludeSpecs() {
-        List<Spec<FileTreeElement>> result = new ArrayList<Spec<FileTreeElement>>();
-        if (parentSpec != null) {
-            result.addAll(parentSpec.getAllExcludeSpecs());
-        }
-        result.addAll(patternSet.getExcludeSpecs());
-        return result;
-    }
-
-    public List<Action<? super FileCopyDetails>> getAllCopyActions() {
-        if (parentSpec == null) {
-            return actions;
-        }
-        List<Action<? super FileCopyDetails>> allActions = new ArrayList<Action<? super FileCopyDetails>>();
-        allActions.addAll(parentSpec.getAllCopyActions());
-        allActions.addAll(actions);
-        return allActions;
-    }
-
     public Iterable<CopySpecInternal> getChildren() {
         return childSpecs;
     }
 
-    public void walk(Action<? super CopySpecInternal> action) {
-        action.execute(this);
-        for (CopySpecInternal child : getChildren()) {
-            child.walk(action);
-        }
+    public void walk(Action<? super CopySpecResolver> action) {
+        buildRootResolver().walk(action);
     }
 
     public boolean hasSource() {
@@ -466,4 +332,176 @@ public boolean hasSource() {
         return false;
     }
 
+    public CopySpecResolver buildResolverRelativeToParent(CopySpecResolver parent) {
+        return this.new DefaultCopySpecResolver(parent);
+    }
+
+    public CopySpecResolver buildRootResolver() {
+        return this.new DefaultCopySpecResolver(null);
+    }
+
+    public class DefaultCopySpecResolver implements CopySpecResolver {
+
+        private CopySpecResolver parentResolver;
+        private PathNotationParser<String> pathNotationParser;
+
+        private DefaultCopySpecResolver(CopySpecResolver parent) {
+            this.parentResolver = parent;
+            this.pathNotationParser = new PathNotationParser<String>();
+        }
+
+
+        public RelativePath getDestPath() {
+
+            RelativePath parentPath;
+            if (parentResolver == null) {
+                parentPath = new RelativePath(false);
+            } else {
+                parentPath = parentResolver.getDestPath();
+            }
+
+            if (destDir == null) {
+                return parentPath;
+            }
+
+            String path = pathNotationParser.parseNotation(destDir);
+            if (path.startsWith("/") || path.startsWith(File.separator)) {
+                return RelativePath.parse(false, path);
+            }
+
+            return RelativePath.parse(false, parentPath, path);
+        }
+
+        public FileTree getSource() {
+            return fileResolver.resolveFilesAsTree(sourcePaths).matching(this.getPatternSet());
+        }
+
+        public FileTree getAllSource() {
+            final ImmutableList.Builder<FileTree> builder = ImmutableList.builder();
+            walk(new Action<CopySpecResolver>() {
+                public void execute(CopySpecResolver copySpecResolver) {
+                    builder.add(copySpecResolver.getSource());
+                }
+            });
+
+            return fileResolver.compositeFileTree(builder.build());
+        }
+
+        public Collection<? extends Action<? super FileCopyDetails>> getAllCopyActions() {
+            if (parentResolver == null) {
+                return copyActions;
+            }
+            List<Action<? super FileCopyDetails>> allActions = new ArrayList<Action<? super FileCopyDetails>>();
+            allActions.addAll(parentResolver.getAllCopyActions());
+            allActions.addAll(copyActions);
+            return allActions;
+        }
+
+        public List<String> getAllIncludes() {
+            List<String> result = new ArrayList<String>();
+            if (parentResolver != null) {
+                result.addAll(parentResolver.getAllIncludes());
+            }
+            result.addAll(patternSet.getIncludes());
+            return result;
+        }
+
+        public List<String> getAllExcludes() {
+            List<String> result = new ArrayList<String>();
+            if (parentResolver != null) {
+                result.addAll(parentResolver.getAllExcludes());
+            }
+            result.addAll(patternSet.getExcludes());
+            return result;
+        }
+
+
+        public List<Spec<FileTreeElement>> getAllExcludeSpecs() {
+            List<Spec<FileTreeElement>> result = new ArrayList<Spec<FileTreeElement>>();
+            if (parentResolver != null) {
+                result.addAll(parentResolver.getAllExcludeSpecs());
+            }
+            result.addAll(patternSet.getExcludeSpecs());
+            return result;
+        }
+
+        public DuplicatesStrategy getDuplicatesStrategy() {
+            if (duplicatesStrategy != null) {
+                return duplicatesStrategy;
+            }
+            if (parentResolver != null) {
+                return parentResolver.getDuplicatesStrategy();
+            }
+            return DuplicatesStrategy.INCLUDE;
+        }
+
+
+        public boolean isCaseSensitive() {
+            if (caseSensitive != null) {
+                return caseSensitive;
+            }
+            if (parentResolver != null) {
+                return parentResolver.isCaseSensitive();
+            }
+            return true;
+        }
+
+        public Integer getFileMode() {
+            if (fileMode != null) {
+                return fileMode;
+            }
+            if (parentResolver != null) {
+                return parentResolver.getFileMode();
+            }
+            return null;
+        }
+
+        public Integer getDirMode() {
+            if (dirMode != null) {
+                return dirMode;
+            }
+            if (parentResolver != null) {
+                return parentResolver.getDirMode();
+            }
+            return null;
+        }
+
+        public boolean getIncludeEmptyDirs() {
+            if (includeEmptyDirs != null) {
+                return includeEmptyDirs;
+            }
+            if (parentResolver != null) {
+                return parentResolver.getIncludeEmptyDirs();
+            }
+            return true;
+        }
+
+        public List<Spec<FileTreeElement>> getAllIncludeSpecs() {
+            List<Spec<FileTreeElement>> result = new ArrayList<Spec<FileTreeElement>>();
+            if (parentResolver != null) {
+                result.addAll(parentResolver.getAllIncludeSpecs());
+            }
+            result.addAll(patternSet.getIncludeSpecs());
+            return result;
+        }
+
+        public PatternSet getPatternSet() {
+            PatternSet patterns = new PatternSet();
+            patterns.setCaseSensitive(isCaseSensitive());
+            patterns.include(this.getAllIncludes());
+            patterns.includeSpecs(getAllIncludeSpecs());
+            patterns.exclude(this.getAllExcludes());
+            patterns.excludeSpecs(getAllExcludeSpecs());
+            return patterns;
+        }
+
+        public void walk(Action<? super CopySpecResolver> action) {
+            action.execute(this);
+            for (CopySpecInternal child : getChildren()) {
+                child.buildResolverRelativeToParent(this).walk(action);
+            }
+        }
+    }
+
 }
+
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultFileCopyDetails.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultFileCopyDetails.java
index 3494dca78458..507a8937fee0 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultFileCopyDetails.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DefaultFileCopyDetails.java
@@ -17,7 +17,6 @@
 package org.gradle.api.internal.file.copy;
 
 import groovy.lang.Closure;
-import org.gradle.api.GradleException;
 import org.gradle.api.file.ContentFilterable;
 import org.gradle.api.file.DuplicatesStrategy;
 import org.gradle.api.file.FileVisitDetails;
@@ -30,22 +29,22 @@
 
 public class DefaultFileCopyDetails extends AbstractFileTreeElement implements FileVisitDetails, FileCopyDetailsInternal {
     private final FileVisitDetails fileDetails;
-    private final CopySpecInternal spec;
+    private final CopySpecResolver specResolver;
     private final FilterChain filterChain = new FilterChain();
     private RelativePath relativePath;
     private boolean excluded;
     private Integer mode;
     private DuplicatesStrategy duplicatesStrategy;
 
-    public DefaultFileCopyDetails(FileVisitDetails fileDetails, CopySpecInternal spec, Chmod chmod) {
+    public DefaultFileCopyDetails(FileVisitDetails fileDetails, CopySpecResolver specResolver, Chmod chmod) {
         super(chmod);
         this.fileDetails = fileDetails;
-        this.spec = spec;
-        this.duplicatesStrategy = spec.getDuplicatesStrategy();
+        this.specResolver = specResolver;
+        this.duplicatesStrategy = specResolver.getDuplicatesStrategy();
     }
 
     public boolean isIncludeEmptyDirs() {
-        return spec.getIncludeEmptyDirs();
+        return specResolver.getIncludeEmptyDirs();
     }
 
     public String getDisplayName() {
@@ -111,18 +110,14 @@ public boolean copyTo(File target) {
     private void adaptPermissions(File target) {
         final Integer specMode = getMode();
         if(specMode !=null){
-            try {
-                getChmod().chmod(target, specMode);
-            } catch (IOException e) {
-                throw new GradleException(String.format("Could not set permission %s on '%s'.", specMode, target), e);
-            }
+            getChmod().chmod(target, specMode);
         }
     }
 
     public RelativePath getRelativePath() {
         if (relativePath == null) {
             RelativePath path = fileDetails.getRelativePath();
-            relativePath = spec.getDestPath().append(path.isFile(), path.getSegments());
+            relativePath = specResolver.getDestPath().append(path.isFile(), path.getSegments());
         }
         return relativePath;
     }
@@ -141,7 +136,7 @@ public int getMode() {
     }
 
     private Integer getSpecMode() {
-        return fileDetails.isDirectory() ? spec.getDirMode() : spec.getFileMode();
+        return fileDetails.isDirectory() ? specResolver.getDirMode() : specResolver.getFileMode();
     }
 
     public void setRelativePath(RelativePath path) {
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DelegatingCopySpecInternal.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DelegatingCopySpecInternal.java
index 60ec285e5e1d..e1c0ff40c8b2 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DelegatingCopySpecInternal.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DelegatingCopySpecInternal.java
@@ -22,7 +22,6 @@
 import org.gradle.api.specs.Spec;
 
 import java.io.FilterReader;
-import java.util.Collection;
 import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
@@ -31,22 +30,10 @@ abstract public class DelegatingCopySpecInternal implements CopySpecInternal {
 
     abstract protected CopySpecInternal getDelegateCopySpec();
 
-    public RelativePath getDestPath() {
-        return getDelegateCopySpec().getDestPath();
-    }
-
-    public FileTree getSource() {
-        return getDelegateCopySpec().getSource();
-    }
-
     public boolean hasSource() {
         return getDelegateCopySpec().hasSource();
     }
 
-    public Collection<? extends Action<? super FileCopyDetails>> getAllCopyActions() {
-        return getDelegateCopySpec().getAllCopyActions();
-    }
-
     public boolean isCaseSensitive() {
         return getDelegateCopySpec().isCaseSensitive();
     }
@@ -75,7 +62,7 @@ public CopySpec filesMatching(String pattern, Action<? super FileCopyDetails> ac
         return getDelegateCopySpec().filesMatching(pattern, action);
     }
 
-     public CopySpec filesNotMatching(String pattern, Action<? super FileCopyDetails> action) {
+    public CopySpec filesNotMatching(String pattern, Action<? super FileCopyDetails> action) {
         return getDelegateCopySpec().filesNotMatching(pattern, action);
     }
 
@@ -203,10 +190,6 @@ public Iterable<CopySpecInternal> getChildren() {
         return getDelegateCopySpec().getChildren();
     }
 
-    public FileTree getAllSource() {
-        return getDelegateCopySpec().getAllSource();
-    }
-
     public CopySpecInternal addChild() {
         return getDelegateCopySpec().addChild();
     }
@@ -219,10 +202,15 @@ public CopySpecInternal addFirst() {
         return getDelegateCopySpec().addFirst();
     }
 
-    public void walk(Action<? super CopySpecInternal> action) {
-        action.execute(this);
-        for (CopySpecInternal child : getChildren()) {
-            child.walk(action);
-        }
+    public void walk(Action<? super CopySpecResolver> action) {
+        getDelegateCopySpec().walk(action);
+    }
+
+    public CopySpecResolver buildRootResolver() {
+        return getDelegateCopySpec().buildRootResolver();
+    }
+
+    public CopySpecResolver buildResolverRelativeToParent(CopySpecResolver parent) {
+        return getDelegateCopySpec().buildResolverRelativeToParent(parent);
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DestinationRootCopySpec.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DestinationRootCopySpec.java
index c101d269a9d0..3e048263f8e9 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DestinationRootCopySpec.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/DestinationRootCopySpec.java
@@ -48,4 +48,5 @@ public File getDestinationDir() {
         return destinationDir == null ? null : fileResolver.resolve(destinationDir);
     }
 
+
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/RelativizedCopySpec.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/RelativizedCopySpec.java
deleted file mode 100644
index 429735d17a61..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/RelativizedCopySpec.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.file.copy;
-
-import org.gradle.api.Transformer;
-import org.gradle.api.file.RelativePath;
-
-import static org.gradle.util.CollectionUtils.collect;
-
-public class RelativizedCopySpec extends DelegatingCopySpecInternal {
-
-    private final CopySpecInternal parent;
-    private final CopySpecInternal child;
-
-    public RelativizedCopySpec(CopySpecInternal parent, CopySpecInternal child) {
-        this.parent = parent;
-        this.child = child;
-    }
-
-    @Override
-    protected CopySpecInternal getDelegateCopySpec() {
-        return child;
-    }
-
-    public RelativePath getDestPath() {
-        return parent.getDestPath().append(child.getDestPath());
-    }
-
-    @Override
-    public Iterable<CopySpecInternal> getChildren() {
-        return collect(super.getChildren(), new Transformer<CopySpecInternal, CopySpecInternal>() {
-            public CopySpecInternal transform(CopySpecInternal original) {
-                return new RelativizedCopySpec(parent, original);
-            }
-        });
-    }
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/SingleParentCopySpec.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/SingleParentCopySpec.java
new file mode 100644
index 000000000000..d89a48a75cef
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/file/copy/SingleParentCopySpec.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.file.copy;
+
+import org.gradle.api.file.DuplicatesStrategy;
+import org.gradle.api.internal.file.FileResolver;
+import org.gradle.internal.reflect.Instantiator;
+
+public class SingleParentCopySpec extends DefaultCopySpec {
+
+    CopySpecResolver parentResolver;
+
+    public SingleParentCopySpec(FileResolver resolver, Instantiator instantiator, CopySpecResolver parentResolver) {
+        super(resolver, instantiator);
+        this.parentResolver = parentResolver;
+    }
+
+    public CopySpecInternal addChild() {
+        DefaultCopySpec child = new SingleParentCopySpec(fileResolver, instantiator, buildResolverRelativeToParent(parentResolver));
+        childSpecs.add(child);
+        return child;
+    }
+
+    protected CopySpecInternal addChildAtPosition(int position) {
+        DefaultCopySpec child = instantiator.newInstance(SingleParentCopySpec.class, fileResolver, instantiator, buildResolverRelativeToParent(parentResolver));
+        childSpecs.add(position, child);
+        return child;
+    }
+
+    public boolean isCaseSensitive() {
+        return buildResolverRelativeToParent(parentResolver).isCaseSensitive();
+    }
+
+    public boolean getIncludeEmptyDirs() {
+        return buildResolverRelativeToParent(parentResolver).getIncludeEmptyDirs();
+    }
+
+    public DuplicatesStrategy getDuplicatesStrategy() {
+        return buildResolverRelativeToParent(parentResolver).getDuplicatesStrategy();
+    }
+
+    public Integer getDirMode() {
+        return buildResolverRelativeToParent(parentResolver).getDirMode();
+    }
+
+    public Integer getFileMode() {
+        return buildResolverRelativeToParent(parentResolver).getFileMode();
+    }
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/BasicDomainObjectContext.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/BasicDomainObjectContext.java
new file mode 100644
index 000000000000..52856c461077
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/BasicDomainObjectContext.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.initialization;
+
+import org.gradle.api.internal.DomainObjectContext;
+
+public class BasicDomainObjectContext implements DomainObjectContext {
+    public String absoluteProjectPath(String name) {
+        return name;
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderScope.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderScope.java
index 8cceee65bb89..cf441ddc5914 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderScope.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ClassLoaderScope.java
@@ -16,68 +16,72 @@
 
 package org.gradle.api.internal.initialization;
 
+import org.gradle.internal.Factory;
 import org.gradle.internal.classpath.ClassPath;
 
 /**
  * Represents a particular node in the ClassLoader graph.
  *
- * Certain domain objects (e.g. Gradle, Settings, Project) have an associated class loader scope.
- * This is used for evaluating associated scripts and script plugins.
+ * Certain domain objects (e.g. Gradle, Settings, Project) have an associated class loader scope. This is used for evaluating associated scripts and script plugins.
  *
- * Use of this class allows class loader creation to be lazy, and potentially optimised.
- * It also provides a central location for class loader reuse.
+ * Use of this class allows class loader creation to be lazy, and potentially optimised. It also provides a central location for class loader reuse.
  */
 public interface ClassLoaderScope {
 
     /**
-     * The effective class loader for this scope.
-     *
-     * It is strongly preferable to only call this after {@link #lock()}ing the scope as it allows the structure to be optimized.
+     * The classloader for use at this node.
+     * <p>
+     * Contains exported classes of the parent scope and all local and exported additions to this scope.
+     * It is strongly preferable to only call this after {@link #lock() locking} the scope as it allows the structure to be optimized.
      */
-    ClassLoader getScopeClassLoader();
+    ClassLoader getLocalClassLoader();
 
     /**
-     * The class loader that children inherit.
+     * The classloader for use by child nodes.
+     * <p>
+     * Contains exported classes of the parent scope and all local and exported additions to this scope.
+     * It is strongly preferable to only call this after {@link #lock() locking} the scope as it allows the structure to be optimized.
      */
-    ClassLoader getChildClassLoader();
+    ClassLoader getExportClassLoader();
 
     /**
-     * The base scope defines the parent for local additions.
+     * The parent of this scope.
      */
-    ClassLoaderScope getBase();
+    ClassLoaderScope getParent();
 
     /**
-     * Adds a class path to this scope, but not to children.
-     *
-     * Can not be called after being locked.
+     * Returns a factory for a loader based on the given classpath, whose parent is the export classloader of this scope.
+     * <p>
+     * There is no short circuiting for an empty classpath.
+     * Callers should verify the classpath argument is non empty.
+     * <p>
+     * It is strongly preferable to only invoke the factory after {@link #lock() locking} the scope as it allows the structure to be optimized.
      */
-    ClassLoader addLocal(ClassPath classpath);
+    Factory<? extends ClassLoader> loader(ClassPath classPath);
 
     /**
-     * Adds a class path to this scope, but not to children.
+     * Makes the classes of the given classloader visible to this scope, but not to children.
      *
-     * Can not be called after being locked.
+     * <p>Can not be called after being locked.
      */
-    ClassLoader export(ClassPath classpath);
+    ClassLoaderScope local(Factory<? extends ClassLoader> classLoader);
 
     /**
-     * Creates a scope with the same parent as this scope.
+     * Makes the classes of the given classloader visible to this scope and its children.
+     *
+     * <p>Can not be called after being locked.
      */
-    ClassLoaderScope createSibling();
+    ClassLoaderScope export(Factory<? extends ClassLoader> classLoader);
 
     /**
      * Creates a scope with the same parent as this scope.
-     *
-     * Local class paths added to the return child will NOT inherit from the exported classpath of this and parents (though exported class paths will)
      */
-    ClassLoaderScope createChild();
+    ClassLoaderScope createSibling();
 
     /**
-     * Creates a scope with the same parent as this scope.
-     *
-     * Local class paths added to the return child WILL inherit from the exported classpath of this and parents (exported class paths also will)
+     * Creates a scope with this scope as parent.
      */
-    ClassLoaderScope createRebasedChild();
+    ClassLoaderScope createChild();
 
     /**
      * Signal that no more modifications are to come, allowing the structure to be optimised if possible.
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScope.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScope.java
index 502bfb96bc05..a0ebcd9e9458 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScope.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScope.java
@@ -16,11 +16,14 @@
 
 package org.gradle.api.internal.initialization;
 
+import org.gradle.internal.Factory;
 import org.gradle.internal.classloader.CachingClassLoader;
 import org.gradle.internal.classloader.MultiParentClassLoader;
 import org.gradle.internal.classpath.ClassPath;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 
 public class DefaultClassLoaderScope implements ClassLoaderScope {
@@ -28,132 +31,128 @@ public class DefaultClassLoaderScope implements ClassLoaderScope {
     public static final String STRICT_MODE_PROPERTY = "org.gradle.classloaderscope.strict";
 
     private final ClassLoaderScope parent;
-    private final ClassLoaderScope base;
     private final ClassLoaderCache classLoaderCache;
 
     private boolean locked;
 
-    private List<ClassLoader> local;
-
-    private ClassLoader scopeClassLoader;
+    private List<Factory<? extends ClassLoader>> export = new LinkedList<Factory<? extends ClassLoader>>();
+    private List<Factory<? extends ClassLoader>> local = new LinkedList<Factory<? extends ClassLoader>>();
 
+    // If these are not null, we are pessimistic (loaders asked for before locking)
     private MultiParentClassLoader exportingClassLoader;
     private MultiParentClassLoader localClassLoader;
-    private ClassLoader childrenParent;
 
-    public DefaultClassLoaderScope(ClassLoaderScope parent, ClassLoaderScope base, ClassLoaderCache classLoaderCache) {
+    // What is actually exposed
+    private ClassLoader effectiveLocalClassLoader;
+    private ClassLoader effectiveExportClassLoader;
+
+    public DefaultClassLoaderScope(ClassLoaderScope parent, ClassLoaderCache classLoaderCache) {
         this.parent = parent;
-        this.base = base;
         this.classLoaderCache = classLoaderCache;
     }
 
-    public ClassLoader getChildClassLoader() {
-        getScopeClassLoader(); // trigger calculation
-        return childrenParent;
+    private MultiParentClassLoader buildLoader(ClassLoader parent, Collection<Factory<? extends ClassLoader>> rest) {
+        List<ClassLoader> parents = new ArrayList<ClassLoader>(rest.size() + 1);
+        parents.add(parent);
+        for (Factory<? extends ClassLoader> factory : rest) {
+            parents.add(factory.create());
+        }
+        return new MultiParentClassLoader(parents);
     }
 
-    public ClassLoaderScope getBase() {
-        return base;
+    private CachingClassLoader buildCachingLoader(ClassLoader parent, Collection<Factory<? extends ClassLoader>> rest) {
+        return new CachingClassLoader(buildLoader(parent, rest));
     }
 
-    public ClassLoader getScopeClassLoader() {
-        if (scopeClassLoader == null) {
+    private void buildEffectiveLoaders() {
+        if (effectiveLocalClassLoader == null) {
             if (locked) {
-                if (local == null && exportingClassLoader == null) { // best case, no additions
-                    scopeClassLoader = parent.getChildClassLoader();
-                    childrenParent = scopeClassLoader;
-                } else if (exportingClassLoader == null) { // no impact on children
-                    localClassLoader = new MultiParentClassLoader(parent.getChildClassLoader());
-                    scopeClassLoader = new CachingClassLoader(localClassLoader);
-                    childrenParent = parent.getChildClassLoader();
-                } else if (local == null) {
-                    scopeClassLoader = exportingClassLoader;
-                    childrenParent = scopeClassLoader;
+                if (local.isEmpty() && export.isEmpty()) {
+                    effectiveLocalClassLoader = parent.getExportClassLoader();
+                    effectiveExportClassLoader = parent.getExportClassLoader();
+                } else if (export.isEmpty()) {
+                    effectiveLocalClassLoader = buildCachingLoader(parent.getExportClassLoader(), local);
+                    effectiveExportClassLoader = parent.getExportClassLoader();
+                } else if (local.isEmpty()) {
+                    effectiveLocalClassLoader = buildCachingLoader(parent.getExportClassLoader(), export);
+                    effectiveExportClassLoader = effectiveLocalClassLoader;
                 } else {
-                    createFlexibleLoaderStructure();
+                    effectiveExportClassLoader = buildCachingLoader(parent.getExportClassLoader(), export);
+                    effectiveLocalClassLoader = buildCachingLoader(effectiveExportClassLoader, local);
                 }
             } else { // creating before locking, have to create the most flexible setup
                 if (Boolean.getBoolean(STRICT_MODE_PROPERTY)) {
                     throw new IllegalStateException("Attempt to define scope class loader before scope is locked");
                 }
 
-                createFlexibleLoaderStructure();
-            }
+                exportingClassLoader = buildLoader(parent.getExportClassLoader(), export);
+                effectiveExportClassLoader = new CachingClassLoader(exportingClassLoader);
 
-            if (local != null) {
-                for (ClassLoader localClassLoader : local) {
-                    addLocal(localClassLoader);
-                }
+                localClassLoader = buildLoader(effectiveExportClassLoader, local);
+                effectiveLocalClassLoader = new CachingClassLoader(localClassLoader);
             }
-        }
 
-        return scopeClassLoader;
+            export = null;
+            local = null;
+        }
     }
 
-    private void addLocal(ClassLoader newClassLoader) {
-        assert localClassLoader != null;
-        localClassLoader.addParent(newClassLoader);
+    public ClassLoader getExportClassLoader() {
+        buildEffectiveLoaders();
+        return effectiveExportClassLoader;
     }
 
-    private void createFlexibleLoaderStructure() {
-        if (exportingClassLoader == null) {
-            exportingClassLoader = new MultiParentClassLoader(parent.getChildClassLoader());
-        }
+    public ClassLoader getLocalClassLoader() {
+        buildEffectiveLoaders();
+        return effectiveLocalClassLoader;
+    }
 
-        localClassLoader = new MultiParentClassLoader(exportingClassLoader);
-        scopeClassLoader = new CachingClassLoader(localClassLoader);
-        childrenParent = exportingClassLoader;
+    public ClassLoaderScope getParent() {
+        return parent;
     }
 
-    public ClassLoader addLocal(ClassPath classpath) {
-        if (locked) {
-            throw new IllegalStateException("class loader scope is locked");
-        }
-        if (!classpath.isEmpty()) {
-            if (local == null) {
-                local = new ArrayList<ClassLoader>(1);
+    public Factory<? extends ClassLoader> loader(final ClassPath classPath) {
+        return new Factory<ClassLoader>() {
+            public ClassLoader create() {
+                return classLoaderCache.get(getExportClassLoader(), classPath, null);
             }
+        };
+    }
 
-            ClassLoader newClassLoader = classLoaderCache.get(base.getChildClassLoader(), classpath, null);
-            local.add(newClassLoader);
+    public ClassLoaderScope local(Factory<? extends ClassLoader> classLoader) {
+        assertNotLocked();
+        if (localClassLoader != null) {
+            localClassLoader.addParent(classLoader.create());
+        } else {
+            local.add(classLoader);
+        }
 
-            if (localClassLoader != null) { // classloader was eagerly created, have to add
-                addLocal(newClassLoader);
-            }
+        return this;
+    }
 
-            return newClassLoader;
+    public ClassLoaderScope export(Factory<? extends ClassLoader> classLoader) {
+        assertNotLocked();
+        if (exportingClassLoader != null) {
+            exportingClassLoader.addParent(classLoader.create());
         } else {
-            return base.getChildClassLoader();
+            export.add(classLoader);
         }
+
+        return this;
     }
 
-    public ClassLoader export(ClassPath classpath) {
+    private void assertNotLocked() {
         if (locked) {
             throw new IllegalStateException("class loader scope is locked");
         }
-        if (classpath.isEmpty()) {
-            return parent.getChildClassLoader();
-        } else {
-            if (exportingClassLoader == null) {
-                exportingClassLoader = new MultiParentClassLoader();
-            }
-
-            ClassLoader classLoader = classLoaderCache.get(parent.getChildClassLoader(), classpath, null);
-            exportingClassLoader.addParent(classLoader);
-            return classLoader;
-        }
     }
 
     public ClassLoaderScope createSibling() {
-        return new DefaultClassLoaderScope(parent, base, classLoaderCache);
+        return new DefaultClassLoaderScope(parent, classLoaderCache);
     }
 
     public ClassLoaderScope createChild() {
-        return new DefaultClassLoaderScope(this, base, classLoaderCache);
-    }
-
-    public ClassLoaderScope createRebasedChild() {
-        return new DefaultClassLoaderScope(this, this, classLoaderCache);
+        return new DefaultClassLoaderScope(this, classLoaderCache);
     }
 
     public ClassLoaderScope lock() {
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactory.java
index 05e64a333aa3..978ca17ac080 100755
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactory.java
@@ -60,9 +60,4 @@ public ScriptHandler create(ScriptSource scriptSource, ClassLoaderScope classLoa
         return new DefaultScriptHandler(scriptSource, repositoryHandler, dependencyHandler, configurationContainer, new ScriptHandlerClassLoaderFactory(scriptSource, classLoaderScope));
     }
 
-    private static class BasicDomainObjectContext implements DomainObjectContext {
-        public String absoluteProjectPath(String name) {
-            return name;
-        }
-    }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/RootClassLoaderScope.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/RootClassLoaderScope.java
index 3fe14b94e53d..84cb0b98e82d 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/RootClassLoaderScope.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/RootClassLoaderScope.java
@@ -16,6 +16,7 @@
 
 package org.gradle.api.internal.initialization;
 
+import org.gradle.internal.Factory;
 import org.gradle.internal.classpath.ClassPath;
 
 public class RootClassLoaderScope implements ClassLoaderScope {
@@ -28,23 +29,31 @@ public RootClassLoaderScope(ClassLoader classLoader, ClassLoaderCache classLoade
         this.classLoaderCache = classLoaderCache;
     }
 
-    public ClassLoader getScopeClassLoader() {
+    public ClassLoader getLocalClassLoader() {
         return classLoader;
     }
 
-    public ClassLoader getChildClassLoader() {
+    public ClassLoader getExportClassLoader() {
         return classLoader;
     }
 
-    public ClassLoaderScope getBase() {
-        return this;
+    public ClassLoaderScope getParent() {
+        return this; // should this be null?
+    }
+
+    public Factory<ClassLoader> loader(final ClassPath classPath) {
+        return new Factory<ClassLoader>() {
+            public ClassLoader create() {
+                return classLoaderCache.get(getExportClassLoader(), classPath, null);
+            }
+        };
     }
 
-    public ClassLoader addLocal(ClassPath classpath) {
+    public ClassLoaderScope local(Factory<? extends ClassLoader> classLoader) {
         throw new UnsupportedOperationException("root class loader scope is immutable");
     }
 
-    public ClassLoader export(ClassPath classpath) {
+    public ClassLoaderScope export(Factory<? extends ClassLoader> classLoader) {
         throw new UnsupportedOperationException("root class loader scope is immutable");
     }
 
@@ -53,11 +62,7 @@ public ClassLoaderScope createSibling() {
     }
 
     public ClassLoaderScope createChild() {
-        return new DefaultClassLoaderScope(this, this, classLoaderCache);
-    }
-
-    public ClassLoaderScope createRebasedChild() {
-        return createChild();
+        return new DefaultClassLoaderScope(this, classLoaderCache);
     }
 
     public ClassLoaderScope lock() {
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ScriptHandlerClassLoaderFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ScriptHandlerClassLoaderFactory.java
index 0dc4fc7a5ceb..70b508f5dcfb 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ScriptHandlerClassLoaderFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/initialization/ScriptHandlerClassLoaderFactory.java
@@ -37,7 +37,7 @@ public ClassLoader create() {
         if (!classLoaderScope.isLocked()) {
             LOGGER.debug("Eager creation of script class loader for {}. This may result in performance issues.", scriptSource);
         }
-        return classLoaderScope.getScopeClassLoader();
+        return classLoaderScope.getLocalClassLoader();
     }
 
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultObjectConfigurationAction.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultObjectConfigurationAction.java
index a703b0e45bab..7a03f08ce42c 100755
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultObjectConfigurationAction.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultObjectConfigurationAction.java
@@ -91,8 +91,9 @@ public void run() {
     private void applyScript(Object script) {
         URI scriptUri = resolver.resolveUri(script);
         UriScriptSource scriptSource = new UriScriptSource("script", scriptUri);
-        ScriptHandler scriptHandler = scriptHandlerFactory.create(scriptSource, classLoaderScope);
-        ScriptPlugin configurer = configurerFactory.create(scriptSource, scriptHandler, classLoaderScope, "buildscript", DefaultScript.class);
+        ClassLoaderScope classLoaderScopeChild = classLoaderScope.createChild();
+        ScriptHandler scriptHandler = scriptHandlerFactory.create(scriptSource, classLoaderScopeChild);
+        ScriptPlugin configurer = configurerFactory.create(scriptSource, scriptHandler, classLoaderScopeChild, classLoaderScope, "buildscript", DefaultScript.class, false);
         for (Object target : targets) {
             configurer.apply(target);
         }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginContainer.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginContainer.java
index 1e88e9c2684d..97acf3af84da 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginContainer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginContainer.java
@@ -15,6 +15,7 @@
  */
 package org.gradle.api.internal.plugins;
 
+import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.plugins.PluginAware;
 import org.gradle.api.plugins.PluginContainer;
@@ -34,7 +35,7 @@ public Plugin apply(String id) {
         return addPluginInternal(getTypeForId(id));
     }
 
-    public <T extends Plugin> T apply(Class<T> type) {
+    public <P extends Plugin> P apply(Class<P> type) {
         return addPluginInternal(type);
     }
 
@@ -54,7 +55,7 @@ public Plugin findPlugin(String id) {
         }
     }
 
-    public <T extends Plugin> T findPlugin(Class<T> type) {
+    public <P extends Plugin> P findPlugin(Class<P> type) {
         for (Plugin plugin : this) {
             if (plugin.getClass().equals(type)) {
                 return type.cast(plugin);
@@ -63,7 +64,7 @@ public <T extends Plugin> T findPlugin(Class<T> type) {
         return null;
     }
 
-    private <T extends Plugin> T addPluginInternal(Class<T> type) {
+    private <P extends Plugin<?>> P addPluginInternal(Class<P> type) {
         if (findPlugin(type) == null) {
             Plugin plugin = providePlugin(type);
             add(plugin);
@@ -83,11 +84,11 @@ public Plugin getAt(String id) throws UnknownPluginException {
         return getPlugin(id);
     }
 
-    public <T extends Plugin> T getAt(Class<T> type) throws UnknownPluginException {
+    public <P extends Plugin> P getAt(Class<P> type) throws UnknownPluginException {
         return getPlugin(type);
     }
 
-    public <T extends Plugin> T getPlugin(Class<T> type) throws UnknownPluginException {
+    public <P extends Plugin> P getPlugin(Class<P> type) throws UnknownPluginException {
         Plugin plugin = findPlugin(type);
         if (plugin == null) {
             throw new UnknownPluginException("Plugin with type " + type + " has not been used.");
@@ -95,12 +96,17 @@ public <T extends Plugin> T getPlugin(Class<T> type) throws UnknownPluginExcepti
         return type.cast(plugin);
     }
 
+    public void withId(String pluginId, Action<Plugin> action) {
+        Class type = getTypeForId(pluginId);
+        withType(type, action);
+    }
+
     protected Class<? extends Plugin> getTypeForId(String id) {
         return pluginRegistry.getTypeForId(id);
     }
 
-    private Plugin<T> providePlugin(Class<? extends Plugin> type) {
-        Plugin<T> plugin = pluginRegistry.loadPlugin(type);
+    private Plugin<T> providePlugin(Class<? extends Plugin<?>> type) {
+        @SuppressWarnings("unchecked") Plugin<T> plugin = (Plugin<T>) pluginRegistry.loadPlugin(type);
         plugin.apply(pluginAware);
         return plugin;
     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistry.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistry.java
index 4e1559d6a864..ad1f5bccc586 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistry.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistry.java
@@ -31,13 +31,13 @@
 import java.util.Map;
 
 public class DefaultPluginRegistry implements PluginRegistry {
-    private final Map<String, Class<? extends Plugin>> idMappings = new HashMap<String, Class<? extends Plugin>>();
+    private final Map<String, Class<? extends Plugin<?>>> idMappings = new HashMap<String, Class<? extends Plugin<?>>>();
     private final DefaultPluginRegistry parent;
     private final Factory<ClassLoader> classLoaderFactory;
     private final Instantiator instantiator;
 
-    public DefaultPluginRegistry(ClassLoader classLoaderFactory, Instantiator instantiator) {
-        this(null, Factories.constant(classLoaderFactory), instantiator);
+    public DefaultPluginRegistry(ClassLoader classLoader, Instantiator instantiator) {
+        this(null, Factories.constant(classLoader), instantiator);
     }
 
     private DefaultPluginRegistry(DefaultPluginRegistry parent, Factory<ClassLoader> classLoaderFactory, Instantiator instantiator) {
@@ -49,13 +49,13 @@ private DefaultPluginRegistry(DefaultPluginRegistry parent, Factory<ClassLoader>
     public PluginRegistry createChild(final ClassLoaderScope lookupScope, Instantiator instantiator) {
         Factory<ClassLoader> classLoaderFactory = new Factory<ClassLoader>() {
             public ClassLoader create() {
-                return lookupScope.getScopeClassLoader();
+                return lookupScope.getLocalClassLoader();
             }
         };
         return new DefaultPluginRegistry(this, classLoaderFactory, instantiator);
     }
 
-    public <T extends Plugin> T loadPlugin(Class<T> pluginClass) {
+    public <T extends Plugin<?>> T loadPlugin(Class<T> pluginClass) {
         if (!Plugin.class.isAssignableFrom(pluginClass)) {
             throw new InvalidUserDataException(String.format(
                     "Cannot create plugin of type '%s' as it does not implement the Plugin interface.",
@@ -69,7 +69,7 @@ public <T extends Plugin> T loadPlugin(Class<T> pluginClass) {
         }
     }
 
-    public Class<? extends Plugin> getTypeForId(String pluginId) {
+    public Class<? extends Plugin<?>> getTypeForId(String pluginId) {
         if (parent != null) {
             try {
                 return parent.getTypeForId(pluginId);
@@ -78,7 +78,7 @@ public Class<? extends Plugin> getTypeForId(String pluginId) {
             }
         }
 
-        Class<? extends Plugin> implClass = idMappings.get(pluginId);
+        Class<? extends Plugin<?>> implClass = idMappings.get(pluginId);
         if (implClass != null) {
             return implClass;
         }
@@ -103,7 +103,8 @@ public Class<? extends Plugin> getTypeForId(String pluginId) {
                 throw new PluginInstantiationException(String.format("Implementation class '%s' specified for plugin '%s' does not implement the Plugin interface. Specified in %s.",
                         implClassName, pluginId, pluginDescriptor));
             }
-            implClass = rawClass.asSubclass(Plugin.class);
+            @SuppressWarnings("unchecked") Class<Plugin<?>> cast = (Class<Plugin<?>>) rawClass.asSubclass(Plugin.class);
+            implClass = cast;
         } catch (ClassNotFoundException e) {
             throw new PluginInstantiationException(String.format(
                     "Could not find implementation class '%s' for plugin '%s' specified in %s.", implClassName, pluginId,
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginRegistry.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginRegistry.java
index a4e16908937d..2834d215d1db 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginRegistry.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/plugins/PluginRegistry.java
@@ -23,9 +23,9 @@
 import org.gradle.internal.reflect.Instantiator;
 
 public interface PluginRegistry {
-    <T extends Plugin> T loadPlugin(Class<T> pluginClass) throws PluginInstantiationException;
+    <T extends Plugin<?>> T loadPlugin(Class<T> pluginClass) throws PluginInstantiationException;
 
-    Class<? extends Plugin> getTypeForId(String pluginId) throws UnknownPluginException, PluginInstantiationException;
+    Class<? extends Plugin<?>> getTypeForId(String pluginId) throws UnknownPluginException, PluginInstantiationException;
 
     /**
      * Creates a child registry which uses the plugins declared in the given script scope.
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractPluginAware.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractPluginAware.java
index baf09daf4a36..a5cbb83c36db 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractPluginAware.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractPluginAware.java
@@ -30,23 +30,27 @@
 abstract public class AbstractPluginAware implements PluginAware {
 
     public void apply(Closure closure) {
-        DefaultObjectConfigurationAction action = new DefaultObjectConfigurationAction(getFileResolver(), getScriptPluginFactory(), getScriptHandlerFactory(), getClassLoaderScope().getBase().createChild(), this);
+        DefaultObjectConfigurationAction action = createObjectConfigurationAction();
         ConfigureUtil.configure(closure, action);
         action.execute();
     }
 
     public void apply(Map<String, ?> options) {
-        DefaultObjectConfigurationAction action = new DefaultObjectConfigurationAction(getFileResolver(), getScriptPluginFactory(), getScriptHandlerFactory(), getClassLoaderScope().getBase().createChild(), this);
+        DefaultObjectConfigurationAction action = createObjectConfigurationAction();
         ConfigureUtil.configureByMap(options, action);
         action.execute();
     }
 
+    private DefaultObjectConfigurationAction createObjectConfigurationAction() {
+        return new DefaultObjectConfigurationAction(getFileResolver(), getScriptPluginFactory(), getScriptHandlerFactory(), getBaseClassLoaderScope(), this);
+    }
+
     protected abstract FileResolver getFileResolver();
 
     protected abstract ScriptPluginFactory getScriptPluginFactory();
 
     protected abstract ScriptHandlerFactory getScriptHandlerFactory();
 
-    protected abstract ClassLoaderScope getClassLoaderScope();
+    protected abstract ClassLoaderScope getBaseClassLoaderScope();
 
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractProject.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractProject.java
index 196926ebee66..f33b06e05a70 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractProject.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/AbstractProject.java
@@ -40,11 +40,9 @@
 import org.gradle.api.internal.tasks.TaskContainerInternal;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
-import org.gradle.api.logging.LoggingManager;
 import org.gradle.api.plugins.Convention;
 import org.gradle.api.plugins.PluginContainer;
 import org.gradle.api.resources.ResourceHandler;
-import org.gradle.api.tasks.Directory;
 import org.gradle.api.tasks.TaskContainer;
 import org.gradle.api.tasks.WorkResult;
 import org.gradle.configuration.ScriptPluginFactory;
@@ -69,6 +67,7 @@
 import org.gradle.util.DeprecationLogger;
 import org.gradle.util.Path;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.net.URI;
 import java.util.*;
@@ -80,6 +79,7 @@
 public abstract class AbstractProject extends AbstractPluginAware implements ProjectInternal, DynamicObjectAware {
     private static Logger buildLogger = Logging.getLogger(Project.class);
     private final ClassLoaderScope classLoaderScope;
+    private final ClassLoaderScope baseClassLoaderScope;
     private ServiceRegistry services;
 
     private final ProjectInternal rootProject;
@@ -106,13 +106,9 @@ public abstract class AbstractProject extends AbstractPluginAware implements Pro
 
     private List<String> defaultTasks = new ArrayList<String>();
 
-    private Set<Project> dependsOnProjects = new HashSet<Project>();
-
     private ProjectStateInternal state;
 
     private FileResolver fileResolver;
-    private FileOperations fileOperations;
-    private ProcessOperations processOperations;
 
     private Factory<AntBuilder> antBuilderFactory;
 
@@ -120,44 +116,27 @@ public abstract class AbstractProject extends AbstractPluginAware implements Pro
 
     private Object buildDir = Project.DEFAULT_BUILD_DIR_NAME;
 
-    private PluginContainer pluginContainer;
-
     private final int depth;
 
     private TaskContainerInternal taskContainer;
 
     private TaskContainerInternal implicitTasksContainer;
 
-    private ProjectRegistry<ProjectInternal> projectRegistry;
-
     private DependencyHandler dependencyHandler;
 
     private ConfigurationContainerInternal configurationContainer;
 
     private ArtifactHandler artifactHandler;
 
-    private RepositoryHandler repositoryHandler;
-
-    private ScriptHandler scriptHandler;
-
     private ListenerBroadcast<ProjectEvaluationListener> evaluationListener = new ListenerBroadcast<ProjectEvaluationListener>(ProjectEvaluationListener.class);
 
-    private LoggingManagerInternal loggingManager;
-
-    private SoftwareComponentContainer softwareComponentContainer;
-
     private ExtensibleDynamicObject extensibleDynamicObject;
 
-    private ProjectConfigurationActionContainer configurationActions;
-
-    private final ModelRegistry modelRegistry;
     private final ModelRules modelRules;
 
     private String description;
 
     private final Path path;
-    private final ScriptPluginFactory scriptPluginFactory;
-    private final ScriptHandlerFactory scriptHandlerFactory;
 
     public AbstractProject(String name,
                            ProjectInternal parent,
@@ -165,9 +144,10 @@ public AbstractProject(String name,
                            ScriptSource buildScriptSource,
                            GradleInternal gradle,
                            ServiceRegistryFactory serviceRegistryFactory,
-                           ClassLoaderScope classLoaderScope
-    ) {
-        this.classLoaderScope = classLoaderScope;
+                           ClassLoaderScope selfClassLoaderScope,
+                           ClassLoaderScope baseClassLoaderScope) {
+        this.classLoaderScope = selfClassLoaderScope;
+        this.baseClassLoaderScope = baseClassLoaderScope;
         assert name != null;
         this.rootProject = parent != null ? parent.getRootProject() : this;
         this.projectDir = projectDir;
@@ -187,26 +167,7 @@ public AbstractProject(String name,
         }
 
         services = serviceRegistryFactory.createFor(this);
-        fileResolver = services.get(FileResolver.class);
-        antBuilderFactory = services.getFactory(AntBuilder.class);
         taskContainer = services.newInstance(TaskContainerInternal.class);
-        implicitTasksContainer = services.newInstance(TaskContainerInternal.class);
-        fileOperations = services.get(FileOperations.class);
-        processOperations = services.get(ProcessOperations.class);
-        projectEvaluator = services.get(ProjectEvaluator.class);
-        repositoryHandler = services.get(RepositoryHandler.class);
-        configurationContainer = services.get(ConfigurationContainerInternal.class);
-        pluginContainer = services.get(PluginContainer.class);
-        artifactHandler = services.get(ArtifactHandler.class);
-        dependencyHandler = services.get(DependencyHandler.class);
-        scriptHandler = services.get(ScriptHandler.class);
-        projectRegistry = services.get(ProjectRegistry.class);
-        loggingManager = services.get(LoggingManagerInternal.class);
-        softwareComponentContainer = services.get(SoftwareComponentContainer.class);
-        scriptPluginFactory = services.get(ScriptPluginFactory.class);
-        scriptHandlerFactory = services.get(ScriptHandlerFactory.class);
-        configurationActions = services.get(ProjectConfigurationActionContainer.class);
-        modelRegistry = services.get(ModelRegistry.class);
         modelRules = services.get(ModelRules.class);
 
         extensibleDynamicObject = new ExtensibleDynamicObject(this, services.get(Instantiator.class));
@@ -254,11 +215,16 @@ public GradleInternal getGradle() {
         return gradle;
     }
 
+    @Inject
     public PluginContainer getPlugins() {
-        return pluginContainer;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     public ProjectEvaluator getProjectEvaluator() {
+        if (projectEvaluator == null) {
+            projectEvaluator = services.get(ProjectEvaluator.class);
+        }
         return projectEvaluator;
     }
 
@@ -266,8 +232,10 @@ public void setProjectEvaluator(ProjectEvaluator projectEvaluator) {
         this.projectEvaluator = projectEvaluator;
     }
 
+    @Inject
     public ScriptHandler getBuildscript() {
-        return scriptHandler;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     public File getBuildFile() {
@@ -356,15 +324,14 @@ public void setDefaultTasks(List<String> defaultTasks) {
         this.defaultTasks = defaultTasks;
     }
 
-    public Set<Project> getDependsOnProjects() {
-        return dependsOnProjects;
-    }
-
     public ProjectStateInternal getState() {
         return state;
     }
 
     public FileResolver getFileResolver() {
+        if (fileResolver == null) {
+            fileResolver = services.get(FileResolver.class);
+        }
         return fileResolver;
     }
 
@@ -377,6 +344,9 @@ public void setAnt(AntBuilder ant) {
     }
 
     public ArtifactHandler getArtifacts() {
+        if (artifactHandler == null) {
+            artifactHandler = services.get(ArtifactHandler.class);
+        }
         return artifactHandler;
     }
 
@@ -384,11 +354,16 @@ public void setArtifactHandler(ArtifactHandler artifactHandler) {
         this.artifactHandler = artifactHandler;
     }
 
+    @Inject
     public RepositoryHandler getRepositories() {
-        return repositoryHandler;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     public ConfigurationContainerInternal getConfigurations() {
+        if (configurationContainer == null) {
+            configurationContainer = services.get(ConfigurationContainerInternal.class);
+        }
         return configurationContainer;
     }
 
@@ -408,8 +383,10 @@ public int getDepth() {
         return depth;
     }
 
+    @Inject
     public ProjectRegistry<ProjectInternal> getProjectRegistry() {
-        return projectRegistry;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     public int depthCompare(Project otherProject) {
@@ -445,15 +422,15 @@ public ProjectInternal findProject(String path) {
         if (!isTrue(path)) {
             throw new InvalidUserDataException("A path must be specified!");
         }
-        return projectRegistry.getProject(absoluteProjectPath(path));
+        return getProjectRegistry().getProject(absoluteProjectPath(path));
     }
 
     public Set<Project> getAllprojects() {
-        return new TreeSet<Project>(projectRegistry.getAllProjects(getPath()));
+        return new TreeSet<Project>(getProjectRegistry().getAllProjects(getPath()));
     }
 
     public Set<Project> getSubprojects() {
-        return new TreeSet<Project>(projectRegistry.getSubProjects(getPath()));
+        return new TreeSet<Project>(getProjectRegistry().getSubProjects(getPath()));
     }
 
     public void subprojects(Action<? super Project> action) {
@@ -479,7 +456,7 @@ public AntBuilder getAnt() {
     }
 
     public AntBuilder createAntBuilder() {
-        return antBuilderFactory.create();
+        return getAntBuilderFactory().create();
     }
 
     /**
@@ -490,7 +467,7 @@ public Project getProject() {
     }
 
     public AbstractProject evaluate() {
-        projectEvaluator.evaluate(this, state);
+        getProjectEvaluator().evaluate(this, state);
         state.rethrowFailure();
         return this;
     }
@@ -500,6 +477,9 @@ public TaskContainerInternal getTasks() {
     }
 
     public TaskContainerInternal getImplicitTasks() {
+        if (implicitTasksContainer == null) {
+            implicitTasksContainer = services.newInstance(TaskContainerInternal.class);
+        }
         return implicitTasksContainer;
     }
 
@@ -554,26 +534,6 @@ public void setBuildDir(Object path) {
         buildDir = path;
     }
 
-    public void dependsOn(final String path) {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("Project.dependsOn(String path)");
-        DeprecationLogger.whileDisabled(new Factory<Void>() {
-            public Void create() {
-                dependsOn(path, true);
-                return null;
-            }
-        });
-    }
-
-    public void dependsOn(String path, boolean evaluateDependsOnProject) {
-        if (!isTrue(path)) {
-            throw new InvalidUserDataException("You must specify a project!");
-        }
-        dependsOnProjects.add(project(path));
-        if (evaluateDependsOnProject) {
-            evaluationDependsOn(path);
-        }
-    }
-
     public void evaluationDependsOnChildren() {
         for (Project project : childProjects.values()) {
             DefaultProject defaultProjectToEvaluate = (DefaultProject) project;
@@ -597,42 +557,6 @@ private Project evaluationDependsOn(DefaultProject projectToEvaluate) {
         return projectToEvaluate.evaluate();
     }
 
-    public Project childrenDependOnMe() {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("Project.childrenDependOnMe()");
-        DeprecationLogger.whileDisabled(new Factory<Void>() {
-            public Void create() {
-                for (Project project : childProjects.values()) {
-                    project.dependsOn(getPath(), false);
-                }
-                return null;
-            }
-        });
-
-        return this;
-    }
-
-    public Project dependsOnChildren() {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("Project.dependsOnChildren()");
-        return DeprecationLogger.whileDisabled(new Factory<Project>() {
-            public Project create() {
-                return dependsOnChildren(false);
-            }
-        });
-    }
-
-    public Project dependsOnChildren(final boolean evaluateDependsOnProject) {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("Project.dependsOnChildren(boolean)");
-        DeprecationLogger.whileDisabled(new Factory<Void>() {
-            public Void create() {
-                for (Project project : childProjects.values()) {
-                    dependsOn(project.getPath(), evaluateDependsOnProject);
-                }
-                return null;
-            }
-        });
-        return this;
-    }
-
     public String toString() {
         if (parent != null) {
             return String.format("project '%s'", path);
@@ -663,6 +587,10 @@ public Set<Task> getTasksByName(final String name, boolean recursive) {
         final Set<Task> foundTasks = new HashSet<Task>();
         Action<Project> action = new Action<Project>() {
             public void execute(Project project) {
+                //in configure-on-demand we don't know if the project was configured, hence explicit evaluate.
+                // Not especially tidy, we should clean this up while working on new configuration model.
+                ((ProjectInternal) project).evaluate();
+
                 Task task = project.getTasks().findByName(name);
                 if (task != null) {
                     foundTasks.add(task);
@@ -677,103 +605,84 @@ public void execute(Project project) {
         return foundTasks;
     }
 
+    @Inject
+    protected FileOperations getFileOperations() {
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
+    }
+
     public File file(Object path) {
-        return fileOperations.file(path);
+        return getFileOperations().file(path);
     }
 
     public File file(Object path, PathValidation validation) {
-        return fileOperations.file(path, validation);
+        return getFileOperations().file(path, validation);
     }
 
     public URI uri(Object path) {
-        return fileOperations.uri(path);
+        return getFileOperations().uri(path);
     }
 
     public ConfigurableFileCollection files(Object... paths) {
-        return fileOperations.files(paths);
+        return getFileOperations().files(paths);
     }
 
     public ConfigurableFileCollection files(Object paths, Closure closure) {
-        return fileOperations.files(paths, closure);
+        return getFileOperations().files(paths, closure);
     }
 
     public ConfigurableFileTree fileTree(Object baseDir) {
-        return fileOperations.fileTree(baseDir);
+        return getFileOperations().fileTree(baseDir);
     }
 
     public ConfigurableFileTree fileTree(Object baseDir, Closure closure) {
-        return fileOperations.fileTree(baseDir, closure);
+        return getFileOperations().fileTree(baseDir, closure);
     }
 
     public ConfigurableFileTree fileTree(Map<String, ?> args) {
-        return fileOperations.fileTree(args);
+        return getFileOperations().fileTree(args);
     }
 
     public ConfigurableFileTree fileTree(Closure closure) {
         DeprecationLogger.nagUserOfDeprecated("fileTree(Closure)", "Use fileTree((Object){ baseDir }) to have the closure used as the file tree base directory");
-        return fileOperations.fileTree(closure);
+        return getFileOperations().fileTree(closure);
     }
 
     public FileTree zipTree(Object zipPath) {
-        return fileOperations.zipTree(zipPath);
+        return getFileOperations().zipTree(zipPath);
     }
 
     public FileTree tarTree(Object tarPath) {
-        return fileOperations.tarTree(tarPath);
+        return getFileOperations().tarTree(tarPath);
     }
 
     public ResourceHandler getResources() {
-        return fileOperations.getResources();
+        return getFileOperations().getResources();
     }
 
     public String relativePath(Object path) {
-        return fileOperations.relativePath(path);
+        return getFileOperations().relativePath(path);
     }
 
     public File mkdir(Object path) {
-        return fileOperations.mkdir(path);
+        return getFileOperations().mkdir(path);
     }
 
     public boolean delete(Object... paths) {
-        return fileOperations.delete(paths);
-    }
-
-    /**
-     * @deprecated Use the {@link #mkdir(Object)} instead.
-     */
-    @Deprecated
-    public Directory dir(String path) {
-        DeprecationLogger.nagUserOfReplacedMethod("AbstractProject.dir()", "mkdir()");
-        String[] pathElements = path.split("/");
-        String name = "";
-        Directory dirTask = null;
-        for (String pathElement : pathElements) {
-            name += name.length() != 0 ? "/" + pathElement : pathElement;
-            Task task = taskContainer.findByName(name);
-            if (task instanceof Directory) {
-                dirTask = (Directory) task;
-            } else if (task != null) {
-                throw new InvalidUserDataException(String.format("Cannot add directory task '%s' as a non-directory task with this name already exists.", name));
-            } else {
-                dirTask = taskContainer.create(name, Directory.class);
-            }
-        }
-        return dirTask;
-    }
-
-    public void setTaskContainer(TaskContainerInternal taskContainer) {
-        this.taskContainer = taskContainer;
+        return getFileOperations().delete(paths);
     }
 
     public Factory<AntBuilder> getAntBuilderFactory() {
+        if (antBuilderFactory == null) {
+            antBuilderFactory = services.getFactory(AntBuilder.class);
+        }
         return antBuilderFactory;
     }
 
-    public void setAntBuilderFactory(Factory<AntBuilder> antBuilderFactory) {
-        this.antBuilderFactory = antBuilderFactory;
-    }
-
     public DependencyHandler getDependencies() {
+        if (dependencyHandler == null) {
+            dependencyHandler = services.get(DependencyHandler.class);
+        }
         return dependencyHandler;
     }
 
@@ -806,15 +715,19 @@ public Logger getLogger() {
     }
 
     public StandardOutputCapture getStandardOutputCapture() {
-        return loggingManager;
+        return getLogging();
     }
 
-    public LoggingManager getLogging() {
-        return loggingManager;
+    @Inject
+    public LoggingManagerInternal getLogging() {
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
+    @Inject
     public SoftwareComponentContainer getComponents() {
-        return softwareComponentContainer;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     public Object property(String propertyName) throws MissingPropertyException {
@@ -838,27 +751,33 @@ public boolean hasProperty(String propertyName) {
     }
 
     public WorkResult copy(Closure closure) {
-        return fileOperations.copy(closure);
+        return getFileOperations().copy(closure);
     }
 
     public WorkResult sync(Action<? super CopySpec> action) {
-        return fileOperations.sync(action);
+        return getFileOperations().sync(action);
     }
 
     public CopySpec copySpec(Closure closure) {
-        return fileOperations.copySpec(closure);
+        return getFileOperations().copySpec(closure);
     }
 
     public CopySpec copySpec(Action<? super CopySpec> action) {
-        return fileOperations.copySpec(action);
+        return getFileOperations().copySpec(action);
+    }
+
+    @Inject
+    protected ProcessOperations getProcessOperations() {
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     public ExecResult javaexec(Closure closure) {
-        return processOperations.javaexec(closure);
+        return getProcessOperations().javaexec(closure);
     }
 
     public ExecResult exec(Closure closure) {
-        return processOperations.exec(closure);
+        return getProcessOperations().exec(closure);
     }
 
     public ServiceRegistry getServices() {
@@ -952,29 +871,41 @@ public Task task(Map options, Object task, Closure configureClosure) {
         return task(options, task.toString(), configureClosure);
     }
 
+    @Inject
     public ProjectConfigurationActionContainer getConfigurationActions() {
-        return configurationActions;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
+    @Inject
     public ModelRegistry getModelRegistry() {
-        return modelRegistry;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     @Override
+    @Inject
     protected ScriptPluginFactory getScriptPluginFactory() {
-        return scriptPluginFactory;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
     @Override
+    @Inject
     protected ScriptHandlerFactory getScriptHandlerFactory() {
-        return scriptHandlerFactory;
+        // Decoration takes care of the implementation
+        throw new UnsupportedOperationException();
     }
 
-    @Override
     public ClassLoaderScope getClassLoaderScope() {
         return classLoaderScope;
     }
 
+    @Override
+    public ClassLoaderScope getBaseClassLoaderScope() {
+        return baseClassLoaderScope;
+    }
+
     /**
      * This is called by the task creation DSL. Need to find a cleaner way to do this...
      */
@@ -1007,5 +938,4 @@ public void model(Closure action) {
         new GroovyModelDsl(modelRules).configure(action);
     }
 
-
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProject.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProject.java
index 5cc774fad52a..aab25432da97 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProject.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProject.java
@@ -27,7 +27,7 @@
 @NoConventionMapping
 public class DefaultProject extends AbstractProject {
     public DefaultProject(String name, ProjectInternal parent, File projectDir, ScriptSource buildScriptSource,
-                          GradleInternal gradle, ServiceRegistryFactory serviceRegistryFactory, ClassLoaderScope classLoaderScope) {
-        super(name, parent, projectDir, buildScriptSource, gradle, serviceRegistryFactory, classLoaderScope);
+                          GradleInternal gradle, ServiceRegistryFactory serviceRegistryFactory, ClassLoaderScope selfClassLoaderScope, ClassLoaderScope baseClassLoaderScope) {
+        super(name, parent, projectDir, buildScriptSource, gradle, serviceRegistryFactory, selfClassLoaderScope, baseClassLoaderScope);
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProjectTaskLister.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProjectTaskLister.java
new file mode 100644
index 000000000000..42c34b790e34
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/DefaultProjectTaskLister.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.project;
+
+import com.google.common.collect.Sets;
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.internal.tasks.TaskContainerInternal;
+
+import java.util.Collection;
+
+public class DefaultProjectTaskLister implements ProjectTaskLister {
+    public Collection<Task> listProjectTasks(Project project) {
+        ProjectInternal projectInternal = (ProjectInternal) project;
+        TaskContainerInternal tasks = projectInternal.getTasks();
+        tasks.actualize();
+        return Sets.union(tasks, projectInternal.getImplicitTasks());
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/IProjectFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/IProjectFactory.java
index 93e782cf7c95..a79c462bc247 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/IProjectFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/IProjectFactory.java
@@ -23,5 +23,5 @@
  * Creates a {@link ProjectInternal} implementation.
  */
 public interface IProjectFactory {
-    ProjectInternal createProject(ProjectDescriptor projectDescriptor, ProjectInternal parent, GradleInternal gradle, ClassLoaderScope classLoaderScope);
+    ProjectInternal createProject(ProjectDescriptor projectDescriptor, ProjectInternal parent, GradleInternal gradle, ClassLoaderScope selfClassLoaderScope, ClassLoaderScope baseClassLoaderScope);
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectFactory.java
index 4e6c7f7ba4bf..4d1bc4edd405 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectFactory.java
@@ -35,7 +35,7 @@ public ProjectFactory(Instantiator instantiator, ProjectRegistry<ProjectInternal
         this.projectRegistry = projectRegistry;
     }
 
-    public DefaultProject createProject(ProjectDescriptor projectDescriptor, ProjectInternal parent, GradleInternal gradle, ClassLoaderScope classLoaderScope) {
+    public DefaultProject createProject(ProjectDescriptor projectDescriptor, ProjectInternal parent, GradleInternal gradle, ClassLoaderScope selfClassLoaderScope, ClassLoaderScope baseClassLoaderScope) {
         File buildFile = projectDescriptor.getBuildFile();
         ScriptSource source;
         if (!buildFile.exists()) {
@@ -51,8 +51,9 @@ public DefaultProject createProject(ProjectDescriptor projectDescriptor, Project
                 source,
                 gradle,
                 gradle.getServiceRegistryFactory(),
-                classLoaderScope
-                );
+                selfClassLoaderScope,
+                baseClassLoaderScope
+        );
 
         if (parent != null) {
             parent.addChildProject(project);
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectInternal.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectInternal.java
index 0a083238a307..61a4030bc293 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectInternal.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectInternal.java
@@ -85,4 +85,6 @@ public interface ProjectInternal extends Project, ProjectIdentifier, ScriptAware
 
     ClassLoaderScope getClassLoaderScope();
 
+    ClassLoaderScope getBaseClassLoaderScope();
+
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectTaskLister.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectTaskLister.java
new file mode 100644
index 000000000000..5eb505ead296
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/ProjectTaskLister.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.project;
+
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+
+import java.util.Collection;
+
+/**
+ * Service to provide all tasks in a project including both regular tasks,
+ * and implicit tasks.
+ * Used by {@code :diagnostics} and {@code :toolingApi}.
+ */
+public interface ProjectTaskLister {
+    Collection<Task> listProjectTasks(Project project);
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
index 28059ef39a62..0747fb983ba5 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
@@ -99,7 +99,6 @@ public TaskInternal createTask(Map<String, ?> args) {
         TaskInternal task = taskFactory.createTask(args);
         TaskClassInfo taskClassInfo = getTaskClassInfo(task.getClass());
 
-        // TODO:DAZ Make this more general purpose, and support IncrementalTaskActions added via another mechanism.
         if (taskClassInfo.incremental) {
             // Add a dummy upToDateWhen spec: this will for TaskOutputs.hasOutputs() to be true.
             task.getOutputs().upToDateWhen(new Spec<Task>() {
@@ -335,7 +334,7 @@ private void attachValidationAction(PropertyAnnotationHandler handler, PropertyI
                 return;
             }
 
-            Annotation optional = annotationTarget.getAnnotation(Optional.class);
+            Annotation optional = annotationTarget.getAnnotation(org.gradle.api.tasks.Optional.class);
             if (optional == null) {
                 propertyInfo.setNotNullValidator(notNullValidator);
             }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskContainer.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskContainer.java
index 675bb29756d5..5d5dda2c28ce 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskContainer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskContainer.java
@@ -244,4 +244,8 @@ private void maybeMaterializePlaceholder(String name) {
     public void addPlaceholderAction(String placeholderName, Runnable runnable) {
         placeholders.put(placeholderName, runnable);
     }
+
+    public <U extends Task> NamedDomainObjectContainer<U> containerWithType(Class<U> type) {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskInputs.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskInputs.java
index 7bc7c8fef18c..d8c6be4a2634 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskInputs.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/tasks/DefaultTaskInputs.java
@@ -16,6 +16,7 @@
 package org.gradle.api.internal.tasks;
 
 import groovy.lang.Closure;
+import groovy.lang.GString;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.TaskInternal;
 import org.gradle.api.internal.file.FileResolver;
@@ -97,13 +98,13 @@ public TaskInputs sourceDir(Object path) {
     public Map<String, Object> getProperties() {
         Map<String, Object> actualProperties = new HashMap<String, Object>();
         for (Map.Entry<String, Object> entry : properties.entrySet()) {
-            Object value = unwrap(entry.getValue());
+            Object value = prepareValue(entry.getValue());
             actualProperties.put(entry.getKey(), value);
         }
         return actualProperties;
     }
 
-    private Object unwrap(Object value) {
+    private Object prepareValue(Object value) {
         while (true) {
             if (value instanceof Callable) {
                 Callable callable = (Callable) value;
@@ -119,11 +120,15 @@ private Object unwrap(Object value) {
                 FileCollection fileCollection = (FileCollection) value;
                 return fileCollection.getFiles();
             } else {
-                return value;
+                return avoidGString(value);
             }
         }
     }
 
+    private static Object avoidGString(Object value) {
+        return (value instanceof GString)? value.toString() : value;
+    }
+
     public TaskInputs property(String name, Object value) {
         taskStatusNagger.nagIfTaskNotInConfigurableState("TaskInputs.property(String, Object)");
         properties.put(name, value);
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/logging/LoggingManager.java b/subprojects/core/src/main/groovy/org/gradle/api/logging/LoggingManager.java
index 0fa81d4fcab1..b7d58e50915f 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/logging/LoggingManager.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/logging/LoggingManager.java
@@ -16,10 +16,13 @@
 
 package org.gradle.api.logging;
 
+import org.gradle.internal.HasInternalProtocol;
+
 /**
  * <p>A {@code LoggingManager} provides access to and control over the Gradle logging system. Using this interface, you
  * can control the current logging level and standard output and error capture.</p>
  */
+@HasInternalProtocol
 public interface LoggingManager extends LoggingOutput {
     /**
      * Requests that output written to System.out be routed to Gradle's logging system. The default is that System.out
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/plugins/PluginContainer.java b/subprojects/core/src/main/groovy/org/gradle/api/plugins/PluginContainer.java
index ef8025fbed67..cbeacd1c2ced 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/plugins/PluginContainer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/plugins/PluginContainer.java
@@ -16,6 +16,8 @@
 
 package org.gradle.api.plugins;
 
+import org.gradle.api.Action;
+import org.gradle.api.Incubating;
 import org.gradle.api.Plugin;
 
 /**
@@ -108,4 +110,18 @@ public interface PluginContainer extends PluginCollection<Plugin> {
      * @throws UnknownPluginException When there is no plugin with the given type.
      */
     <T extends Plugin> T getAt(Class<T> type) throws UnknownPluginException;
+
+    /**
+     * Executes or registers an action for a plugin with given id.
+     * If the plugin was already applied, the action is executed.
+     * If the plugin is applied sometime later the action will be executed after the plugin is applied.
+     * If the plugin is never applied, the action is never executed.
+     * The behavior is similar to {@link #withType(Class, org.gradle.api.Action)}.
+     *
+     * @param pluginId the id of the plugin
+     * @param action the action
+     */
+    @Incubating
+    void withId(String pluginId, Action<Plugin> action);
+
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/specs/Specs.java b/subprojects/core/src/main/groovy/org/gradle/api/specs/Specs.java
index 04302387c2e5..2bd6c58146d9 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/specs/Specs.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/specs/Specs.java
@@ -17,11 +17,8 @@
 
 import groovy.lang.Closure;
 import org.gradle.api.specs.internal.ClosureSpec;
-import org.gradle.util.DeprecationLogger;
 
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Provides a number of {@link org.gradle.api.specs.Spec} implementations.
@@ -56,17 +53,6 @@ public static <T> Spec<T> convertClosureToSpec(final Closure closure) {
         return new ClosureSpec<T>(closure);
     }
 
-    public static <T> Set<T> filterIterable(Iterable<? extends T> iterable, Spec<? super T> spec) {
-        DeprecationLogger.nagUserOfReplacedMethod("Specs.filterIterable", "CollectionUtils.filter");
-        Set<T> result = new LinkedHashSet<T>();
-        for (T t : iterable) {
-            if (spec.isSatisfiedBy(t)) {
-                result.add(t);
-            }
-        }
-        return result;
-    }
-
     public static <T> AndSpec<T> and(Spec<? super T>... specs) {
         return new AndSpec<T>(specs);  
     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/AbstractCopyTask.java b/subprojects/core/src/main/groovy/org/gradle/api/tasks/AbstractCopyTask.java
index cb3630f726ed..327cb9a1ea8f 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/AbstractCopyTask.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/tasks/AbstractCopyTask.java
@@ -19,6 +19,7 @@
 import org.gradle.api.Action;
 import org.gradle.api.file.*;
 import org.gradle.api.internal.ConventionTask;
+import org.gradle.api.internal.file.FileLookup;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.file.copy.*;
 import org.gradle.api.specs.Spec;
@@ -27,6 +28,7 @@
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.util.DeprecationLogger;
 
+import javax.inject.Inject;
 import java.io.FilterReader;
 import java.util.Map;
 import java.util.Set;
@@ -46,19 +48,39 @@ protected AbstractCopyTask() {
     }
 
     protected CopySpecInternal createRootSpec() {
-        Instantiator instantiator = getServices().get(Instantiator.class);
-        FileResolver fileResolver = getServices().get(FileResolver.class);
+        Instantiator instantiator = getInstantiator();
+        FileResolver fileResolver = getFileResolver();
         return instantiator.newInstance(DefaultCopySpec.class, fileResolver, instantiator);
     }
 
     protected abstract CopyAction createCopyAction();
 
+    @Inject
+    protected Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected FileSystem getFileSystem() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected FileResolver getFileResolver() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected FileLookup getFileLookup() {
+        throw new UnsupportedOperationException();
+    }
+
     @TaskAction
     protected void copy() {
         configureRootSpec();
 
-        Instantiator instantiator = getServices().get(Instantiator.class);
-        FileSystem fileSystem = getServices().get(FileSystem.class);
+        Instantiator instantiator = getInstantiator();
+        FileSystem fileSystem = getFileSystem();
 
         CopyActionExecuter copyActionExecuter = new CopyActionExecuter(instantiator, fileSystem);
         CopyAction copyAction = createCopyAction();
@@ -92,7 +114,7 @@ public FileCollection getDefaultSource() {
     @InputFiles @SkipWhenEmpty @Optional
     public FileCollection getSource() {
         if (rootSpec.hasSource()){
-            return rootSpec.getAllSource();
+            return rootSpec.buildRootResolver().getAllSource();
         }else{
             return DeprecationLogger.whileDisabled(new Factory<FileCollection>() {
                 public FileCollection create() {
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/Copy.java b/subprojects/core/src/main/groovy/org/gradle/api/tasks/Copy.java
index 053be4d2854d..9a3f5f727adb 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/Copy.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/tasks/Copy.java
@@ -17,7 +17,6 @@
 package org.gradle.api.tasks;
 
 import org.gradle.api.InvalidUserDataException;
-import org.gradle.api.internal.file.FileLookup;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.file.copy.CopyAction;
 import org.gradle.api.internal.file.copy.CopySpecInternal;
@@ -68,13 +67,13 @@ protected CopyAction createCopyAction() {
         if (destinationDir == null) {
             throw new InvalidUserDataException("No copy destination directory has been specified, use 'into' to specify a target directory.");
         }
-        return new FileCopyAction(getServices().get(FileLookup.class).getFileResolver(destinationDir));
+        return new FileCopyAction(getFileLookup().getFileResolver(destinationDir));
     }
 
     @Override
     protected CopySpecInternal createRootSpec() {
-        Instantiator instantiator = getServices().get(Instantiator.class);
-        FileResolver fileResolver = getServices().get(FileResolver.class);
+        Instantiator instantiator = getInstantiator();
+        FileResolver fileResolver = getFileResolver();
 
         return instantiator.newInstance(DestinationRootCopySpec.class, fileResolver, super.createRootSpec());
     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/Directory.groovy b/subprojects/core/src/main/groovy/org/gradle/api/tasks/Directory.groovy
deleted file mode 100644
index b965f1935f1b..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/Directory.groovy
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * 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.
- */
- 
-package org.gradle.api.tasks
-
-import org.gradle.api.DefaultTask
-import org.gradle.api.InvalidUserDataException
-import org.gradle.util.DeprecationLogger
-import org.gradle.util.GFileUtils
-
-/**
- * Creates a directory.
- * @deprecated Use {@link org.gradle.api.Project#mkdir(java.lang.Object)} to create directories in Gradle.
- */
-@Deprecated
-public class Directory extends DefaultTask {
-    File dir
-    
-    Directory() {
-        DeprecationLogger.nagUserOfReplacedTaskType("Directory", "Project.mkdir(java.lang.Object) method");
-        if (new File(name).isAbsolute()) { throw new InvalidUserDataException('Path must not be absolute.')}
-        dir = project.file(name)
-    }
-
-    @TaskAction
-    protected void mkdir() {
-        GFileUtils.mkdirs(dir)
-    }
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/Exec.java b/subprojects/core/src/main/groovy/org/gradle/api/tasks/Exec.java
index 22f0603a02c5..835b8d5432e3 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/Exec.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/tasks/Exec.java
@@ -22,6 +22,7 @@
 import org.gradle.process.internal.ExecAction;
 import org.gradle.process.internal.ExecActionFactory;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -55,7 +56,12 @@ public class Exec extends ConventionTask implements ExecSpec {
     private ExecResult execResult;
 
     public Exec() {
-        execAction = getServices().get(ExecActionFactory.class).newExecAction();
+        execAction = getExecActionFactory().newExecAction();
+    }
+
+    @Inject
+    protected ExecActionFactory getExecActionFactory() {
+        throw new UnsupportedOperationException();
     }
 
     @TaskAction
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/GradleBuild.java b/subprojects/core/src/main/groovy/org/gradle/api/tasks/GradleBuild.java
index 06fc04c2cbb6..7cf37a98f687 100755
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/GradleBuild.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/tasks/GradleBuild.java
@@ -15,11 +15,11 @@
  */
 package org.gradle.api.tasks;
 
+import org.gradle.initialization.GradleLauncher;
 import org.gradle.StartParameter;
 import org.gradle.api.internal.ConventionTask;
 import org.gradle.initialization.GradleLauncherFactory;
 
-import javax.inject.Inject;
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
@@ -31,10 +31,9 @@ public class GradleBuild extends ConventionTask {
     private final GradleLauncherFactory gradleLauncherFactory;
     private StartParameter startParameter;
 
-    @Inject
-    public GradleBuild(StartParameter currentBuild, GradleLauncherFactory gradleLauncherFactory) {
-        this.gradleLauncherFactory = gradleLauncherFactory;
-        this.startParameter = currentBuild.newBuild();
+    public GradleBuild() {
+        this.gradleLauncherFactory = getServices().get(GradleLauncherFactory.class);
+        this.startParameter = getServices().get(StartParameter.class).newBuild();
         startParameter.setCurrentDir(getProject().getProjectDir());
     }
 
@@ -113,6 +112,11 @@ public void setTasks(Collection<String> tasks) {
 
     @TaskAction
     void build() {
-        gradleLauncherFactory.newInstance(getStartParameter()).run().rethrowFailure();
+        GradleLauncher launcher = gradleLauncherFactory.newInstance(getStartParameter());
+        try {
+            launcher.run().rethrowFailure();
+        } finally {
+            launcher.stop();
+        }
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/JavaExec.java b/subprojects/core/src/main/groovy/org/gradle/api/tasks/JavaExec.java
index 5b180e1064a5..c0f4db49dc8f 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/JavaExec.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/tasks/JavaExec.java
@@ -26,6 +26,7 @@
 import org.gradle.process.internal.DefaultJavaExecAction;
 import org.gradle.process.internal.JavaExecAction;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -44,8 +45,12 @@ public class JavaExec extends ConventionTask implements JavaExecSpec {
     private JavaExecAction javaExecHandleBuilder;
 
     public JavaExec() {
-        FileResolver fileResolver = getServices().get(FileResolver.class);
-        javaExecHandleBuilder = new DefaultJavaExecAction(fileResolver);
+        javaExecHandleBuilder = new DefaultJavaExecAction(getFileResolver());
+    }
+
+    @Inject
+    protected FileResolver getFileResolver() {
+        throw new UnsupportedOperationException();
     }
 
     @TaskAction
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/Sync.java b/subprojects/core/src/main/groovy/org/gradle/api/tasks/Sync.java
index 42974df3c9d2..33d7c5e1762e 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/Sync.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/tasks/Sync.java
@@ -17,7 +17,6 @@
 package org.gradle.api.tasks;
 
 import org.gradle.api.InvalidUserDataException;
-import org.gradle.api.internal.file.FileLookup;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.file.copy.*;
 import org.gradle.internal.reflect.Instantiator;
@@ -35,13 +34,13 @@ protected CopyAction createCopyAction() {
         if (destinationDir == null) {
             throw new InvalidUserDataException("No copy destination directory has been specified, use 'into' to specify a target directory.");
         }
-        return new SyncCopyActionDecorator(destinationDir, new FileCopyAction(getServices().get(FileLookup.class).getFileResolver(destinationDir)));
+        return new SyncCopyActionDecorator(destinationDir, new FileCopyAction(getFileLookup().getFileResolver(destinationDir)));
     }
 
     @Override
     protected CopySpecInternal createRootSpec() {
-        Instantiator instantiator = getServices().get(Instantiator.class);
-        FileResolver fileResolver = getServices().get(FileResolver.class);
+        Instantiator instantiator = getInstantiator();
+        FileResolver fileResolver = getFileResolver();
 
         return instantiator.newInstance(DestinationRootCopySpec.class, fileResolver, super.createRootSpec());
     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskContainer.java b/subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskContainer.java
index f7168aab9bdc..b25292b545fc 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskContainer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskContainer.java
@@ -17,6 +17,7 @@
 
 import groovy.lang.Closure;
 import org.gradle.api.*;
+import org.gradle.internal.HasInternalProtocol;
 
 import java.util.Map;
 
@@ -26,6 +27,7 @@
  * <p>You can obtain a {@code TaskContainer} instance by calling {@link org.gradle.api.Project#getTasks()}, or using the
  * {@code tasks} property in your build script.</p>
  */
+@HasInternalProtocol
 public interface TaskContainer extends TaskCollection<Task>, PolymorphicDomainObjectContainer<Task> {
     /**
      * <p>Locates a task by path. You can supply a task name, a relative path, or an absolute path. Relative paths are
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskState.java b/subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskState.java
index d9e086ee138e..64b160a2d897 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskState.java
+++ b/subprojects/core/src/main/groovy/org/gradle/api/tasks/TaskState.java
@@ -45,7 +45,7 @@ public interface TaskState {
 
     /**
      * <p>Checks if the task actually did any work.  Even if a task executes, it may determine that it has nothing to
-     * do.  For example, the Compile task may determine that source files have not changed since the last time a the
+     * do.  For example, a compilation task may determine that source files have not changed since the last time a the
      * task was run.</p>
      *
      * @return true if this task has been executed and did any work.
diff --git a/subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultCacheAccess.java b/subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultCacheAccess.java
index b03633a30650..fd9b306d0aa4 100644
--- a/subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultCacheAccess.java
+++ b/subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultCacheAccess.java
@@ -40,7 +40,7 @@
 import static org.gradle.cache.internal.FileLockManager.LockMode.Shared;
 
 @ThreadSafe
-public class DefaultCacheAccess implements CacheCoordinator {
+public class    DefaultCacheAccess implements CacheCoordinator {
 
     private final static Logger LOG = Logging.getLogger(DefaultCacheAccess.class);
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultFileLockManager.java b/subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultFileLockManager.java
index a5991e68cfca..9ed6c2fefafe 100644
--- a/subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultFileLockManager.java
+++ b/subprojects/core/src/main/groovy/org/gradle/cache/internal/DefaultFileLockManager.java
@@ -322,8 +322,7 @@ private java.nio.channels.FileLock lockStateRegion(LockMode lockMode, final long
                         LOGGER.debug("The file lock is held by a different Gradle process. I was unable to read on which port the owner listens for lock access requests.");
                     }
                 }
-                //TODO SF it would really nice to print some message to the user after say 2 seconds of waiting
-                //saying what gradle is doing, and why we're waiting.
+                //TODO SF we should inform on the progress/status bar that we're waiting
                 Thread.sleep(200L);
             } while (System.currentTimeMillis() < waitUntil);
             return null;
diff --git a/subprojects/core/src/main/groovy/org/gradle/configuration/DefaultInitScriptProcessor.java b/subprojects/core/src/main/groovy/org/gradle/configuration/DefaultInitScriptProcessor.java
index 88bd93526b9f..eee3db0361c0 100644
--- a/subprojects/core/src/main/groovy/org/gradle/configuration/DefaultInitScriptProcessor.java
+++ b/subprojects/core/src/main/groovy/org/gradle/configuration/DefaultInitScriptProcessor.java
@@ -36,9 +36,10 @@ public DefaultInitScriptProcessor(ScriptPluginFactory configurerFactory, ScriptH
     }
 
     public void process(final ScriptSource initScript, GradleInternal gradle) {
-        ClassLoaderScope classLoaderScope = gradle.getClassLoaderScope().createSibling();
-        ScriptHandler scriptHandler = scriptHandlerFactory.create(initScript, classLoaderScope);
-        ScriptPlugin configurer = configurerFactory.create(initScript, scriptHandler, classLoaderScope, "initscript", InitScript.class);
+        ClassLoaderScope baseScope = gradle.getClassLoaderScope();
+        ClassLoaderScope scriptScope = baseScope.createSibling();
+        ScriptHandler scriptHandler = scriptHandlerFactory.create(initScript, scriptScope);
+        ScriptPlugin configurer = configurerFactory.create(initScript, scriptHandler, scriptScope, baseScope, "initscript", InitScript.class, false);
         configurer.apply(gradle);
     }
 }
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/configuration/DefaultScriptPluginFactory.java b/subprojects/core/src/main/groovy/org/gradle/configuration/DefaultScriptPluginFactory.java
index 6fe42acacc4e..234dc60ad74e 100755
--- a/subprojects/core/src/main/groovy/org/gradle/configuration/DefaultScriptPluginFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/configuration/DefaultScriptPluginFactory.java
@@ -16,11 +16,14 @@
 
 package org.gradle.configuration;
 
+import com.google.common.collect.ListMultimap;
+import org.gradle.api.Transformer;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.initialization.dsl.ScriptHandler;
 import org.gradle.api.internal.file.FileLookup;
 import org.gradle.api.internal.initialization.ClassLoaderScope;
 import org.gradle.api.internal.initialization.ScriptHandlerFactory;
+import org.gradle.api.internal.project.ProjectScript;
 import org.gradle.api.plugins.PluginAware;
 import org.gradle.groovy.scripts.*;
 import org.gradle.groovy.scripts.internal.BuildScriptTransformer;
@@ -29,26 +32,28 @@
 import org.gradle.internal.Factory;
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.classpath.DefaultClassPath;
+import org.gradle.internal.exceptions.LocationAwareException;
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.internal.service.DefaultServiceRegistry;
 import org.gradle.logging.LoggingManagerInternal;
-import org.gradle.plugin.PluginHandler;
-import org.gradle.plugin.internal.*;
-import org.gradle.plugin.resolve.internal.PluginRequest;
-import org.gradle.plugin.resolve.internal.PluginResolver;
+import org.gradle.plugin.internal.PluginId;
+import org.gradle.plugin.use.internal.*;
+import org.gradle.util.CollectionUtils;
 
 import java.io.File;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 
 public class DefaultScriptPluginFactory implements ScriptPluginFactory {
+
+    public static final PluginId NOOP_PLUGIN_ID = PluginId.of("noop");
+
     private final ScriptCompilerFactory scriptCompilerFactory;
     private final ImportsReader importsReader;
     private final Factory<LoggingManagerInternal> loggingManagerFactory;
     private final Instantiator instantiator;
     private final ScriptHandlerFactory scriptHandlerFactory;
-    private final PluginResolverFactory pluginResolverFactory;
+    private final PluginRequestApplicatorFactory pluginRequestApplicatorFactory;
     private final FileLookup fileLookup;
 
     public DefaultScriptPluginFactory(ScriptCompilerFactory scriptCompilerFactory,
@@ -56,34 +61,38 @@ public DefaultScriptPluginFactory(ScriptCompilerFactory scriptCompilerFactory,
                                       Factory<LoggingManagerInternal> loggingManagerFactory,
                                       Instantiator instantiator,
                                       ScriptHandlerFactory scriptHandlerFactory,
-                                      PluginResolverFactory pluginResolverFactory,
+                                      PluginRequestApplicatorFactory pluginRequestApplicatorFactory,
                                       FileLookup fileLookup) {
         this.scriptCompilerFactory = scriptCompilerFactory;
         this.importsReader = importsReader;
         this.loggingManagerFactory = loggingManagerFactory;
         this.instantiator = instantiator;
         this.scriptHandlerFactory = scriptHandlerFactory;
-        this.pluginResolverFactory = pluginResolverFactory;
+        this.pluginRequestApplicatorFactory = pluginRequestApplicatorFactory;
         this.fileLookup = fileLookup;
     }
 
-    public ScriptPlugin create(ScriptSource scriptSource, ScriptHandler scriptHandler, ClassLoaderScope classLoaderScope, String classpathClosureName, Class<? extends BasicScript> scriptClass) {
-        return new ScriptPluginImpl(scriptSource, scriptHandler, classLoaderScope, classpathClosureName, scriptClass);
+    public ScriptPlugin create(ScriptSource scriptSource, ScriptHandler scriptHandler, ClassLoaderScope targetScope, ClassLoaderScope baseScope, String classpathClosureName, Class<? extends BasicScript> scriptClass, boolean ownerScript) {
+        return new ScriptPluginImpl(scriptSource, scriptHandler, targetScope, baseScope, classpathClosureName, scriptClass, ownerScript);
     }
 
     private class ScriptPluginImpl implements ScriptPlugin {
         private final ScriptSource scriptSource;
-        private final ClassLoaderScope classLoaderScope;
+        private final ClassLoaderScope targetScope;
+        private final ClassLoaderScope baseScope;
         private final String classpathClosureName;
         private final Class<? extends BasicScript> scriptType;
         private final ScriptHandler scriptHandler;
+        private final boolean ownerScript;
 
-        public ScriptPluginImpl(ScriptSource scriptSource, ScriptHandler scriptHandler, ClassLoaderScope classLoaderScope, String classpathClosureName, Class<? extends BasicScript> scriptType) {
+        public ScriptPluginImpl(ScriptSource scriptSource, ScriptHandler scriptHandler, ClassLoaderScope targetScope, ClassLoaderScope baseScope, String classpathClosureName, Class<? extends BasicScript> scriptType, boolean ownerScript) {
             this.scriptSource = scriptSource;
-            this.classLoaderScope = classLoaderScope;
+            this.targetScope = targetScope;
+            this.baseScope = baseScope;
             this.classpathClosureName = classpathClosureName;
             this.scriptHandler = scriptHandler;
             this.scriptType = scriptType;
+            this.ownerScript = ownerScript;
         }
 
 
@@ -95,7 +104,7 @@ public void apply(final Object target) {
             DefaultServiceRegistry services = new DefaultServiceRegistry();
             services.add(ScriptPluginFactory.class, DefaultScriptPluginFactory.this);
             services.add(ScriptHandlerFactory.class, scriptHandlerFactory);
-            services.add(ClassLoaderScope.class, classLoaderScope);
+            services.add(ClassLoaderScope.class, targetScope);
             services.add(LoggingManagerInternal.class, loggingManagerFactory.create());
             services.add(Instantiator.class, instantiator);
             services.add(ScriptHandler.class, scriptHandler);
@@ -103,17 +112,16 @@ public void apply(final Object target) {
 
             ScriptSource withImports = importsReader.withImports(scriptSource);
 
-            List<PluginRequest> pluginRequests = new LinkedList<PluginRequest>();
-            if (target instanceof PluginAware) {
-                services.add(PluginHandler.class, new DefaultPluginHandler(pluginRequests));
-            } else {
-                services.add(PluginHandler.class, new NonPluggableTargetPluginHandler(target));
-            }
+            PluginDependenciesService pluginDependenciesService = new PluginDependenciesService(getSource());
+            services.add(PluginDependenciesService.class, pluginDependenciesService);
 
             ScriptCompiler compiler = scriptCompilerFactory.createCompiler(withImports);
-            compiler.setClassloader(classLoaderScope.getBase().getChildClassLoader());
+            compiler.setClassloader(baseScope.getExportClassLoader());
+
+            boolean supportsPluginsBlock = ProjectScript.class.isAssignableFrom(scriptType);
+            String onPluginBlockError = supportsPluginsBlock ? null : "Only Project build scripts can contain plugins {} blocks";
 
-            PluginsAndBuildscriptTransformer scriptBlockTransformer = new PluginsAndBuildscriptTransformer(classpathClosureName);
+            PluginsAndBuildscriptTransformer scriptBlockTransformer = new PluginsAndBuildscriptTransformer(classpathClosureName, onPluginBlockError);
 
             StatementExtractingScriptTransformer classpathScriptTransformer = new StatementExtractingScriptTransformer(classpathClosureName, scriptBlockTransformer);
 
@@ -124,29 +132,56 @@ public void apply(final Object target) {
             classPathScriptRunner.run();
 
             Configuration classpathConfiguration = scriptHandler.getConfigurations().getByName(ScriptHandler.CLASSPATH_CONFIGURATION);
-            Set<File> files = classpathConfiguration.getFiles();
-            ClassPath classPath = new DefaultClassPath(files);
 
-            ClassLoader exportedClassLoader = classLoaderScope.export(classPath);
+            Set<File> files = classpathConfiguration.getFiles();
+            if (!files.isEmpty()) {
+                ClassPath classPath = new DefaultClassPath(files);
+                Factory<? extends ClassLoader> loader = targetScope.getParent().loader(classPath);
+                targetScope.export(loader);
+            }
 
+            List<PluginRequest> pluginRequests = pluginDependenciesService.getRequests();
             if (!pluginRequests.isEmpty()) {
-                PluginResolver pluginResolver = pluginResolverFactory.createPluginResolver(exportedClassLoader);
-                @SuppressWarnings("ConstantConditions")
-                PluginResolutionApplicator resolutionApplicator = new PluginResolutionApplicator((PluginAware) target, classLoaderScope);
-                PluginRequestApplicator requestApplicator = new PluginRequestApplicator(pluginResolver, resolutionApplicator);
-                requestApplicator.applyPlugin(pluginRequests);
+
+                ListMultimap<PluginId, PluginRequest> groupedById = CollectionUtils.groupBy(pluginRequests, new Transformer<PluginId, PluginRequest>() {
+                    public PluginId transform(PluginRequest pluginRequest) {
+                        return pluginRequest.getId();
+                    }
+                });
+
+                // Check for duplicates
+                for (PluginId key : groupedById.keySet()) {
+                    // Ignore duplicate noops - noop plugin just used for testing
+                    if (key.equals(NOOP_PLUGIN_ID)) {
+                        continue;
+                    }
+
+                    List<PluginRequest> pluginRequestsForId = groupedById.get(key);
+                    if (pluginRequestsForId.size() > 1) {
+                        PluginRequest first = pluginRequests.get(0);
+                        PluginRequest second = pluginRequests.get(1);
+
+                        InvalidPluginRequestException exception = new InvalidPluginRequestException(second, "Plugin with id '" + key + "' was already requested at line " + first.getLineNumber());
+                        throw new LocationAwareException(exception, second.getScriptSource(), second.getLineNumber());
+                    }
+                }
+
+                PluginRequestApplicator requestApplicator = pluginRequestApplicatorFactory.createRequestApplicator((PluginAware) target);
+                for (PluginRequest pluginRequest : pluginRequests) {
+                    requestApplicator.applyPlugin(pluginRequest);
+                }
             }
 
-            classLoaderScope.lock();
+            targetScope.lock();
 
-            compiler.setClassloader(classLoaderScope.getScopeClassLoader());
+            compiler.setClassloader(targetScope.getLocalClassLoader());
 
             compiler.setTransformer(new BuildScriptTransformer("no_" + classpathScriptTransformer.getId(), classpathScriptTransformer.invert()));
             ScriptRunner<? extends BasicScript> runner = compiler.compile(scriptType);
 
             BasicScript script = runner.getScript();
             script.init(target, services);
-            if (target instanceof ScriptAware) {
+            if (ownerScript && target instanceof ScriptAware) {
                 ((ScriptAware) target).setScript(script);
             }
             runner.run();
diff --git a/subprojects/core/src/main/groovy/org/gradle/configuration/ImportsScriptSource.java b/subprojects/core/src/main/groovy/org/gradle/configuration/ImportsScriptSource.java
index b5a1f1e401a3..53b3fa2a3131 100644
--- a/subprojects/core/src/main/groovy/org/gradle/configuration/ImportsScriptSource.java
+++ b/subprojects/core/src/main/groovy/org/gradle/configuration/ImportsScriptSource.java
@@ -15,8 +15,8 @@
  */
 package org.gradle.configuration;
 
-import org.gradle.api.internal.resource.DelegatingResource;
-import org.gradle.api.internal.resource.Resource;
+import org.gradle.internal.resource.DelegatingResource;
+import org.gradle.internal.resource.Resource;
 import org.gradle.groovy.scripts.DelegatingScriptSource;
 import org.gradle.groovy.scripts.ScriptSource;
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/configuration/ScriptPluginFactory.java b/subprojects/core/src/main/groovy/org/gradle/configuration/ScriptPluginFactory.java
index febb16969a17..6897068fd0fe 100755
--- a/subprojects/core/src/main/groovy/org/gradle/configuration/ScriptPluginFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/configuration/ScriptPluginFactory.java
@@ -21,5 +21,5 @@
 import org.gradle.groovy.scripts.ScriptSource;
 
 public interface ScriptPluginFactory {
-    ScriptPlugin create(ScriptSource scriptSource, ScriptHandler scriptHandler, ClassLoaderScope classLoaderScope, String classpathClosureName, Class<? extends BasicScript> scriptClass);
+    ScriptPlugin create(ScriptSource scriptSource, ScriptHandler scriptHandler, ClassLoaderScope targetScope, ClassLoaderScope baseScope, String classpathClosureName, Class<? extends BasicScript> scriptClass, boolean canonicalScript);
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/configuration/project/BuildScriptProcessor.java b/subprojects/core/src/main/groovy/org/gradle/configuration/project/BuildScriptProcessor.java
index d6ab218c07d9..5e6244d6ff11 100644
--- a/subprojects/core/src/main/groovy/org/gradle/configuration/project/BuildScriptProcessor.java
+++ b/subprojects/core/src/main/groovy/org/gradle/configuration/project/BuildScriptProcessor.java
@@ -35,8 +35,7 @@ public void execute(ProjectInternal project) {
         LOGGER.info(String.format("Evaluating %s using %s.", project, project.getBuildScriptSource().getDisplayName()));
         Clock clock = new Clock();
         try {
-            ScriptPlugin configurer = configurerFactory.create(project.getBuildScriptSource(), project.getBuildscript(), project.getClassLoaderScope(), "buildscript", ProjectScript.class);
-
+            ScriptPlugin configurer = configurerFactory.create(project.getBuildScriptSource(), project.getBuildscript(), project.getClassLoaderScope(), project.getBaseClassLoaderScope(), "buildscript", ProjectScript.class, true);
             configurer.apply(project);
         } finally {
             LOGGER.debug("Timing: Running the build script took " + clock.getTime());
diff --git a/subprojects/core/src/main/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolver.java b/subprojects/core/src/main/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolver.java
deleted file mode 100644
index 688b6985dc49..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolver.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.configuration.project;
-
-import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.internal.project.ProjectInternal;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ProjectDependencies2TaskResolver implements ProjectConfigureAction {
-    private static Logger logger = LoggerFactory.getLogger(ProjectDependencies2TaskResolver.class);
-
-    public void execute(ProjectInternal project) {
-        for (Project dependsOnProject : project.getDependsOnProjects()) {
-            logger.debug("Checking task dependencies for project: {} dependsOn: {}", project, dependsOnProject);
-            for (Task task : project.getTasks()) {
-                String taskName = task.getName();
-                Task dependentTask = dependsOnProject.getTasks().findByName(taskName);
-                if (dependentTask != null) {
-                    logger.debug("Setting task dependencies for task: {}", taskName);
-                    task.dependsOn(dependentTask);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/execution/DefaultTasksBuildExecutionAction.java b/subprojects/core/src/main/groovy/org/gradle/execution/DefaultTasksBuildExecutionAction.java
index 6d8f614b5bb8..85a0407d337f 100644
--- a/subprojects/core/src/main/groovy/org/gradle/execution/DefaultTasksBuildExecutionAction.java
+++ b/subprojects/core/src/main/groovy/org/gradle/execution/DefaultTasksBuildExecutionAction.java
@@ -34,7 +34,7 @@ public class DefaultTasksBuildExecutionAction implements BuildConfigurationActio
     public void configure(BuildExecutionContext context) {
         StartParameter startParameter = context.getGradle().getStartParameter();
 
-        if (!startParameter.getTaskNames().isEmpty()) {
+        if (!startParameter.getTaskParameters().isEmpty()) {
             context.proceed();
             return;
         }
diff --git a/subprojects/core/src/main/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationAction.java b/subprojects/core/src/main/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationAction.java
index 87263c11c5f8..9b8279004895 100644
--- a/subprojects/core/src/main/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationAction.java
+++ b/subprojects/core/src/main/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationAction.java
@@ -16,6 +16,7 @@
 package org.gradle.execution;
 
 import com.google.common.collect.Multimap;
+import org.gradle.TaskParameter;
 import org.gradle.api.Task;
 import org.gradle.api.internal.GradleInternal;
 import org.gradle.execution.commandline.CommandLineTaskParser;
@@ -41,11 +42,11 @@ public TaskNameResolvingBuildConfigurationAction(CommandLineTaskParser commandLi
 
     public void configure(BuildExecutionContext context) {
         GradleInternal gradle = context.getGradle();
-        List<String> taskNames = gradle.getStartParameter().getTaskNames();
-        Multimap<String, Task> selectedTasks = commandLineTaskParser.parseTasks(taskNames, selector);
+        List<TaskParameter> taskParameters = gradle.getStartParameter().getTaskParameters();
+        Multimap<TaskParameter, Task> selectedTasks = commandLineTaskParser.parseTasks(taskParameters, selector);
 
         TaskGraphExecuter executer = gradle.getTaskGraph();
-        for (String name : selectedTasks.keySet()) {
+        for (TaskParameter name : selectedTasks.keySet()) {
             executer.addTasks(selectedTasks.get(name));
         }
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/execution/TaskSelector.java b/subprojects/core/src/main/groovy/org/gradle/execution/TaskSelector.java
index b781b9732c08..08598ec9d907 100644
--- a/subprojects/core/src/main/groovy/org/gradle/execution/TaskSelector.java
+++ b/subprojects/core/src/main/groovy/org/gradle/execution/TaskSelector.java
@@ -16,6 +16,7 @@
 package org.gradle.execution;
 
 import com.google.common.collect.SetMultimap;
+import org.gradle.TaskParameter;
 import org.gradle.api.Task;
 import org.gradle.api.Transformer;
 import org.gradle.api.internal.GradleInternal;
@@ -44,8 +45,17 @@ public TaskSelector(GradleInternal gradle, TaskNameResolver taskNameResolver) {
     }
 
     public TaskSelection getSelection(String path) {
+        return getSelection(path, gradle.getDefaultProject());
+    }
+    public TaskSelection getSelection(TaskParameter taskParameter) {
+        ProjectInternal project = taskParameter.getProjectPath() != null
+                ? gradle.getRootProject().findProject(taskParameter.getProjectPath())
+                : gradle.getDefaultProject();
+        return getSelection(taskParameter.getTaskName(), project);
+    }
+
+    private TaskSelection getSelection(String path, ProjectInternal project) {
         SetMultimap<String, TaskSelectionResult> tasksByName;
-        ProjectInternal project = gradle.getDefaultProject();
         ResolvedTaskPath taskPath = taskPathResolver.resolvePath(path, project);
 
         if (taskPath.isQualified()) {
diff --git a/subprojects/core/src/main/groovy/org/gradle/execution/commandline/CommandLineTaskConfigurer.java b/subprojects/core/src/main/groovy/org/gradle/execution/commandline/CommandLineTaskConfigurer.java
index 18da44c86370..4e630c559f7d 100644
--- a/subprojects/core/src/main/groovy/org/gradle/execution/commandline/CommandLineTaskConfigurer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/execution/commandline/CommandLineTaskConfigurer.java
@@ -16,6 +16,10 @@
 
 package org.gradle.execution.commandline;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import org.gradle.TaskParameter;
 import org.gradle.api.Task;
 import org.gradle.api.internal.tasks.options.OptionDescriptor;
 import org.gradle.api.internal.tasks.options.OptionReader;
@@ -23,6 +27,7 @@
 import org.gradle.cli.CommandLineParser;
 import org.gradle.cli.ParsedCommandLine;
 import org.gradle.cli.ParsedCommandLineOption;
+import org.gradle.internal.DefaultTaskParameter;
 import org.gradle.internal.typeconversion.TypeConversionException;
 
 import java.util.Collection;
@@ -36,7 +41,7 @@ public CommandLineTaskConfigurer(OptionReader optionReader) {
         this.optionReader = optionReader;
     }
 
-    public List<String> configureTasks(Collection<Task> tasks, List<String> arguments) {
+    public List<TaskParameter> configureTasks(Collection<Task> tasks, List<TaskParameter> arguments) {
         assert !tasks.isEmpty();
         if (arguments.isEmpty()) {
             return arguments;
@@ -44,8 +49,21 @@ public List<String> configureTasks(Collection<Task> tasks, List<String> argument
         return configureTasksNow(tasks, arguments);
     }
 
-    private List<String> configureTasksNow(Collection<Task> tasks, List<String> arguments) {
+    private List<TaskParameter> configureTasksNow(Collection<Task> tasks, List<TaskParameter> arguments) {
         List<String> remainingArguments = null;
+        List<String> argumentsOrParameters = Lists.newArrayList();
+        List<TaskParameter> parameters = Lists.newArrayList();
+        boolean notArgument = false;
+        for (TaskParameter parameter : arguments) {
+            if (parameter.getProjectPath() != null) {
+                notArgument = true;
+            }
+            if (notArgument) {
+                parameters.add(parameter);
+            } else {
+                argumentsOrParameters.add(parameter.getTaskName());
+            }
+        }
         for (Task task : tasks) {
             CommandLineParser parser = new CommandLineParser();
             final List<OptionDescriptor> commandLineOptions = optionReader.getOptions(task);
@@ -58,7 +76,7 @@ private List<String> configureTasksNow(Collection<Task> tasks, List<String> argu
 
             ParsedCommandLine parsed;
             try {
-                parsed = parser.parse(arguments);
+                parsed = parser.parse(argumentsOrParameters);
             } catch (CommandLineArgumentException e) {
                 //we expect that all options must be applicable for each task
                 throw new TaskConfigurationException(task.getPath(), "Problem configuring task " + task.getPath() + " from command line.", e);
@@ -80,6 +98,14 @@ private List<String> configureTasksNow(Collection<Task> tasks, List<String> argu
                     : "we expect all options to be consumed by each task so remainingArguments should be the same for each task";
             remainingArguments = parsed.getExtraArguments();
         }
-        return remainingArguments;
+        return Lists.newArrayList(Iterables.concat(
+                Iterables.transform(
+                        remainingArguments,
+                        new Function<String, TaskParameter>() {
+                            public TaskParameter apply(String input) {
+                                return new DefaultTaskParameter(input);
+                            }
+                        }),
+                parameters));
     }
 }
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/execution/commandline/CommandLineTaskParser.java b/subprojects/core/src/main/groovy/org/gradle/execution/commandline/CommandLineTaskParser.java
index 305658c0f87b..90880bee3da6 100644
--- a/subprojects/core/src/main/groovy/org/gradle/execution/commandline/CommandLineTaskParser.java
+++ b/subprojects/core/src/main/groovy/org/gradle/execution/commandline/CommandLineTaskParser.java
@@ -19,6 +19,7 @@
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.SetMultimap;
+import org.gradle.TaskParameter;
 import org.gradle.api.Task;
 import org.gradle.execution.TaskSelector;
 
@@ -33,16 +34,16 @@ public CommandLineTaskParser(CommandLineTaskConfigurer commandLineTaskConfigurer
         this.taskConfigurer = commandLineTaskConfigurer;
     }
 
-    public Multimap<String, Task> parseTasks(List<String> taskPaths, TaskSelector taskSelector) {
-        SetMultimap<String, Task> out = LinkedHashMultimap.create();
-        List<String> remainingPaths = new LinkedList<String>(taskPaths);
+    public Multimap<TaskParameter, Task> parseTasks(List<TaskParameter> taskParameters, TaskSelector taskSelector) {
+        SetMultimap<TaskParameter, Task> out = LinkedHashMultimap.create();
+        List<TaskParameter> remainingPaths = new LinkedList<TaskParameter>(taskParameters);
         while (!remainingPaths.isEmpty()) {
-            String path = remainingPaths.remove(0);
+            TaskParameter path = remainingPaths.remove(0);
             TaskSelector.TaskSelection selection = taskSelector.getSelection(path);
             Set<Task> tasks = selection.getTasks();
             remainingPaths = taskConfigurer.configureTasks(tasks, remainingPaths);
 
-            out.putAll(selection.getTaskName(), tasks);
+            out.putAll(path, tasks);
         }
         return out;
     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/CachingScriptSource.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/CachingScriptSource.java
index 8ee4c5da1978..5d274ba839ad 100755
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/CachingScriptSource.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/CachingScriptSource.java
@@ -15,8 +15,8 @@
  */
 package org.gradle.groovy.scripts;
 
-import org.gradle.api.internal.resource.CachingResource;
-import org.gradle.api.internal.resource.Resource;
+import org.gradle.internal.resource.CachingResource;
+import org.gradle.internal.resource.Resource;
 
 public class CachingScriptSource extends DelegatingScriptSource {
     private Resource resource;
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DefaultScript.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DefaultScript.java
index 0bbaec6dc573..970ca35b5d56 100755
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DefaultScript.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DefaultScript.java
@@ -81,7 +81,7 @@ public FileResolver getFileResolver() {
     }
 
     private DefaultObjectConfigurationAction createObjectConfigurationAction() {
-        ClassLoaderScope classLoaderScope = __scriptServices.get(ClassLoaderScope.class).createChild();
+        ClassLoaderScope classLoaderScope = __scriptServices.get(ClassLoaderScope.class);
         return new DefaultObjectConfigurationAction(
                 getFileResolver(), __scriptServices.get(ScriptPluginFactory.class), __scriptServices.get(ScriptHandlerFactory.class), classLoaderScope, getScriptTarget()
         );
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DelegatingScriptSource.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DelegatingScriptSource.java
index 47592c95a486..c6a7c7112504 100755
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DelegatingScriptSource.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/DelegatingScriptSource.java
@@ -15,7 +15,7 @@
  */
 package org.gradle.groovy.scripts;
 
-import org.gradle.api.internal.resource.Resource;
+import org.gradle.internal.resource.Resource;
 
 public class DelegatingScriptSource implements ScriptSource {
     private final ScriptSource source;
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/ScriptSource.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/ScriptSource.java
index a975cf4d3aef..101253343f55 100644
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/ScriptSource.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/ScriptSource.java
@@ -15,7 +15,7 @@
  */
 package org.gradle.groovy.scripts;
 
-import org.gradle.api.internal.resource.Resource;
+import org.gradle.internal.resource.Resource;
 
 import java.io.Serializable;
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/StringScriptSource.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/StringScriptSource.java
index ebed4b94d901..dc60637ab411 100644
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/StringScriptSource.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/StringScriptSource.java
@@ -15,8 +15,8 @@
  */
 package org.gradle.groovy.scripts;
 
-import org.gradle.api.internal.resource.Resource;
-import org.gradle.api.internal.resource.StringResource;
+import org.gradle.internal.resource.Resource;
+import org.gradle.internal.resource.StringResource;
 import org.gradle.internal.hash.HashUtil;
 
 public class StringScriptSource implements ScriptSource {
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/UriScriptSource.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/UriScriptSource.java
index 1a4b6b07c06e..5eee8a998ca3 100644
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/UriScriptSource.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/UriScriptSource.java
@@ -16,8 +16,8 @@
 package org.gradle.groovy.scripts;
 
 import org.apache.commons.lang.StringUtils;
-import org.gradle.api.internal.resource.Resource;
-import org.gradle.api.internal.resource.UriResource;
+import org.gradle.internal.resource.UriResource;
+import org.gradle.internal.resource.Resource;
 import org.gradle.internal.hash.HashUtil;
 
 import java.io.File;
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java
index 3b143e6fc361..cbf2a3e21fa7 100644
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandler.java
@@ -89,11 +89,12 @@ protected CompilationUnit createCompilationUnit(CompilerConfiguration compilerCo
                     @Override
                     protected groovyjarjarasm.asm.ClassVisitor createClassVisitor() {
                         return new ClassWriter(ClassWriter.COMPUTE_MAXS) {
-                            // ignore the sourcePath that is given by Groovy (this is only the filename) and instead
-                            // insert the full path if our script source has a source file
                             @Override
-                            public void visitSource(String sourcePath, String debugInfo) {
-                                super.visitSource(source.getFileName(), debugInfo);
+                            public byte[] toByteArray() {
+                                // ignore the sourcePath that is given by Groovy (this is only the filename) and instead
+                                // insert the full path if our script source has a source file
+                                visitSource(source.getFileName(), null);
+                                return super.toByteArray();
                             }
                         };
                     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/PluginsAndBuildscriptTransformer.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/PluginsAndBuildscriptTransformer.java
index 6b6d733fedef..48e860bb127b 100644
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/PluginsAndBuildscriptTransformer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/PluginsAndBuildscriptTransformer.java
@@ -26,19 +26,23 @@
 import org.codehaus.groovy.syntax.SyntaxException;
 import org.gradle.api.specs.Spec;
 import org.gradle.groovy.scripts.DefaultScript;
-import org.gradle.plugin.PluginHandler;
+import org.gradle.plugin.use.internal.PluginDependenciesService;
+import org.gradle.plugin.use.internal.PluginUseScriptBlockTransformer;
 
 public class PluginsAndBuildscriptTransformer implements StatementTransformer {
 
     private static final String PLUGINS = "plugins";
-    private static final ScriptBlockToServiceConfigurationTransformer PLUGIN_BLOCK_TRANSFORMER = new ScriptBlockToServiceConfigurationTransformer(DefaultScript.SCRIPT_SERVICES_PROPERTY, PluginHandler.class);
+    private static final PluginUseScriptBlockTransformer PLUGIN_BLOCK_TRANSFORMER = new PluginUseScriptBlockTransformer(DefaultScript.SCRIPT_SERVICES_PROPERTY, PluginDependenciesService.class);
 
     private final String classpathBlockName;
+    private final String pluginsBlockMessage;
+
     private boolean seenNonClasspathStatement;
     private boolean seenPluginsBlock;
 
-    public PluginsAndBuildscriptTransformer(String classpathBlockName) {
+    public PluginsAndBuildscriptTransformer(String classpathBlockName, String pluginsBlockMessage) {
         this.classpathBlockName = classpathBlockName;
+        this.pluginsBlockMessage = pluginsBlockMessage;
     }
 
     public Statement transform(SourceUnit sourceUnit, Statement statement) {
@@ -48,20 +52,31 @@ public Statement transform(SourceUnit sourceUnit, Statement statement) {
             return null;
         } else {
             if (scriptBlock.getName().equals(PLUGINS)) {
-                seenPluginsBlock = true;
-                if (seenNonClasspathStatement) {
-                    String message = String.format(
-                            "only %s {} and and other %s {} script blocks are allowed before %s {} blocks, no other statements are allowed",
-                            classpathBlockName, PLUGINS, PLUGINS
-                    );
+                String failMessage = null;
+                Statement returnStatement = statement;
+
+                if (pluginsBlockMessage != null) {
+                    failMessage = pluginsBlockMessage;
+                } else {
+                    seenPluginsBlock = true;
+                    if (seenNonClasspathStatement) {
+                        failMessage = String.format(
+                                "only %s {} and other %s {} script blocks are allowed before %s {} blocks, no other statements are allowed",
+                                classpathBlockName, PLUGINS, PLUGINS
+                        );
+                    } else {
+                        returnStatement = PLUGIN_BLOCK_TRANSFORMER.transform(sourceUnit, scriptBlock);
+                    }
+                }
+
+                if (failMessage != null) {
                     sourceUnit.getErrorCollector().addError(
-                            new SyntaxException(message, statement.getLineNumber(), statement.getColumnNumber()),
+                            new SyntaxException(failMessage, statement.getLineNumber(), statement.getColumnNumber()),
                             sourceUnit
                     );
-                    return statement;
-                } else {
-                    return PLUGIN_BLOCK_TRANSFORMER.transform(scriptBlock);
                 }
+
+                return returnStatement;
             } else {
                 if (seenPluginsBlock) {
                     String message = String.format(
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/RestrictiveCodeVisitor.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/RestrictiveCodeVisitor.java
new file mode 100644
index 000000000000..a943b70a565b
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/RestrictiveCodeVisitor.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.groovy.scripts.internal;
+
+import org.codehaus.groovy.ast.ASTNode;
+import org.codehaus.groovy.ast.CodeVisitorSupport;
+import org.codehaus.groovy.ast.expr.*;
+import org.codehaus.groovy.ast.stmt.*;
+import org.codehaus.groovy.classgen.BytecodeExpression;
+import org.codehaus.groovy.control.SourceUnit;
+import org.codehaus.groovy.syntax.SyntaxException;
+
+public class RestrictiveCodeVisitor extends CodeVisitorSupport {
+
+    private final SourceUnit sourceUnit;
+    private final String message;
+
+    public RestrictiveCodeVisitor(SourceUnit sourceUnit, String message) {
+        this.sourceUnit = sourceUnit;
+        this.message = message;
+    }
+
+    protected void restrict(ASTNode astNode) {
+        restrict(astNode, message);
+    }
+
+    protected void restrict(ASTNode astNode, String message) {
+        sourceUnit.getErrorCollector().addError(
+                new SyntaxException(message, astNode.getLineNumber(), astNode.getColumnNumber()),
+                sourceUnit
+        );
+    }
+
+    public void visitBlockStatement(BlockStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitForLoop(ForStatement forLoop) {
+        restrict(forLoop);
+    }
+
+    public void visitWhileLoop(WhileStatement loop) {
+        restrict(loop);
+    }
+
+    public void visitDoWhileLoop(DoWhileStatement loop) {
+        restrict(loop);
+    }
+
+    public void visitIfElse(IfStatement ifElse) {
+        restrict(ifElse);
+    }
+
+    public void visitExpressionStatement(ExpressionStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitReturnStatement(ReturnStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitAssertStatement(AssertStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitTryCatchFinally(TryCatchStatement finally1) {
+        restrict(finally1);
+    }
+
+    public void visitSwitch(SwitchStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitCaseStatement(CaseStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitBreakStatement(BreakStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitContinueStatement(ContinueStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitThrowStatement(ThrowStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitSynchronizedStatement(SynchronizedStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitCatchStatement(CatchStatement statement) {
+        restrict(statement);
+    }
+
+    public void visitMethodCallExpression(MethodCallExpression call) {
+        restrict(call);
+    }
+
+    public void visitStaticMethodCallExpression(StaticMethodCallExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitConstructorCallExpression(ConstructorCallExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitTernaryExpression(TernaryExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitShortTernaryExpression(ElvisOperatorExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitBinaryExpression(BinaryExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitPrefixExpression(PrefixExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitPostfixExpression(PostfixExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitBooleanExpression(BooleanExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitClosureExpression(ClosureExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitTupleExpression(TupleExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitMapExpression(MapExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitMapEntryExpression(MapEntryExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitListExpression(ListExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitRangeExpression(RangeExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitPropertyExpression(PropertyExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitAttributeExpression(AttributeExpression attributeExpression) {
+        restrict(attributeExpression);
+    }
+
+    public void visitFieldExpression(FieldExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitMethodPointerExpression(MethodPointerExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitConstantExpression(ConstantExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitClassExpression(ClassExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitVariableExpression(VariableExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitDeclarationExpression(DeclarationExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitGStringExpression(GStringExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitArrayExpression(ArrayExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitSpreadExpression(SpreadExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitSpreadMapExpression(SpreadMapExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitNotExpression(NotExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitUnaryMinusExpression(UnaryMinusExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitUnaryPlusExpression(UnaryPlusExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitBitwiseNegationExpression(BitwiseNegationExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitCastExpression(CastExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitArgumentlistExpression(ArgumentListExpression expression) {
+        restrict(expression);
+    }
+
+    public void visitClosureListExpression(ClosureListExpression closureListExpression) {
+        restrict(closureListExpression);
+    }
+
+    public void visitBytecodeExpression(BytecodeExpression expression) {
+        restrict(expression);
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlock.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlock.java
index 3ac1f4d4a35c..e48079686a87 100644
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlock.java
+++ b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlock.java
@@ -18,20 +18,20 @@
 
 import org.codehaus.groovy.ast.expr.ClosureExpression;
 
-class ScriptBlock {
+public class ScriptBlock {
     private final String name;
     private final ClosureExpression closureExpression;
 
-    ScriptBlock(String name, ClosureExpression closureExpression) {
+    public ScriptBlock(String name, ClosureExpression closureExpression) {
         this.name = name;
         this.closureExpression = closureExpression;
     }
 
-    String getName() {
+    public String getName() {
         return name;
     }
 
-    ClosureExpression getClosureExpression() {
+    public ClosureExpression getClosureExpression() {
         return closureExpression;
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlockToServiceConfigurationTransformer.java b/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlockToServiceConfigurationTransformer.java
deleted file mode 100644
index 9be89ddd333b..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/groovy/scripts/internal/ScriptBlockToServiceConfigurationTransformer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.groovy.scripts.internal;
-
-import org.codehaus.groovy.ast.ClassNode;
-import org.codehaus.groovy.ast.expr.*;
-import org.codehaus.groovy.ast.stmt.ExpressionStatement;
-import org.codehaus.groovy.ast.stmt.Statement;
-import org.gradle.api.Transformer;
-
-public class ScriptBlockToServiceConfigurationTransformer implements Transformer<Statement, ScriptBlock> {
-
-    private final String servicesFieldName;
-    private final Class<?> serviceClass;
-
-    public ScriptBlockToServiceConfigurationTransformer(String servicesFieldName, Class<?> serviceClass) {
-        this.servicesFieldName = servicesFieldName;
-        this.serviceClass = serviceClass;
-    }
-
-    public Statement transform(ScriptBlock scriptBlock) {
-        Expression closureArg = scriptBlock.getClosureExpression();
-
-        PropertyExpression servicesProperty = new PropertyExpression(VariableExpression.THIS_EXPRESSION, servicesFieldName);
-        MethodCallExpression getServiceMethodCall = new MethodCallExpression(servicesProperty, "get",
-                new ArgumentListExpression(
-                        new ClassExpression(new ClassNode(serviceClass))
-                )
-        );
-
-        // Remove access to any surrounding context
-        Expression hydrateMethodCall = new MethodCallExpression(closureArg, "rehydrate", new ArgumentListExpression(
-                ConstantExpression.NULL, getServiceMethodCall, getServiceMethodCall
-        ));
-
-        Expression closureCall = new MethodCallExpression(hydrateMethodCall, "call", ArgumentListExpression.EMPTY_ARGUMENTS);
-
-        return new ExpressionStatement(closureCall);
-    }
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/BaseSettings.java b/subprojects/core/src/main/groovy/org/gradle/initialization/BaseSettings.java
index e62fd90c83df..9b77e7e78c31 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/BaseSettings.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/BaseSettings.java
@@ -214,8 +214,12 @@ protected ScriptHandlerFactory getScriptHandlerFactory() {
         return scriptHandlerFactory;
     }
 
-    @Override
     public ClassLoaderScope getClassLoaderScope() {
         return classLoaderScope;
     }
+
+    @Override
+    protected ClassLoaderScope getBaseClassLoaderScope() {
+        return getClassLoaderScope();
+    }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/BuildCompletionListener.java b/subprojects/core/src/main/groovy/org/gradle/initialization/BuildCompletionListener.java
new file mode 100644
index 000000000000..3d9318085e1a
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/BuildCompletionListener.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.initialization;
+
+public interface BuildCompletionListener {
+    /**
+     * Called after a build has completed and all services and domain objects torn down.
+     */
+    void completed();
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/BuildController.java b/subprojects/core/src/main/groovy/org/gradle/initialization/BuildController.java
index f74f6eaa443f..db7bf7d9ba1c 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/BuildController.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/BuildController.java
@@ -16,30 +16,34 @@
 
 package org.gradle.initialization;
 
-import org.gradle.GradleLauncher;
 import org.gradle.StartParameter;
+import org.gradle.api.internal.GradleInternal;
 
 /**
  * This is intended to eventually replace {@link GradleLauncher} internally. It's pretty rough at the moment.
  */
 public interface BuildController {
     /**
-     * Specifies the start parameter to use to run the build. Cannot be used after the launcher has been created.
+     * Specifies the start parameter to use to run the build. This method cannot be called after any other methods have been called on this controller.
      */
     void setStartParameter(StartParameter startParameter);
 
     /**
-     * Returns the launcher to use to run the build.
+     * @return The {@link org.gradle.api.internal.GradleInternal} object that represents the build invocation.
      */
-    GradleLauncher getLauncher();
+    GradleInternal getGradle();
 
     /**
-     * Runs the build.
+     * Configure the build and schedules and executes tasks specified in the {@link org.gradle.StartParameter} associated with the build.
+     *
+     * @return The {@link org.gradle.api.internal.GradleInternal} object that represents the build invocation.
      */
-    void run();
+    GradleInternal run();
 
     /**
-     * Configures the build but does not run any tasks.
+     * Configures the build but does not schedule or run any tasks.
+     *
+     * @return The {@link org.gradle.api.internal.GradleInternal} object that represents the build invocation.
      */
-    void configure();
+    GradleInternal configure();
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/BuildLayoutParameters.java b/subprojects/core/src/main/groovy/org/gradle/initialization/BuildLayoutParameters.java
index a8d0d811b0b9..7a6a1413e140 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/BuildLayoutParameters.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/BuildLayoutParameters.java
@@ -16,7 +16,6 @@
 
 package org.gradle.initialization;
 
-import org.gradle.StartParameter;
 import org.gradle.internal.SystemProperties;
 
 import java.io.File;
@@ -24,17 +23,19 @@
 import static org.gradle.util.GFileUtils.canonicalise;
 
 public class BuildLayoutParameters {
+    public static final String GRADLE_USER_HOME_PROPERTY_KEY = "gradle.user.home";
+    private static final File DEFAULT_GRADLE_USER_HOME = new File(SystemProperties.getUserHome() + "/.gradle");
 
     private boolean searchUpwards = true;
     private File projectDir = canonicalise(SystemProperties.getCurrentDir());
     private File gradleUserHomeDir;
 
     public BuildLayoutParameters() {
-        String gradleUserHome = System.getProperty(StartParameter.GRADLE_USER_HOME_PROPERTY_KEY);
+        String gradleUserHome = System.getProperty(GRADLE_USER_HOME_PROPERTY_KEY);
         if (gradleUserHome == null) {
             gradleUserHome = System.getenv("GRADLE_USER_HOME");
             if (gradleUserHome == null) {
-                gradleUserHome = StartParameter.DEFAULT_GRADLE_USER_HOME.getAbsolutePath();
+                gradleUserHome = DEFAULT_GRADLE_USER_HOME.getAbsolutePath();
             }
         }
         gradleUserHomeDir = canonicalise(new File(gradleUserHome));
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/ClassLoaderScopeRegistry.java b/subprojects/core/src/main/groovy/org/gradle/initialization/ClassLoaderScopeRegistry.java
new file mode 100644
index 000000000000..694a203975bd
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/ClassLoaderScopeRegistry.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.initialization;
+
+import org.gradle.api.internal.initialization.ClassLoaderScope;
+
+public interface ClassLoaderScopeRegistry {
+
+    ClassLoaderScope getGradleApiScope();
+
+    ClassLoaderScope getCoreImplScope();
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderScopeRegistry.java b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderScopeRegistry.java
new file mode 100644
index 000000000000..3871951ae0a7
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultClassLoaderScopeRegistry.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.initialization;
+
+import com.google.common.cache.CacheBuilder;
+import org.gradle.api.internal.initialization.ClassLoaderCache;
+import org.gradle.api.internal.initialization.ClassLoaderScope;
+import org.gradle.api.internal.initialization.DefaultClassLoaderCache;
+import org.gradle.api.internal.initialization.RootClassLoaderScope;
+
+public class DefaultClassLoaderScopeRegistry implements ClassLoaderScopeRegistry {
+
+    private final ClassLoaderScope gradleApiScope;
+    private final ClassLoaderScope coreImplScope;
+
+    public DefaultClassLoaderScopeRegistry(ClassLoaderRegistry loaderRegistry) {
+        ClassLoaderCache cache = new DefaultClassLoaderCache(CacheBuilder.newBuilder().<DefaultClassLoaderCache.Key, ClassLoader>build());
+        this.coreImplScope = new RootClassLoaderScope(loaderRegistry.getCoreImplClassLoader(), cache);
+        this.gradleApiScope = new RootClassLoaderScope(loaderRegistry.getGradleApiClassLoader(), cache);
+    }
+
+    public ClassLoaderScope getGradleApiScope() {
+        return gradleApiScope;
+    }
+
+    public ClassLoaderScope getCoreImplScope() {
+        return coreImplScope;
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultCommandLineConverter.java b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultCommandLineConverter.java
index 0b2b6665ad8c..5b1f463d4c3e 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultCommandLineConverter.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultCommandLineConverter.java
@@ -19,14 +19,14 @@
 import org.gradle.RefreshOptions;
 import org.gradle.StartParameter;
 import org.gradle.api.InvalidUserDataException;
-import org.gradle.api.internal.file.DefaultFileLookup;
-import org.gradle.api.internal.file.FileLookup;
-import org.gradle.api.internal.file.FileResolver;
+import org.gradle.api.Transformer;
+import org.gradle.api.internal.file.BasicFileResolver;
 import org.gradle.cli.*;
-import org.gradle.internal.nativeplatform.services.FileSystems;
 import org.gradle.logging.LoggingConfiguration;
 import org.gradle.logging.internal.LoggingCommandLineConverter;
 
+import java.io.File;
+import java.util.HashMap;
 import java.util.Map;
 
 import static org.gradle.StartParameter.GRADLE_USER_HOME_PROPERTY_KEY;
@@ -58,11 +58,9 @@ public class DefaultCommandLineConverter extends AbstractCommandLineConverter<St
     private final SystemPropertiesCommandLineConverter systemPropertiesCommandLineConverter = new SystemPropertiesCommandLineConverter();
     private final ProjectPropertiesCommandLineConverter projectPropertiesCommandLineConverter = new ProjectPropertiesCommandLineConverter();
     private final LayoutCommandLineConverter layoutCommandLineConverter;
-    private final FileLookup fileLookup;
 
     public DefaultCommandLineConverter() {
-        this.fileLookup = new DefaultFileLookup(FileSystems.getDefault());
-        layoutCommandLineConverter = new LayoutCommandLineConverter(fileLookup);
+        layoutCommandLineConverter = new LayoutCommandLineConverter();
     }
 
     public void configure(CommandLineParser parser) {
@@ -94,19 +92,14 @@ public void configure(CommandLineParser parser) {
         parser.option(CONFIGURE_ON_DEMAND).hasDescription("Only relevant projects are configured in this build run. This means faster build for large multi-project builds.").incubating();
     }
 
-    @Override
-    protected StartParameter newInstance() {
-        return new StartParameter();
-    }
-
     public StartParameter convert(final ParsedCommandLine options, final StartParameter startParameter) throws CommandLineArgumentException {
         loggingConfigurationCommandLineConverter.convert(options, startParameter);
-        FileResolver resolver = fileLookup.getFileResolver(startParameter.getCurrentDir());
+        Transformer<File, String> resolver = new BasicFileResolver(startParameter.getCurrentDir());
 
-        Map<String, String> systemProperties = systemPropertiesCommandLineConverter.convert(options);
+        Map<String, String> systemProperties = systemPropertiesCommandLineConverter.convert(options, new HashMap<String, String>());
         convertCommandLineSystemProperties(systemProperties, startParameter, resolver);
 
-        Map<String, String> projectProperties = projectPropertiesCommandLineConverter.convert(options);
+        Map<String, String> projectProperties = projectPropertiesCommandLineConverter.convert(options, new HashMap<String, String>());
         startParameter.getProjectProperties().putAll(projectProperties);
 
         BuildLayoutParameters layout = new BuildLayoutParameters()
@@ -118,14 +111,14 @@ public StartParameter convert(final ParsedCommandLine options, final StartParame
         startParameter.setSearchUpwards(layout.getSearchUpwards());
 
         if (options.hasOption(BUILD_FILE)) {
-            startParameter.setBuildFile(resolver.resolve(options.option(BUILD_FILE).getValue()));
+            startParameter.setBuildFile(resolver.transform(options.option(BUILD_FILE).getValue()));
         }
         if (options.hasOption(SETTINGS_FILE)) {
-            startParameter.setSettingsFile(resolver.resolve(options.option(SETTINGS_FILE).getValue()));
+            startParameter.setSettingsFile(resolver.transform(options.option(SETTINGS_FILE).getValue()));
         }
 
         for (String script : options.option(INIT_SCRIPT).getValues()) {
-            startParameter.addInitScript(resolver.resolve(script));
+            startParameter.addInitScript(resolver.transform(script));
         }
 
         if (options.hasOption(CACHE)) {
@@ -137,7 +130,7 @@ public StartParameter convert(final ParsedCommandLine options, final StartParame
         }
 
         if (options.hasOption(PROJECT_CACHE_DIR)) {
-            startParameter.setProjectCacheDir(resolver.resolve(options.option(PROJECT_CACHE_DIR).getValue()));
+            startParameter.setProjectCacheDir(resolver.transform(options.option(PROJECT_CACHE_DIR).getValue()));
         }
 
         if (options.hasOption(NO_PROJECT_DEPENDENCY_REBUILD)) {
@@ -208,10 +201,10 @@ public StartParameter convert(final ParsedCommandLine options, final StartParame
         return startParameter;
     }
 
-    void convertCommandLineSystemProperties(Map<String, String> systemProperties, StartParameter startParameter, FileResolver resolver) {
+    void convertCommandLineSystemProperties(Map<String, String> systemProperties, StartParameter startParameter, Transformer<File, String> resolver) {
         startParameter.getSystemPropertiesArgs().putAll(systemProperties);
         if (systemProperties.containsKey(GRADLE_USER_HOME_PROPERTY_KEY)) {
-            startParameter.setGradleUserHomeDir(resolver.resolve(systemProperties.get(GRADLE_USER_HOME_PROPERTY_KEY)));
+            startParameter.setGradleUserHomeDir(resolver.transform(systemProperties.get(GRADLE_USER_HOME_PROPERTY_KEY)));
         }
     }
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncher.java b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncher.java
index 9f394c7b42bc..e97d68c381a6 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncher.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncher.java
@@ -17,19 +17,20 @@
 
 import org.gradle.BuildListener;
 import org.gradle.BuildResult;
-import org.gradle.GradleLauncher;
-import org.gradle.StartParameter;
 import org.gradle.api.internal.ExceptionAnalyser;
 import org.gradle.api.internal.GradleInternal;
 import org.gradle.api.internal.SettingsInternal;
 import org.gradle.api.logging.StandardOutputListener;
 import org.gradle.configuration.BuildConfigurer;
 import org.gradle.execution.BuildExecuter;
+import org.gradle.internal.concurrent.CompositeStoppable;
 import org.gradle.logging.LoggingManagerInternal;
 
+import java.io.Closeable;
+
 public class DefaultGradleLauncher extends GradleLauncher {
     private enum Stage {
-        Configure, PopulateTaskGraph, Build
+        Configure, Build
     }
 
     private final GradleInternal gradle;
@@ -42,17 +43,18 @@ private enum Stage {
     private final LoggingManagerInternal loggingManager;
     private final ModelConfigurationListener modelConfigurationListener;
     private final TasksCompletionListener tasksCompletionListener;
+    private final BuildCompletionListener buildCompletionListener;
     private final BuildExecuter buildExecuter;
+    private final Closeable buildServices;
 
     /**
-     * Creates a new instance.  Don't call this directly, use {@link #newInstance(org.gradle.StartParameter)} or {@link
-     * #newInstance(String...)} instead.
+     * Creates a new instance.
      */
     public DefaultGradleLauncher(GradleInternal gradle, InitScriptHandler initScriptHandler, SettingsHandler settingsHandler,
                                  BuildLoader buildLoader, BuildConfigurer buildConfigurer, BuildListener buildListener,
                                  ExceptionAnalyser exceptionAnalyser, LoggingManagerInternal loggingManager,
                                  ModelConfigurationListener modelConfigurationListener, TasksCompletionListener tasksCompletionListener,
-                                 BuildExecuter buildExecuter) {
+                                 BuildExecuter buildExecuter, BuildCompletionListener buildCompletionListener, Closeable buildServices) {
         this.gradle = gradle;
         this.initScriptHandler = initScriptHandler;
         this.settingsHandler = settingsHandler;
@@ -64,6 +66,8 @@ public DefaultGradleLauncher(GradleInternal gradle, InitScriptHandler initScript
         this.modelConfigurationListener = modelConfigurationListener;
         this.tasksCompletionListener = tasksCompletionListener;
         this.buildExecuter = buildExecuter;
+        this.buildCompletionListener = buildCompletionListener;
+        this.buildServices = buildServices;
     }
 
     public GradleInternal getGradle() {
@@ -92,18 +96,6 @@ public BuildResult getBuildAnalysis() {
         return doBuild(Stage.Configure);
     }
 
-    /**
-     * Evaluates the settings and all the projects. The information about available tasks and projects is accessible via
-     * the {@link org.gradle.api.invocation.Gradle#getRootProject()} object. Fills the execution plan without running
-     * the build. The tasks to be executed tasks are available via {@link org.gradle.api.invocation.Gradle#getTaskGraph()}.
-     *
-     * @return A BuildResult object. Never returns null.
-     */
-    @Override
-    public BuildResult getBuildAndRunAnalysis() {
-        return doBuild(Stage.PopulateTaskGraph);
-    }
-
     private BuildResult doBuild(Stage upTo) {
         loggingManager.start();
         buildListener.buildStarted(gradle);
@@ -117,12 +109,6 @@ private BuildResult doBuild(Stage upTo) {
         BuildResult buildResult = new BuildResult(gradle, failure);
         buildListener.buildFinished(buildResult);
 
-        // Switching Logging off is important if the Gradle factory is used to
-        // run multiple Gradle builds (each one requiring a new instances of GradleLauncher).
-        // Switching it off shouldn't be strictly necessary as StandardOutput capturing should
-        // always be closed. But as we expose this functionality to the builds, we can't
-        // guarantee this.
-        loggingManager.stop();
         return buildResult;
     }
 
@@ -135,7 +121,7 @@ private void doBuildStages(Stage upTo) {
         buildListener.settingsEvaluated(settings);
 
         // Load build
-        buildLoader.load(settings.getRootProject(), gradle, settings.getClassLoaderScope().createSibling());
+        buildLoader.load(settings.getRootProject(), gradle, settings.getClassLoaderScope().createSibling().lock());
         buildListener.projectsLoaded(gradle);
 
         // Configure build
@@ -158,10 +144,6 @@ private void doBuildStages(Stage upTo) {
             buildListener.projectsEvaluated(gradle);
         }
 
-        if (upTo == Stage.PopulateTaskGraph) {
-            return;
-        }
-
         // Execute build
         buildExecuter.execute();
         tasksCompletionListener.onTasksFinished(gradle);
@@ -169,8 +151,6 @@ private void doBuildStages(Stage upTo) {
         assert upTo == Stage.Build;
     }
 
-    // This is used for mocking
-
     /**
      * <p>Adds a listener to this build instance. The listener is notified of events which occur during the
      * execution of the build. See {@link org.gradle.api.invocation.Gradle#addListener(Object)} for supported listener
@@ -183,16 +163,6 @@ public void addListener(Object listener) {
         gradle.addListener(listener);
     }
 
-    /**
-     * Use the given listener. See {@link org.gradle.api.invocation.Gradle#useLogger(Object)} for details.
-     *
-     * @param logger The logger to use.
-     */
-    @Override
-    public void useLogger(Object logger) {
-        gradle.useLogger(logger);
-    }
-    
     /**
      * <p>Adds a {@link StandardOutputListener} to this build instance. The listener is notified of any text written to
      * standard output by Gradle's logging system
@@ -215,8 +185,12 @@ public void addStandardErrorListener(StandardOutputListener listener) {
         loggingManager.addStandardErrorListener(listener);
     }
 
-    @Override
-    public StartParameter getStartParameter() {
-        return gradle.getStartParameter();
+    public void stop() {
+        try {
+            loggingManager.stop();
+            CompositeStoppable.stoppable(buildServices).stop();
+        } finally {
+            buildCompletionListener.completed();
+        }
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncherFactory.java b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncherFactory.java
index eec61d992f81..42c210d0c09a 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncherFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/DefaultGradleLauncherFactory.java
@@ -16,25 +16,25 @@
 
 package org.gradle.initialization;
 
-import org.gradle.*;
+import org.gradle.BuildLogger;
+import org.gradle.StartParameter;
+import org.gradle.TaskExecutionLogger;
 import org.gradle.api.internal.ExceptionAnalyser;
 import org.gradle.api.internal.GradleInternal;
-import org.gradle.api.internal.initialization.ClassLoaderScope;
-import org.gradle.internal.progress.BuildProgressFilter;
-import org.gradle.internal.progress.BuildProgressLogger;
-import org.gradle.internal.progress.LoggerProvider;
-import org.gradle.internal.service.scopes.BuildScopeServices;
 import org.gradle.api.logging.Logging;
 import org.gradle.api.logging.StandardOutputListener;
 import org.gradle.cache.CacheRepository;
-import org.gradle.cli.CommandLineConverter;
 import org.gradle.configuration.BuildConfigurer;
 import org.gradle.execution.BuildExecuter;
 import org.gradle.initialization.buildsrc.BuildSourceBuilder;
 import org.gradle.initialization.layout.BuildLayoutFactory;
 import org.gradle.internal.featurelifecycle.ScriptUsageLocationReporter;
+import org.gradle.internal.progress.BuildProgressFilter;
+import org.gradle.internal.progress.BuildProgressLogger;
+import org.gradle.internal.progress.LoggerProvider;
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.internal.service.ServiceRegistry;
+import org.gradle.internal.service.scopes.BuildScopeServices;
 import org.gradle.internal.service.scopes.ServiceRegistryFactory;
 import org.gradle.invocation.DefaultGradle;
 import org.gradle.listener.ListenerManager;
@@ -45,13 +45,10 @@
 import org.gradle.profile.ReportGeneratingProfileListener;
 import org.gradle.util.DeprecationLogger;
 
-import java.util.Arrays;
-
 public class DefaultGradleLauncherFactory implements GradleLauncherFactory {
     private final ServiceRegistry sharedServices;
     private final NestedBuildTracker tracker;
     private final BuildProgressLogger buildProgressLogger;
-    private CommandLineConverter<StartParameter> commandLineConverter;
 
     public DefaultGradleLauncherFactory(ServiceRegistry globalServices) {
         sharedServices = globalServices;
@@ -62,8 +59,6 @@ public DefaultGradleLauncherFactory(ServiceRegistry globalServices) {
         buildProgressLogger = new BuildProgressLogger(sharedServices.get(ProgressLoggerFactory.class));
         listenerManager.addListener(new BuildProgressFilter(buildProgressLogger));
         listenerManager.useLogger(new DependencyResolutionLogger(sharedServices.get(ProgressLoggerFactory.class)));
-
-        GradleLauncher.injectCustomFactory(this);
     }
 
     public void addListener(Object listener) {
@@ -74,13 +69,6 @@ public void removeListener(Object listener) {
         sharedServices.get(ListenerManager.class).removeListener(listener);
     }
 
-    public StartParameter createStartParameter(String... commandLineArgs) {
-        if (commandLineConverter == null) {
-            commandLineConverter = sharedServices.get(CommandLineConverter.class);
-        }
-        return commandLineConverter.convert(Arrays.asList(commandLineArgs));
-    }
-
     public DefaultGradleLauncher newInstance(StartParameter startParameter) {
         BuildRequestMetaData requestMetaData;
         if (tracker.getCurrentBuild() != null) {
@@ -109,13 +97,12 @@ private DefaultGradleLauncher doNewInstance(StartParameter startParameter, Build
         loggingManager.addStandardOutputListener(listenerManager.getBroadcaster(StandardOutputListener.class));
         loggingManager.addStandardErrorListener(listenerManager.getBroadcaster(StandardOutputListener.class));
 
-        LoggerProvider loggerProvider = (tracker.getCurrentBuild() == null)? buildProgressLogger: LoggerProvider.NO_OP;
+        LoggerProvider loggerProvider = (tracker.getCurrentBuild() == null) ? buildProgressLogger : LoggerProvider.NO_OP;
         listenerManager.useLogger(new TaskExecutionLogger(serviceRegistry.get(ProgressLoggerFactory.class), loggerProvider));
         if (tracker.getCurrentBuild() == null) {
             listenerManager.useLogger(new BuildLogger(Logging.getLogger(BuildLogger.class), serviceRegistry.get(StyledTextOutputFactory.class), startParameter, requestMetaData));
         }
         listenerManager.addListener(tracker);
-        listenerManager.addListener(new BuildCleanupListener(serviceRegistry));
 
         listenerManager.addListener(serviceRegistry.get(ProfileEventAdapter.class));
         if (startParameter.isProfile()) {
@@ -135,8 +122,9 @@ private DefaultGradleLauncher doNewInstance(StartParameter startParameter, Build
                         serviceRegistry.get(SettingsProcessor.class),
                         new BuildSourceBuilder(
                                 this,
-                                serviceRegistry.get(ClassLoaderScope.class),
-                                serviceRegistry.get(CacheRepository.class))),
+                                serviceRegistry.get(ClassLoaderScopeRegistry.class).getGradleApiScope(),
+                                serviceRegistry.get(CacheRepository.class))
+                ),
                 serviceRegistry.get(BuildLoader.class),
                 serviceRegistry.get(BuildConfigurer.class),
                 gradle.getBuildListenerBroadcaster(),
@@ -144,25 +132,9 @@ private DefaultGradleLauncher doNewInstance(StartParameter startParameter, Build
                 loggingManager,
                 listenerManager.getBroadcaster(ModelConfigurationListener.class),
                 listenerManager.getBroadcaster(TasksCompletionListener.class),
-                gradle.getServices().get(BuildExecuter.class));
-    }
-
-    public void setCommandLineConverter(
-            CommandLineConverter<StartParameter> commandLineConverter) {
-        this.commandLineConverter = commandLineConverter;
+                gradle.getServices().get(BuildExecuter.class),
+                listenerManager.getBroadcaster(BuildCompletionListener.class),
+                serviceRegistry
+        );
     }
-
-    private static class BuildCleanupListener extends BuildAdapter {
-        private final BuildScopeServices services;
-
-        private BuildCleanupListener(BuildScopeServices services) {
-            this.services = services;
-        }
-
-        @Override
-        public void buildFinished(BuildResult result) {
-            services.close();
-        }
-    }
-
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncher.java b/subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncher.java
new file mode 100644
index 000000000000..06f035e158cf
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncher.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.initialization;
+
+import org.gradle.BuildResult;
+import org.gradle.api.logging.StandardOutputListener;
+import org.gradle.internal.concurrent.Stoppable;
+
+/**
+ * This was the old Gradle embedding API (it used to be in the public `org.gradle` package). It is now internal and is due to be merged into
+ * {@link org.gradle.initialization.BuildController}.
+ */
+public abstract class GradleLauncher implements Stoppable {
+
+    /**
+     * <p>Executes the build for this {@code GradleLauncher} instance and returns the result. Note that when the build
+     * fails, the exception is available using {@link org.gradle.BuildResult#getFailure()}.</p>
+     *
+     * @return The result. Never returns null.
+     */
+    public abstract BuildResult run();
+
+    /**
+     * Evaluates the settings and all the projects. The information about available tasks and projects is accessible via
+     * the {@link org.gradle.api.invocation.Gradle#getRootProject()} object.
+     *
+     * @return The result. Never returns null.
+     */
+    public abstract BuildResult getBuildAnalysis();
+
+    /**
+     * <p>Adds a listener to this build instance. The listener is notified of events which occur during the execution of
+     * the build. See {@link org.gradle.api.invocation.Gradle#addListener(Object)} for supported listener types.</p>
+     *
+     * @param listener The listener to add. Has no effect if the listener has already been added.
+     */
+    public abstract void addListener(Object listener);
+
+    /**
+     * <p>Adds a {@link StandardOutputListener} to this build instance. The listener is notified of any text written to
+     * standard output by Gradle's logging system
+     *
+     * @param listener The listener to add. Has no effect if the listener has already been added.
+     */
+    public abstract void addStandardOutputListener(StandardOutputListener listener);
+
+    /**
+     * <p>Adds a {@link StandardOutputListener} to this build instance. The listener is notified of any text written to standard error by Gradle's logging system
+     *
+     * @param listener The listener to add. Has no effect if the listener has already been added.
+     */
+    public abstract void addStandardErrorListener(StandardOutputListener listener);
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncherFactory.java b/subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncherFactory.java
index d749341762be..1c691e3ed5d4 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncherFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/GradleLauncherFactory.java
@@ -15,23 +15,23 @@
  */
 package org.gradle.initialization;
 
-import org.gradle.GradleLauncher;
 import org.gradle.StartParameter;
 
 /**
- * <p>A {@code GradleLauncherFactory} is responsible for creating a {@link org.gradle.GradleLauncher} instance for a build, from a {@link
+ * <p>A {@code GradleLauncherFactory} is responsible for creating a {@link GradleLauncher} instance for a build, from a {@link
  * org.gradle.StartParameter}.</p>
  */
 public interface GradleLauncherFactory {
     /**
-     * Creates a new {@link org.gradle.GradleLauncher} instance for the given parameters.
-     *
-     * @param startParameter The parameters to use for the build.
-     * @return The new instance.
+     * Creates a new {@link GradleLauncher} instance for the given parameters.
+     * Caller must call {@link GradleLauncher#stop()} when finished with the launcher.
      */
     GradleLauncher newInstance(StartParameter startParameter, BuildRequestMetaData requestMetaData);
 
+    /**
+     * Creates a new {@link GradleLauncher} instance for the given parameters.
+     * Caller must call {@link GradleLauncher#stop()} when finished with the launcher.
+     */
     GradleLauncher newInstance(StartParameter startParameter);
 
-    StartParameter createStartParameter(String... commandLineArgs);
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/InstantiatingBuildLoader.java b/subprojects/core/src/main/groovy/org/gradle/initialization/InstantiatingBuildLoader.java
index dd678c1473fe..9726d539f7d7 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/InstantiatingBuildLoader.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/InstantiatingBuildLoader.java
@@ -35,8 +35,8 @@ public InstantiatingBuildLoader(IProjectFactory projectFactory) {
      * Creates the {@link org.gradle.api.internal.GradleInternal} and {@link ProjectInternal} instances for the given root project,
      * ready for the projects to be evaluated.
      */
-    public void load(ProjectDescriptor rootProjectDescriptor, GradleInternal gradle, ClassLoaderScope classLoaderScope) {
-        createProjects(rootProjectDescriptor, gradle, classLoaderScope);
+    public void load(ProjectDescriptor rootProjectDescriptor, GradleInternal gradle, ClassLoaderScope baseClassLoaderScope) {
+        createProjects(rootProjectDescriptor, gradle, baseClassLoaderScope);
         attachDefaultProject(gradle);
     }
 
@@ -50,16 +50,16 @@ private void attachDefaultProject(GradleInternal gradle) {
         }
     }
 
-    private void createProjects(ProjectDescriptor rootProjectDescriptor, GradleInternal gradle, ClassLoaderScope classLoaderScope) {
-        ProjectInternal rootProject = projectFactory.createProject(rootProjectDescriptor, null, gradle, classLoaderScope);
+    private void createProjects(ProjectDescriptor rootProjectDescriptor, GradleInternal gradle, ClassLoaderScope baseClassLoaderScope) {
+        ProjectInternal rootProject = projectFactory.createProject(rootProjectDescriptor, null, gradle, baseClassLoaderScope.createChild(), baseClassLoaderScope);
         gradle.setRootProject(rootProject);
-        addProjects(rootProject, rootProjectDescriptor, gradle);
+        addProjects(rootProject, rootProjectDescriptor, gradle, baseClassLoaderScope);
     }
 
-    private void addProjects(ProjectInternal parent, ProjectDescriptor parentProjectDescriptor, GradleInternal gradle) {
+    private void addProjects(ProjectInternal parent, ProjectDescriptor parentProjectDescriptor, GradleInternal gradle, ClassLoaderScope baseClassLoaderScope) {
         for (ProjectDescriptor childProjectDescriptor : parentProjectDescriptor.getChildren()) {
-            ProjectInternal childProject = projectFactory.createProject(childProjectDescriptor, parent, gradle, parent.getClassLoaderScope().createChild());
-            addProjects(childProject, childProjectDescriptor, gradle);
+            ProjectInternal childProject = projectFactory.createProject(childProjectDescriptor, parent, gradle, parent.getClassLoaderScope().createChild(), baseClassLoaderScope);
+            addProjects(childProject, childProjectDescriptor, gradle, baseClassLoaderScope);
         }
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/LayoutCommandLineConverter.java b/subprojects/core/src/main/groovy/org/gradle/initialization/LayoutCommandLineConverter.java
index 96e34b486cb3..3438b1028401 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/LayoutCommandLineConverter.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/LayoutCommandLineConverter.java
@@ -16,39 +16,31 @@
 
 package org.gradle.initialization;
 
+import org.gradle.api.Transformer;
 import org.gradle.api.initialization.Settings;
-import org.gradle.api.internal.file.FileLookup;
-import org.gradle.api.internal.file.FileResolver;
+import org.gradle.api.internal.file.BasicFileResolver;
 import org.gradle.cli.AbstractCommandLineConverter;
 import org.gradle.cli.CommandLineArgumentException;
 import org.gradle.cli.CommandLineParser;
 import org.gradle.cli.ParsedCommandLine;
 
-public class LayoutCommandLineConverter extends AbstractCommandLineConverter<BuildLayoutParameters> {
+import java.io.File;
 
+public class LayoutCommandLineConverter extends AbstractCommandLineConverter<BuildLayoutParameters> {
     public static final String GRADLE_USER_HOME = "g";
     private static final String NO_SEARCH_UPWARDS = "u";
     private static final String PROJECT_DIR = "p";
-    private final FileLookup fileLookup;
-
-    public LayoutCommandLineConverter(FileLookup fileLookup) {
-        this.fileLookup = fileLookup;
-    }
-
-    protected BuildLayoutParameters newInstance() {
-        return new BuildLayoutParameters();
-    }
 
     public BuildLayoutParameters convert(ParsedCommandLine options, BuildLayoutParameters target) throws CommandLineArgumentException {
-        FileResolver resolver = fileLookup.getFileResolver(target.getProjectDir());
+        Transformer<File, String> resolver = new BasicFileResolver(target.getProjectDir());
         if (options.hasOption(NO_SEARCH_UPWARDS)) {
             target.setSearchUpwards(false);
         }
         if (options.hasOption(PROJECT_DIR)) {
-            target.setProjectDir(resolver.resolve(options.option(PROJECT_DIR).getValue()));
+            target.setProjectDir(resolver.transform(options.option(PROJECT_DIR).getValue()));
         }
         if (options.hasOption(GRADLE_USER_HOME)) {
-            target.setGradleUserHomeDir(resolver.resolve(options.option(GRADLE_USER_HOME).getValue()));
+            target.setGradleUserHomeDir(resolver.transform(options.option(GRADLE_USER_HOME).getValue()));
         }
         return target;
     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/ProjectPathProjectSpec.java b/subprojects/core/src/main/groovy/org/gradle/initialization/ProjectPathProjectSpec.java
deleted file mode 100644
index 4acf37833270..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/ProjectPathProjectSpec.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.initialization;
-
-import com.google.common.base.Strings;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.gradle.api.InvalidUserDataException;
-import org.gradle.api.internal.project.ProjectIdentifier;
-import org.gradle.api.internal.project.ProjectRegistry;
-
-import java.io.Serializable;
-
-public class ProjectPathProjectSpec extends AbstractProjectSpec implements Serializable {
-    private final String projectPath;
-
-    public ProjectPathProjectSpec(String projectPath) {
-        this.projectPath = projectPath;
-    }
-
-    public String getDisplayName() {
-        return String.format("project has path '%s'", projectPath);
-    }
-
-    protected String formatNoMatchesMessage() {
-        return String.format("No projects in this build have path '%s'.", projectPath);
-    }
-
-    protected String formatMultipleMatchesMessage(Iterable<? extends ProjectIdentifier> matches) {
-        return String.format("Multiple projects in this build have path '%s': %s", projectPath, matches);
-    }
-
-    protected boolean select(ProjectIdentifier project) {
-        return projectPath.equals(project.getPath());
-    }
-
-    @Override
-    protected void checkPreconditions(ProjectRegistry<?> registry) {
-        // TODO(radimk): pattern for path?
-        if (Strings.isNullOrEmpty(projectPath)) {
-            throw new InvalidUserDataException("Project path must not be empty.");
-        }
-    }
-
-    public boolean equals(Object obj) {
-        return EqualsBuilder.reflectionEquals(this, obj);
-    }
-
-    public int hashCode() {
-        return HashCodeBuilder.reflectionHashCode(this);
-    }
-}
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/ProjectSpecs.java b/subprojects/core/src/main/groovy/org/gradle/initialization/ProjectSpecs.java
index d2300001501e..b66c8435150d 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/ProjectSpecs.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/ProjectSpecs.java
@@ -23,12 +23,9 @@
 class ProjectSpecs {
 
     static ProjectSpec forStartParameter(StartParameter startParameter) {
-        String explicitProjectPath = startParameter.getProjectPath();
         File explicitProjectDir = startParameter.getProjectDir();
         File explicitBuildFile = startParameter.getBuildFile();
-        ProjectSpec spec = explicitProjectPath != null
-                ? new ProjectPathProjectSpec(explicitProjectPath)
-                : explicitBuildFile != null
+        ProjectSpec spec = explicitBuildFile != null
                 ? new BuildFileProjectSpec(explicitBuildFile)
                 : explicitProjectDir == null ? new DefaultProjectSpec(startParameter.getCurrentDir()) : new ProjectDirectoryProjectSpec(explicitProjectDir);
         return spec;
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/PropertiesLoadingSettingsProcessor.java b/subprojects/core/src/main/groovy/org/gradle/initialization/PropertiesLoadingSettingsProcessor.java
index dd0d359960ff..83ba64c10d29 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/PropertiesLoadingSettingsProcessor.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/PropertiesLoadingSettingsProcessor.java
@@ -31,9 +31,9 @@ public PropertiesLoadingSettingsProcessor(SettingsProcessor processor, IGradlePr
 
     public SettingsInternal process(GradleInternal gradle,
                                     SettingsLocation settingsLocation,
-                                    ClassLoaderScope classLoaderScope,
+                                    ClassLoaderScope baseClassLoaderScope,
                                     StartParameter startParameter) {
         propertiesLoader.loadProperties(settingsLocation.getSettingsDir());
-        return processor.process(gradle, settingsLocation, classLoaderScope, startParameter);
+        return processor.process(gradle, settingsLocation, baseClassLoaderScope, startParameter);
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/ScriptEvaluatingSettingsProcessor.java b/subprojects/core/src/main/groovy/org/gradle/initialization/ScriptEvaluatingSettingsProcessor.java
index 795b02c9cad2..440d232fb20c 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/ScriptEvaluatingSettingsProcessor.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/ScriptEvaluatingSettingsProcessor.java
@@ -53,12 +53,12 @@ public ScriptEvaluatingSettingsProcessor(ScriptPluginFactory configurerFactory,
 
     public SettingsInternal process(GradleInternal gradle,
                                     SettingsLocation settingsLocation,
-                                    ClassLoaderScope classLoaderScope,
+                                    ClassLoaderScope baseClassLoaderScope,
                                     StartParameter startParameter) {
         Clock settingsProcessingClock = new Clock();
         Map<String, String> properties = propertiesLoader.mergeProperties(Collections.<String, String>emptyMap());
         SettingsInternal settings = settingsFactory.createSettings(gradle, settingsLocation.getSettingsDir(),
-                settingsLocation.getSettingsScriptSource(), properties, startParameter, classLoaderScope);
+                settingsLocation.getSettingsScriptSource(), properties, startParameter, baseClassLoaderScope.createChild());
         applySettingsScript(settingsLocation, settings);
         logger.debug("Timing: Processing settings took: {}", settingsProcessingClock.getTime());
         return settings;
@@ -66,9 +66,9 @@ public SettingsInternal process(GradleInternal gradle,
 
     private void applySettingsScript(SettingsLocation settingsLocation, final SettingsInternal settings) {
         ScriptSource settingsScriptSource = settingsLocation.getSettingsScriptSource();
-        ClassLoaderScope classLoaderScope = settings.getClassLoaderScope();
-        ScriptHandler scriptHandler = scriptHandlerFactory.create(settingsScriptSource, classLoaderScope);
-        ScriptPlugin configurer = configurerFactory.create(settingsScriptSource, scriptHandler, classLoaderScope, "buildscript", SettingsScript.class);
+        ClassLoaderScope settingsClassLoaderScope = settings.getClassLoaderScope();
+        ScriptHandler scriptHandler = scriptHandlerFactory.create(settingsScriptSource, settingsClassLoaderScope);
+        ScriptPlugin configurer = configurerFactory.create(settingsScriptSource, scriptHandler, settingsClassLoaderScope, settingsClassLoaderScope.getParent(), "buildscript", SettingsScript.class, false);
         configurer.apply(settings);
     }
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsFactory.java b/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsFactory.java
index fe319ec981e7..c6af22f762b9 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsFactory.java
@@ -37,10 +37,10 @@ public SettingsFactory(Instantiator instantiator, ServiceRegistryFactory service
 
     public SettingsInternal createSettings(GradleInternal gradle, File settingsDir, ScriptSource settingsScript,
                                            Map<String, String> gradleProperties, StartParameter startParameter,
-                                           ClassLoaderScope classLoaderScope) {
+                                           ClassLoaderScope settingsClassLoaderScope) {
 
         DefaultSettings settings = instantiator.newInstance(DefaultSettings.class,
-                serviceRegistryFactory, gradle, classLoaderScope, settingsDir, settingsScript, startParameter
+                serviceRegistryFactory, gradle, settingsClassLoaderScope, settingsDir, settingsScript, startParameter
         );
 
         DynamicObject dynamicObject = ((DynamicObjectAware) settings).getAsDynamicObject();
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsHandler.java b/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsHandler.java
index 4e09148565dc..a0958b35ad3d 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsHandler.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsHandler.java
@@ -85,7 +85,7 @@ private SettingsInternal findSettingsAndLoadIfAppropriate(GradleInternal gradle,
                 BaseSettings.DEFAULT_BUILD_SRC_DIR));
         ClassLoaderScope buildSourceClassLoader = buildSourceBuilder.buildAndCreateClassLoader(buildSrcStartParameter);
 
-        return loadSettings(gradle, settingsLocation, buildSourceClassLoader.createRebasedChild(), startParameter);
+        return loadSettings(gradle, settingsLocation, buildSourceClassLoader.createChild().lock(), startParameter);
     }
 
     private SettingsLocation findSettings(StartParameter startParameter) {
@@ -93,8 +93,8 @@ private SettingsLocation findSettings(StartParameter startParameter) {
     }
 
     private SettingsInternal loadSettings(GradleInternal gradle, SettingsLocation settingsLocation,
-                                          ClassLoaderScope classLoaderScope, StartParameter startParameter) {
-        return settingsProcessor.process(gradle, settingsLocation, classLoaderScope, startParameter);
+                                          ClassLoaderScope baseClassLoaderScope, StartParameter startParameter) {
+        return settingsProcessor.process(gradle, settingsLocation, baseClassLoaderScope, startParameter);
     }
 }
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsProcessor.java b/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsProcessor.java
index 0db94ef63bc0..57257a617599 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsProcessor.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/SettingsProcessor.java
@@ -26,6 +26,6 @@
 public interface SettingsProcessor {
     SettingsInternal process(GradleInternal gradle,
                              SettingsLocation settingsLocation,
-                             ClassLoaderScope classLoaderScope,
+                             ClassLoaderScope baseClassLoaderScope,
                              StartParameter startParameter);
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilder.java b/subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilder.java
index cfd286a861d0..bd525b7f6dbd 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilder.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilder.java
@@ -16,12 +16,12 @@
 
 package org.gradle.initialization.buildsrc;
 
-import org.gradle.GradleLauncher;
 import org.gradle.StartParameter;
 import org.gradle.api.internal.initialization.ClassLoaderScope;
 import org.gradle.cache.CacheRepository;
 import org.gradle.cache.PersistentCache;
 import org.gradle.cache.internal.FileLockManager;
+import org.gradle.initialization.GradleLauncher;
 import org.gradle.initialization.GradleLauncherFactory;
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.classpath.DefaultClassPath;
@@ -53,7 +53,7 @@ public ClassLoaderScope buildAndCreateClassLoader(StartParameter startParameter)
             return classLoaderScope;
         } else {
             ClassLoaderScope childScope = classLoaderScope.createChild();
-            childScope.export(classpath);
+            childScope.export(classLoaderScope.loader(classpath));
             childScope.lock();
             return childScope;
         }
@@ -74,7 +74,11 @@ ClassPath createBuildSourceClasspath(StartParameter startParameter) {
         final PersistentCache buildSrcCache = createCache(startParameter);
         try {
             GradleLauncher gradleLauncher = buildGradleLauncher(startParameter);
-            return buildSrcCache.useCache("rebuild buildSrc", new BuildSrcUpdateFactory(buildSrcCache, gradleLauncher, new BuildSrcBuildListenerFactory()));
+            try {
+                return buildSrcCache.useCache("rebuild buildSrc", new BuildSrcUpdateFactory(buildSrcCache, gradleLauncher, new BuildSrcBuildListenerFactory()));
+            } finally {
+                gradleLauncher.stop();
+            }
         } finally {
             // This isn't quite right. We should not unlock the classes until we're finished with them, and the classes may be used across multiple builds
             buildSrcCache.close();
diff --git a/subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactory.java b/subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactory.java
index 31fe50bb0a32..2c6494be1cfc 100644
--- a/subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactory.java
+++ b/subprojects/core/src/main/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactory.java
@@ -16,7 +16,7 @@
 
 package org.gradle.initialization.buildsrc;
 
-import org.gradle.GradleLauncher;
+import org.gradle.initialization.GradleLauncher;
 import org.gradle.api.UncheckedIOException;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
diff --git a/subprojects/core/src/main/groovy/org/gradle/internal/DefaultTaskParameter.java b/subprojects/core/src/main/groovy/org/gradle/internal/DefaultTaskParameter.java
new file mode 100644
index 000000000000..8261403677d6
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/internal/DefaultTaskParameter.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal;
+
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import org.gradle.TaskParameter;
+
+import java.io.Serializable;
+
+/**
+ * Adapter to create TaskParameter for a simple task name.
+ */
+public class DefaultTaskParameter implements TaskParameter, Serializable {
+    private final String taskName;
+    private final String projectPath;
+
+    public DefaultTaskParameter(String taskName) {
+        this(taskName, null);
+    }
+
+    public DefaultTaskParameter(String taskName, String projectPath) {
+        this.taskName = Preconditions.checkNotNull(taskName);
+        this.projectPath = projectPath;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
+    public String getProjectPath() {
+        return projectPath;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        DefaultTaskParameter that = (DefaultTaskParameter) o;
+        if (!Objects.equal(projectPath, that.projectPath)) {
+            return false;
+        }
+        if (!Objects.equal(taskName, that.taskName)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = taskName != null ? taskName.hashCode() : 0;
+        result = 31 * result + (projectPath != null ? projectPath.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "DefaultTaskParameter{"
+                + "taskName='" + taskName + '\''
+                + ",projectPath='" + projectPath + '\''
+                + '}';
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/GroupedAndNamedUniqueFileStore.java b/subprojects/core/src/main/groovy/org/gradle/internal/resource/local/GroupedAndNamedUniqueFileStore.java
similarity index 93%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/GroupedAndNamedUniqueFileStore.java
rename to subprojects/core/src/main/groovy/org/gradle/internal/resource/local/GroupedAndNamedUniqueFileStore.java
index b83a92b960bd..10876681e477 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/GroupedAndNamedUniqueFileStore.java
+++ b/subprojects/core/src/main/groovy/org/gradle/internal/resource/local/GroupedAndNamedUniqueFileStore.java
@@ -13,14 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.filestore;
+package org.gradle.internal.resource.local;
 
 import org.gradle.api.Action;
 import org.gradle.api.Transformer;
 import org.gradle.api.internal.file.TemporaryFileProvider;
-import org.gradle.internal.filestore.FileStore;
-import org.gradle.internal.filestore.FileStoreSearcher;
-import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.gradle.internal.hash.HashUtil;
 
 import java.io.File;
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/PathKeyFileStore.java b/subprojects/core/src/main/groovy/org/gradle/internal/resource/local/PathKeyFileStore.java
similarity index 96%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/PathKeyFileStore.java
rename to subprojects/core/src/main/groovy/org/gradle/internal/resource/local/PathKeyFileStore.java
index 8a2923e34560..4fcf37f0980f 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/PathKeyFileStore.java
+++ b/subprojects/core/src/main/groovy/org/gradle/internal/resource/local/PathKeyFileStore.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.filestore;
+package org.gradle.internal.resource.local;
 
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
@@ -25,10 +25,6 @@
 import org.gradle.api.internal.file.collections.MinimalFileTree;
 import org.gradle.api.internal.file.collections.SingleIncludePatternFileTree;
 import org.gradle.api.internal.file.copy.DeleteActionImpl;
-import org.gradle.internal.filestore.FileStore;
-import org.gradle.internal.filestore.FileStoreSearcher;
-import org.gradle.internal.resource.local.AbstractLocallyAvailableResource;
-import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.gradle.util.GFileUtils;
 
 import java.io.File;
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/PathNormalisingKeyFileStore.java b/subprojects/core/src/main/groovy/org/gradle/internal/resource/local/PathNormalisingKeyFileStore.java
similarity index 89%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/PathNormalisingKeyFileStore.java
rename to subprojects/core/src/main/groovy/org/gradle/internal/resource/local/PathNormalisingKeyFileStore.java
index be47d6e96996..ecf5eb0d9e58 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/PathNormalisingKeyFileStore.java
+++ b/subprojects/core/src/main/groovy/org/gradle/internal/resource/local/PathNormalisingKeyFileStore.java
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.filestore;
+package org.gradle.internal.resource.local;
 
 import org.gradle.api.Action;
-import org.gradle.internal.filestore.FileStore;
-import org.gradle.internal.filestore.FileStoreSearcher;
-import org.gradle.internal.resource.local.LocallyAvailableResource;
 
 import java.io.File;
 import java.util.Set;
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/UniquePathKeyFileStore.java b/subprojects/core/src/main/groovy/org/gradle/internal/resource/local/UniquePathKeyFileStore.java
similarity index 88%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/UniquePathKeyFileStore.java
rename to subprojects/core/src/main/groovy/org/gradle/internal/resource/local/UniquePathKeyFileStore.java
index 4ba34b001cfb..8a7d1516481b 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/filestore/UniquePathKeyFileStore.java
+++ b/subprojects/core/src/main/groovy/org/gradle/internal/resource/local/UniquePathKeyFileStore.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.filestore;
+package org.gradle.internal.resource.local;
 
+import org.apache.commons.io.FileUtils;
 import org.gradle.api.Action;
-import org.gradle.internal.resource.local.LocallyAvailableResource;
-import org.gradle.util.GFileUtils;
 
 import java.io.File;
 
@@ -37,7 +36,7 @@ public UniquePathKeyFileStore(File baseDir) {
     public LocallyAvailableResource move(String path, File source) {
         LocallyAvailableResource entry = super.move(path, source);
         if (source.exists()) {
-            GFileUtils.deleteQuietly(source);
+            FileUtils.deleteQuietly(source);
         }
         return entry;
     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/BuildScopeServices.java b/subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/BuildScopeServices.java
index 494934fd0bbe..c08fae6a5b0a 100644
--- a/subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/BuildScopeServices.java
+++ b/subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/BuildScopeServices.java
@@ -16,7 +16,6 @@
 
 package org.gradle.internal.service.scopes;
 
-import com.google.common.cache.CacheBuilder;
 import org.gradle.StartParameter;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
@@ -29,7 +28,8 @@
 import org.gradle.api.internal.classpath.PluginModuleRegistry;
 import org.gradle.api.internal.file.FileLookup;
 import org.gradle.api.internal.file.FileResolver;
-import org.gradle.api.internal.initialization.*;
+import org.gradle.api.internal.initialization.DefaultScriptHandlerFactory;
+import org.gradle.api.internal.initialization.ScriptHandlerFactory;
 import org.gradle.api.internal.plugins.DefaultPluginRegistry;
 import org.gradle.api.internal.plugins.PluginRegistry;
 import org.gradle.api.internal.project.*;
@@ -65,7 +65,7 @@
 import org.gradle.messaging.actor.ActorFactory;
 import org.gradle.messaging.actor.internal.DefaultActorFactory;
 import org.gradle.messaging.remote.MessagingServer;
-import org.gradle.plugin.internal.PluginResolverFactory;
+import org.gradle.plugin.use.internal.PluginRequestApplicatorFactory;
 import org.gradle.process.internal.DefaultWorkerProcessFactory;
 import org.gradle.process.internal.WorkerProcessBuilder;
 import org.gradle.process.internal.child.WorkerProcessClassPathProvider;
@@ -114,7 +114,8 @@ protected ClassPathRegistry createClassPathRegistry() {
                 new DefaultClassPathProvider(get(ModuleRegistry.class)),
                 new DependencyClassPathProvider(get(ModuleRegistry.class),
                         get(PluginModuleRegistry.class)),
-                get(WorkerProcessClassPathProvider.class));
+                get(WorkerProcessClassPathProvider.class)
+        );
     }
 
     protected WorkerProcessClassPathProvider createWorkerProcessClassPathProvider(CacheRepository cacheRepository, ModuleRegistry moduleRegistry) {
@@ -154,8 +155,7 @@ protected ProjectEvaluator createProjectEvaluator() {
                 new PluginsProjectConfigureActions(get(ClassLoaderRegistry.class).getPluginsClassLoader()),
                 new BuildScriptProcessor(get(ScriptPluginFactory.class)),
                 new DelayedConfigurationActions(),
-                new TaskModelRealizingConfigurationAction(),
-                new ProjectDependencies2TaskResolver()
+                new TaskModelRealizingConfigurationAction()
         );
         return new LifecycleProjectEvaluator(withActionsEvaluator);
     }
@@ -164,7 +164,9 @@ protected ITaskFactory createITaskFactory() {
         return new DependencyAutoWireTaskFactory(
                 new AnnotationProcessingTaskFactory(
                         new TaskFactory(
-                                get(ClassGenerator.class))));
+                                get(ClassGenerator.class))
+                )
+        );
     }
 
     protected ScriptCompilerFactory createScriptCompileFactory(ListenerManager listenerManager, EmptyScriptGenerator emptyScriptGenerator, FileCacheBackedScriptClassCompiler scriptCompiler) {
@@ -173,9 +175,11 @@ protected ScriptCompilerFactory createScriptCompileFactory(ListenerManager liste
                 new CachingScriptClassCompiler(
                         new ShortCircuitEmptyScriptCompiler(
                                 scriptCompiler,
-                                emptyScriptGenerator)),
+                                emptyScriptGenerator)
+                ),
                 new DefaultScriptRunnerFactory(
-                        scriptExecutionListener));
+                        scriptExecutionListener)
+        );
     }
 
     protected EmptyScriptGenerator createEmptyScriptGenerator() {
@@ -193,7 +197,8 @@ public boolean isValid() {
                 scriptCacheInvalidator,
                 new DefaultScriptCompilationHandler(
                         emptyScriptGenerator),
-                progressLoggerFactory);
+                progressLoggerFactory
+        );
     }
 
     protected ScriptPluginFactory createScriptObjectConfigurerFactory() {
@@ -203,7 +208,7 @@ protected ScriptPluginFactory createScriptObjectConfigurerFactory() {
                 getFactory(LoggingManagerInternal.class),
                 get(Instantiator.class),
                 get(ScriptHandlerFactory.class),
-                get(PluginResolverFactory.class),
+                get(PluginRequestApplicatorFactory.class),
                 get(FileLookup.class)
         );
     }
@@ -226,8 +231,10 @@ protected SettingsProcessor createSettingsProcessor() {
                                 get(Instantiator.class),
                                 get(ServiceRegistryFactory.class)
                         ),
-                        get(IGradlePropertiesLoader.class)),
-                get(IGradlePropertiesLoader.class));
+                        get(IGradlePropertiesLoader.class)
+                ),
+                get(IGradlePropertiesLoader.class)
+        );
     }
 
     protected ExceptionAnalyser createExceptionAnalyser() {
@@ -238,18 +245,7 @@ protected ScriptHandlerFactory createScriptHandlerFactory() {
         return new DefaultScriptHandlerFactory(
                 get(DependencyManagementServices.class),
                 get(FileResolver.class),
-                new DependencyMetaDataProviderImpl());
-    }
-
-    protected PluginResolverFactory createPluginResolverFactory() {
-        return new PluginResolverFactory(
-                get(PluginRegistry.class),
-                get(Instantiator.class),
-                get(DependencyManagementServices.class),
-                get(FileResolver.class),
-                new DependencyMetaDataProviderImpl(),
-                get(DocumentationRegistry.class),
-                get(CacheRepository.class)
+                get(DependencyMetaDataProvider.class)
         );
     }
 
@@ -283,12 +279,16 @@ protected ServiceRegistryFactory createServiceRegistryFactory(final ServiceRegis
         return new BuildScopeServiceRegistryFactory(services);
     }
 
-    protected ClassLoaderCache createClassLoaderCache() {
-        return new DefaultClassLoaderCache(CacheBuilder.newBuilder().<DefaultClassLoaderCache.Key, ClassLoader>build());
+    protected ClassLoaderScopeRegistry createClassLoaderScopeRegistry(ClassLoaderRegistry classLoaderRegistry) {
+        return new DefaultClassLoaderScopeRegistry(classLoaderRegistry);
+    }
+
+    protected ProjectTaskLister createProjectTaskLister() {
+        return new DefaultProjectTaskLister();
     }
 
-    protected ClassLoaderScope createClassLoaderScope(ClassLoaderRegistry classLoaderRegistry, ClassLoaderCache classLoaderCache) {
-        return new RootClassLoaderScope(classLoaderRegistry.getGradleApiClassLoader(), classLoaderCache);
+    protected DependencyMetaDataProvider createDependencyMetaDataProvider() {
+        return new DependencyMetaDataProviderImpl();
     }
 
     private class DependencyMetaDataProviderImpl implements DependencyMetaDataProvider {
diff --git a/subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/GlobalScopeServices.java b/subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/GlobalScopeServices.java
index 4f6eb0f7a06b..7d051c73e2a7 100755
--- a/subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/GlobalScopeServices.java
+++ b/subprojects/core/src/main/groovy/org/gradle/internal/service/scopes/GlobalScopeServices.java
@@ -72,7 +72,7 @@ void configure(ServiceRegistration registration, ClassLoaderRegistry classLoader
         }
     }
 
-    GradleLauncherFactory createGradleLauncherFactory(ServiceRegistry services) {
+    DefaultGradleLauncherFactory createGradleLauncherFactory(ServiceRegistry services) {
         return new DefaultGradleLauncherFactory(services);
     }
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/EnumFromCharSequenceNotationParser.java b/subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/EnumFromCharSequenceNotationParser.java
index 644eedd409eb..f8058fc9e269 100644
--- a/subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/EnumFromCharSequenceNotationParser.java
+++ b/subprojects/core/src/main/groovy/org/gradle/internal/typeconversion/EnumFromCharSequenceNotationParser.java
@@ -33,7 +33,7 @@ public EnumFromCharSequenceNotationParser(Class<? extends T> enumType) {
 
     public T parseNotation(CharSequence notation) throws UnsupportedNotationException, TypeConversionException {
         final String enumString = notation.toString();
-        List<T> enumConstants = Arrays.asList(type.getEnumConstants());
+        List<? extends T> enumConstants = Arrays.asList(type.getEnumConstants());
         T match = CollectionUtils.findFirst(enumConstants, new Spec<T>() {
             public boolean isSatisfiedBy(T enumValue) {
                 return enumValue.name().equalsIgnoreCase(enumString);
diff --git a/subprojects/core/src/main/groovy/org/gradle/invocation/DefaultGradle.java b/subprojects/core/src/main/groovy/org/gradle/invocation/DefaultGradle.java
index bea78db9a267..2ed14e775253 100644
--- a/subprojects/core/src/main/groovy/org/gradle/invocation/DefaultGradle.java
+++ b/subprojects/core/src/main/groovy/org/gradle/invocation/DefaultGradle.java
@@ -34,6 +34,7 @@
 import org.gradle.api.plugins.PluginContainer;
 import org.gradle.configuration.ScriptPluginFactory;
 import org.gradle.execution.TaskGraphExecuter;
+import org.gradle.initialization.ClassLoaderScopeRegistry;
 import org.gradle.internal.service.ServiceRegistry;
 import org.gradle.internal.service.scopes.ServiceRegistryFactory;
 import org.gradle.listener.ActionBroadcast;
@@ -71,7 +72,7 @@ public DefaultGradle(Gradle parent, StartParameter startParameter, ServiceRegist
         this.listenerManager = services.get(ListenerManager.class);
         taskGraph = services.get(TaskGraphExecuter.class);
         distributionLocator = services.get(GradleDistributionLocator.class);
-        classLoaderScope = services.get(ClassLoaderScope.class);
+        classLoaderScope = services.get(ClassLoaderScopeRegistry.class).getGradleApiScope();
         pluginContainer = services.get(PluginContainer.class);
         fileResolver = services.get(FileResolver.class);
         scriptPluginFactory = services.get(ScriptPluginFactory.class);
@@ -244,8 +245,12 @@ protected ScriptHandlerFactory getScriptHandlerFactory() {
         return scriptHandlerFactory;
     }
 
-    @Override
     public ClassLoaderScope getClassLoaderScope() {
         return classLoaderScope;
     }
+
+    @Override
+    protected ClassLoaderScope getBaseClassLoaderScope() {
+        return getClassLoaderScope();
+    }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/logging/internal/ConsoleConfigureAction.java b/subprojects/core/src/main/groovy/org/gradle/logging/internal/ConsoleConfigureAction.java
index dfdc7a4ab3ee..0c9dfe18de44 100644
--- a/subprojects/core/src/main/groovy/org/gradle/logging/internal/ConsoleConfigureAction.java
+++ b/subprojects/core/src/main/groovy/org/gradle/logging/internal/ConsoleConfigureAction.java
@@ -16,18 +16,15 @@
 
 package org.gradle.logging.internal;
 
-import org.gradle.StartParameter;
 import org.gradle.api.Action;
-import org.gradle.internal.nativeplatform.console.ConsoleMetaData;
 import org.gradle.internal.nativeplatform.console.ConsoleDetector;
+import org.gradle.internal.nativeplatform.console.ConsoleMetaData;
 import org.gradle.internal.nativeplatform.services.NativeServices;
 
 import java.io.PrintStream;
 
 public class ConsoleConfigureAction implements Action<OutputEventRenderer> {
     public void execute(OutputEventRenderer renderer) {
-        StartParameter startParameter = new StartParameter();
-        NativeServices.initialize(startParameter.getGradleUserHomeDir());
         ConsoleDetector consoleDetector = NativeServices.getInstance().get(ConsoleDetector.class);
         ConsoleMetaData consoleMetaData = consoleDetector.getConsole();
         if (consoleMetaData == null) {
diff --git a/subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingCommandLineConverter.java b/subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingCommandLineConverter.java
index 9ba8e82337e2..b70265ec214c 100644
--- a/subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingCommandLineConverter.java
+++ b/subprojects/core/src/main/groovy/org/gradle/logging/internal/LoggingCommandLineConverter.java
@@ -53,11 +53,6 @@ public LoggingCommandLineConverter() {
         showStacktraceMap.put(STACKTRACE, ShowStacktrace.ALWAYS);
     }
 
-    @Override
-    protected LoggingConfiguration newInstance() {
-        return new LoggingConfiguration();
-    }
-
     public LoggingConfiguration convert(ParsedCommandLine commandLine, LoggingConfiguration loggingConfiguration) throws CommandLineArgumentException {
         for (Map.Entry<String, LogLevel> entry : logLevelMap.entrySet()) {
             if (commandLine.hasOption(entry.getKey())) {
diff --git a/subprojects/core/src/main/groovy/org/gradle/logging/internal/logback/LogbackLoggingConfigurer.java b/subprojects/core/src/main/groovy/org/gradle/logging/internal/logback/LogbackLoggingConfigurer.java
index 4eba18f60f44..ab01184022d7 100644
--- a/subprojects/core/src/main/groovy/org/gradle/logging/internal/logback/LogbackLoggingConfigurer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/logging/internal/logback/LogbackLoggingConfigurer.java
@@ -71,6 +71,7 @@ private void doConfigure(LogLevel logLevel) {
             context.reset();
             context.addTurboFilter(new GradleFilter());
             context.getLogger("org.apache.http.wire").setLevel(Level.OFF);
+            context.getLogger("org.codehaus.groovy.runtime.m12n.SimpleExtensionModule").setLevel(Level.ERROR);
             GradleAppender appender = new GradleAppender();
             appender.setContext(context);
             appender.start();
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/DefaultPluginHandler.java b/subprojects/core/src/main/groovy/org/gradle/plugin/internal/DefaultPluginHandler.java
deleted file mode 100644
index 45e580195777..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/DefaultPluginHandler.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.internal;
-
-import org.gradle.api.tasks.Optional;
-import org.gradle.internal.typeconversion.MapKey;
-import org.gradle.internal.typeconversion.MapNotationParser;
-import org.gradle.plugin.PluginHandler;
-import org.gradle.plugin.resolve.internal.DefaultPluginRequest;
-import org.gradle.plugin.resolve.internal.PluginRequest;
-
-import java.util.List;
-import java.util.Map;
-
-public class DefaultPluginHandler implements PluginHandler {
-
-    private final List<PluginRequest> pluginRequests;
-
-    public DefaultPluginHandler(List<PluginRequest> pluginRequests) {
-        this.pluginRequests = pluginRequests;
-    }
-
-    private static class PluginRequestNotationParser extends MapNotationParser<PluginRequest> {
-        protected PluginRequest parseMap(@MapKey("plugin") String id, @MapKey("version") @Optional String version) {
-            return version == null ? new DefaultPluginRequest(id) : new DefaultPluginRequest(id, version);
-        }
-    }
-
-    public void apply(Map<String, ?> attributes) {
-        PluginRequest pluginRequest = new PluginRequestNotationParser().parseType(attributes);
-        pluginRequests.add(pluginRequest);
-    }
-
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/InvalidPluginIdException.java b/subprojects/core/src/main/groovy/org/gradle/plugin/internal/InvalidPluginIdException.java
new file mode 100644
index 000000000000..d54d04847718
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/internal/InvalidPluginIdException.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.internal;
+
+import org.gradle.api.GradleException;
+
+public class InvalidPluginIdException extends GradleException {
+
+    private final String reason;
+
+    public InvalidPluginIdException(String pluginId, String reason) {
+        super(String.format("plugin id '%s' is invalid: %s", pluginId, reason));
+        this.reason = reason;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginId.java b/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginId.java
new file mode 100644
index 000000000000..b13427e0ad04
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginId.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.internal;
+
+import com.google.common.base.CharMatcher;
+import org.gradle.api.Nullable;
+
+import static com.google.common.base.CharMatcher.anyOf;
+import static com.google.common.base.CharMatcher.inRange;
+
+public class PluginId {
+
+    public static final String ID_SEPARATOR_ON_START_OR_END = "cannot begin or end with '" + PluginId.SEPARATOR + "'";
+    public static final String DOUBLE_SEPARATOR = "cannot contain '" + PluginId.SEPARATOR + PluginId.SEPARATOR + "'";
+
+    public static final String PLUGIN_ID_VALID_CHARS_DESCRIPTION = "ASCII alphanumeric characters, '.', '_' and '-'";
+    public static final CharMatcher INVALID_PLUGIN_ID_CHAR_MATCHER = inRange('a', 'z')
+            .or(inRange('A', 'Z'))
+            .or(inRange('0', '9'))
+            .or(anyOf(".-_"))
+            .negate();
+    public static final String SEPARATOR = ".";
+
+    private final String value;
+
+    // Only use when id is guaranteed to be valid, prefer of()
+    public PluginId(String value) {
+        this.value = value;
+    }
+
+    public static PluginId of(String value) throws InvalidPluginIdException {
+        validate(value);
+        return new PluginId(value);
+    }
+
+    public static void validate(String value) throws InvalidPluginIdException {
+        if (value.startsWith(SEPARATOR) || value.endsWith(SEPARATOR)) {
+            throw new InvalidPluginIdException(value, ID_SEPARATOR_ON_START_OR_END);
+        } else if (value.contains(PluginId.SEPARATOR + PluginId.SEPARATOR)) {
+            throw new InvalidPluginIdException(value, DOUBLE_SEPARATOR);
+        } else {
+            int invalidCharIndex = PluginId.INVALID_PLUGIN_ID_CHAR_MATCHER.indexIn(value);
+            if (invalidCharIndex >= 0) {
+                char invalidChar = value.charAt(invalidCharIndex);
+                throw new InvalidPluginIdException(value, invalidPluginIdCharMessage(invalidChar));
+            }
+        }
+    }
+
+    public static String invalidPluginIdCharMessage(char invalidChar) {
+        return "Plugin id contains invalid char '" + invalidChar + "' (only " + PluginId.PLUGIN_ID_VALID_CHARS_DESCRIPTION + " characters are valid)";
+    }
+
+    public boolean isQualified() {
+        return value.contains(PluginId.SEPARATOR);
+    }
+
+    public PluginId maybeQualify(String qualification) {
+        return isQualified() ? this : new PluginId(qualification + PluginId.SEPARATOR + value);
+    }
+
+    @Nullable
+    public String getNamespace() {
+        return isQualified() ? value.substring(0, value.lastIndexOf(SEPARATOR)) : null;
+    }
+
+    public boolean inNamespace(String namespace) {
+        return isQualified() && getNamespace().equals(namespace);
+    }
+
+    public String getName() {
+        return isQualified() ? value.substring(value.lastIndexOf(PluginId.SEPARATOR) + 1) : value;
+    }
+
+    public PluginId getUnqualified() {
+        return isQualified() ? new PluginId(getName()) : this;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PluginId pluginId = (PluginId) o;
+
+        return value.equals(pluginId.value);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return value.hashCode();
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginRequestApplicator.java b/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginRequestApplicator.java
deleted file mode 100644
index 9c8a2a6d6977..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginRequestApplicator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.internal;
-
-import org.gradle.api.Action;
-import org.gradle.api.plugins.UnknownPluginException;
-import org.gradle.plugin.resolve.internal.PluginRequest;
-import org.gradle.plugin.resolve.internal.PluginResolution;
-import org.gradle.plugin.resolve.internal.PluginResolver;
-
-public class PluginRequestApplicator {
-
-    private final PluginResolver pluginResolver;
-    private final Action<? super PluginResolution> pluginResolutionHandler;
-
-    public PluginRequestApplicator(PluginResolver pluginResolver, Action<? super PluginResolution> pluginResolutionHandler) {
-        this.pluginResolver = pluginResolver;
-        this.pluginResolutionHandler = pluginResolutionHandler;
-    }
-
-    public void applyPlugin(Iterable<? extends PluginRequest> requests) {
-        for (PluginRequest request : requests) {
-            applyPlugin(request);
-        }
-    }
-
-    public void applyPlugin(PluginRequest request) {
-        PluginResolution resolution = pluginResolver.resolve(request);
-        if (resolution == null) {
-            throw new UnknownPluginException("Cannot resolve plugin request " + request + " from " + pluginResolver.getDescriptionForNotFoundMessage());
-        }
-
-        pluginResolutionHandler.execute(resolution);
-    }
-
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolverFactory.java b/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolverFactory.java
deleted file mode 100644
index 989b74ccaac3..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolverFactory.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.internal;
-
-import org.gradle.api.UnknownProjectException;
-import org.gradle.api.internal.DocumentationRegistry;
-import org.gradle.api.internal.DomainObjectContext;
-import org.gradle.api.internal.artifacts.DependencyManagementServices;
-import org.gradle.api.internal.artifacts.DependencyResolutionServices;
-import org.gradle.api.internal.artifacts.configurations.DependencyMetaDataProvider;
-import org.gradle.api.internal.artifacts.dsl.dependencies.ProjectFinder;
-import org.gradle.api.internal.file.FileResolver;
-import org.gradle.api.internal.plugins.ClassloaderBackedPluginDescriptorLocator;
-import org.gradle.api.internal.plugins.PluginDescriptorLocator;
-import org.gradle.api.internal.plugins.PluginRegistry;
-import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.cache.CacheRepository;
-import org.gradle.internal.reflect.Instantiator;
-import org.gradle.plugin.resolve.internal.CompositePluginResolver;
-import org.gradle.plugin.resolve.internal.NotInPluginRegistryPluginResolverCheck;
-import org.gradle.plugin.resolve.internal.PluginRegistryPluginResolver;
-import org.gradle.plugin.resolve.internal.PluginResolver;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import static org.gradle.plugin.internal.PluginResolvers.jcenterGradleOfficial;
-
-public class PluginResolverFactory {
-
-    private final PluginRegistry pluginRegistry;
-    private final Instantiator instantiator;
-    private final DependencyManagementServices dependencyManagementServices;
-    private final FileResolver fileResolver;
-    private final DependencyMetaDataProvider dependencyMetaDataProvider;
-    private final DocumentationRegistry documentationRegistry;
-    private final CacheRepository cacheRepository;
-
-    private final ProjectFinder projectFinder = new ProjectFinder() {
-        public ProjectInternal getProject(String path) {
-            throw new UnknownProjectException("Cannot use project dependencies in a plugin resolution definition.");
-        }
-    };
-
-    public PluginResolverFactory(PluginRegistry pluginRegistry, Instantiator instantiator, DependencyManagementServices dependencyManagementServices, FileResolver fileResolver, DependencyMetaDataProvider dependencyMetaDataProvider, DocumentationRegistry documentationRegistry, CacheRepository cacheRepository) {
-        this.pluginRegistry = pluginRegistry;
-        this.instantiator = instantiator;
-        this.dependencyManagementServices = dependencyManagementServices;
-        this.fileResolver = fileResolver;
-        this.dependencyMetaDataProvider = dependencyMetaDataProvider;
-        this.documentationRegistry = documentationRegistry;
-        this.cacheRepository = cacheRepository;
-    }
-
-    public PluginResolver createPluginResolver(ClassLoader scriptClassLoader) {
-        List<PluginResolver> resolvers = new LinkedList<PluginResolver>();
-        addDefaultResolvers(resolvers);
-        CompositePluginResolver compositePluginResolver = new CompositePluginResolver(resolvers);
-
-        PluginDescriptorLocator scriptClasspathPluginDescriptorLocator = new ClassloaderBackedPluginDescriptorLocator(scriptClassLoader);
-        PluginResolver notAlreadyOnClasspathCheck = new NotInPluginRegistryPluginResolverCheck(compositePluginResolver, pluginRegistry, scriptClasspathPluginDescriptorLocator);
-
-        return notAlreadyOnClasspathCheck;
-    }
-
-    private void addDefaultResolvers(List<PluginResolver> resolvers) {
-        resolvers.add(new PluginRegistryPluginResolver(documentationRegistry, pluginRegistry));
-        resolvers.add(jcenterGradleOfficial(instantiator, createDependencyResolutionServices(), cacheRepository));
-    }
-
-    private DependencyResolutionServices createDependencyResolutionServices() {
-        return dependencyManagementServices.create(fileResolver, dependencyMetaDataProvider, projectFinder, new BasicDomainObjectContext());
-    }
-
-    private static class BasicDomainObjectContext implements DomainObjectContext {
-        public String absoluteProjectPath(String name) {
-            return name;
-        }
-    }
-
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolvers.java b/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolvers.java
deleted file mode 100644
index ae57eb633aee..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolvers.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.internal;
-
-import org.gradle.api.Transformer;
-import org.gradle.api.internal.artifacts.DependencyResolutionServices;
-import org.gradle.cache.CacheRepository;
-import org.gradle.cache.PersistentCache;
-import org.gradle.cache.PersistentIndexedCache;
-import org.gradle.cache.PersistentIndexedCacheParameters;
-import org.gradle.cache.internal.FileLockManager;
-import org.gradle.cache.internal.filelock.LockOptionsBuilder;
-import org.gradle.internal.Factory;
-import org.gradle.internal.Supplier;
-import org.gradle.internal.Suppliers;
-import org.gradle.internal.reflect.Instantiator;
-import org.gradle.messaging.serialize.BaseSerializerFactory;
-import org.gradle.plugin.resolve.internal.*;
-
-public abstract class PluginResolvers {
-
-    public static PluginResolver jcenterGradleOfficial(Instantiator instantiator, DependencyResolutionServices dependencyResolutionServices, final CacheRepository cacheRepository) {
-        Supplier<PersistentIndexedCache<PluginRequest, String>> cacheSupplier = Suppliers.wrap(
-                Suppliers.ofQuietlyClosed(new Factory<PersistentCache>() {
-                    public PersistentCache create() {
-                        return cacheRepository.cache("plugins").withLockOptions(LockOptionsBuilder.mode(FileLockManager.LockMode.Exclusive)).open();
-                    }
-                }),
-                new Transformer<PersistentIndexedCache<PluginRequest, String>, PersistentCache>() {
-                    public PersistentIndexedCache<PluginRequest, String> transform(PersistentCache original) {
-                        PersistentIndexedCacheParameters<PluginRequest, String> cacheParams = new PersistentIndexedCacheParameters<PluginRequest, String>("jcenter", new PluginRequestSerializer(), BaseSerializerFactory.STRING_SERIALIZER);
-                        return original.createCache(cacheParams);
-                    }
-                });
-
-        final JCenterPluginMapper mapper = new JCenterPluginMapper(cacheSupplier);
-
-        return new ModuleMappingPluginResolver("jcenter plugin resolver", dependencyResolutionServices, instantiator, mapper, new JCenterRepositoryConfigurer()) {
-            @Override
-            public String getDescriptionForNotFoundMessage() {
-                return String.format("Gradle Bintray Plugin Repository (listing: %s)", mapper.getBintrayRepoUrl());
-            }
-        };
-    }
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DependencyResolvingClasspathProvider.java b/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DependencyResolvingClasspathProvider.java
deleted file mode 100644
index 51c26ee0f548..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DependencyResolvingClasspathProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.resolve.internal;
-
-import org.gradle.api.Action;
-import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.dsl.RepositoryHandler;
-import org.gradle.api.internal.artifacts.DependencyResolutionServices;
-import org.gradle.internal.Factory;
-import org.gradle.internal.classpath.ClassPath;
-import org.gradle.internal.classpath.DefaultClassPath;
-
-public class DependencyResolvingClasspathProvider implements Factory<ClassPath> {
-
-    private final DependencyResolutionServices dependencyResolutionServices;
-    private final Dependency dependency;
-    private final Action<? super RepositoryHandler> repositoriesConfigurer;
-
-    public DependencyResolvingClasspathProvider(DependencyResolutionServices dependencyResolutionServices, Dependency dependency, Action<? super RepositoryHandler> repositoriesConfigurer) {
-        this.dependencyResolutionServices = dependencyResolutionServices;
-        this.dependency = dependency;
-        this.repositoriesConfigurer = repositoriesConfigurer;
-    }
-
-    public ClassPath create() {
-        Configuration configuration = dependencyResolutionServices.getConfigurationContainer().detachedConfiguration(dependency);
-        repositoriesConfigurer.execute(dependencyResolutionServices.getResolveRepositoryHandler());
-        return new DefaultClassPath(configuration.resolve());
-    }
-
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java b/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java
deleted file mode 100644
index f8719c3244b4..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/JCenterPluginMapper.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.resolve.internal;
-
-import com.jfrog.bintray.client.api.handle.Bintray;
-import com.jfrog.bintray.client.api.model.Pkg;
-import com.jfrog.bintray.client.impl.BintrayClient;
-import org.gradle.api.Transformer;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.dsl.DependencyHandler;
-import org.gradle.cache.PersistentIndexedCache;
-import org.gradle.internal.Supplier;
-
-import java.util.List;
-
-public class JCenterPluginMapper implements ModuleMappingPluginResolver.Mapper {
-
-    public static final String BINTRAY_API_OVERRIDE_URL_PROPERTY = JCenterPluginMapper.class.getName() + ".bintray.override";
-
-    public static final String GRADLE_PLUGINS_ORG = "gradle-plugins-development";
-    public static final String GRADLE_PLUGINS_REPO = "gradle-plugins";
-    public static final String PLUGIN_ID_ATTRIBUTE_NAME = "gradle-plugin-id";
-
-    private static final String NOT_FOUND = "";
-
-    private final Supplier<PersistentIndexedCache<PluginRequest, String>> cacheSupplier;
-
-    public JCenterPluginMapper(Supplier<PersistentIndexedCache<PluginRequest, String>> cacheSupplier) {
-        this.cacheSupplier = cacheSupplier;
-    }
-
-    public Dependency map(final PluginRequest request, DependencyHandler dependencyHandler) {
-        final String pluginId = request.getId();
-
-        String systemId = cacheSupplier.supplyTo(new Transformer<String, PersistentIndexedCache<PluginRequest, String>>() {
-            public String transform(PersistentIndexedCache<PluginRequest, String> cache) {
-                return doCacheAwareSearch(request, pluginId, cache);
-            }
-        });
-
-        if (systemId.equals(NOT_FOUND)) {
-            return null;
-        } else {
-            return dependencyHandler.create(systemId + ":" + request.getVersion());
-        }
-    }
-
-    private String doCacheAwareSearch(PluginRequest request, String pluginId, PersistentIndexedCache<PluginRequest, String> indexedCache) {
-        String cached = indexedCache.get(request);
-        if (cached != null) {
-            return cached;
-        }
-
-        Bintray bintrayClient = createBintrayClient();
-        List<Pkg> results = bintrayClient.
-                subject(GRADLE_PLUGINS_ORG).
-                repository(GRADLE_PLUGINS_REPO).
-                searchForPackage().
-                byAttributeName(PLUGIN_ID_ATTRIBUTE_NAME).
-                equals(pluginId).
-                search();
-
-        String systemId;
-
-        if (results.isEmpty()) {
-            systemId = NOT_FOUND;
-        } else if (request.getVersion() == null) {
-            throw new InvalidPluginRequestException(String.format("No version number supplied for plugin '%s'. A version number must be supplied for plugins resolved from '%s'.", pluginId, getBintrayRepoUrl()));
-        } else if (results.size() > 1) {
-            throw new InvalidPluginRequestException("Found more than one plugin for plugin id " + pluginId);
-        } else {
-            Pkg pluginPackage = results.get(0);
-            List<String> systemIds = pluginPackage.systemIds();
-            if (systemIds.isEmpty()) {
-                throw new InvalidPluginRequestException("No artifacts in maven layout found for plugin id" + pluginId);
-            }
-
-            systemId = systemIds.get(0);
-        }
-
-        indexedCache.put(request, systemId);
-        return systemId;
-    }
-
-    private Bintray createBintrayClient() {
-        String override = System.getProperty(BINTRAY_API_OVERRIDE_URL_PROPERTY);
-        if (override == null) {
-            return BintrayClient.create();
-        } else {
-            return BintrayClient.create(override, null, null);
-        }
-    }
-
-    public String getBintrayRepoUrl() {
-        return String.format("https://bintray.com/%s/%s", GRADLE_PLUGINS_ORG, GRADLE_PLUGINS_REPO);
-    }
-
-}
-
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ModuleMappingPluginResolver.java b/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ModuleMappingPluginResolver.java
deleted file mode 100644
index 8e3063b2164f..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ModuleMappingPluginResolver.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.resolve.internal;
-
-import org.gradle.api.Action;
-import org.gradle.api.Nullable;
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.dsl.DependencyHandler;
-import org.gradle.api.artifacts.dsl.RepositoryHandler;
-import org.gradle.api.internal.artifacts.DependencyResolutionServices;
-import org.gradle.internal.Factory;
-import org.gradle.internal.classpath.ClassPath;
-import org.gradle.internal.reflect.Instantiator;
-
-public abstract class ModuleMappingPluginResolver implements PluginResolver {
-
-    private final String name;
-    private final DependencyResolutionServices dependencyResolutionServices;
-    private final Instantiator instantiator;
-    private final Mapper mapper;
-    private Action<? super RepositoryHandler> repositoriesConfigurer;
-
-    public interface Mapper {
-        @Nullable
-        Dependency map(PluginRequest request, DependencyHandler dependencyHandler);
-    }
-
-    public ModuleMappingPluginResolver(String name, DependencyResolutionServices dependencyResolutionServices, Instantiator instantiator, Mapper mapper, Action<? super RepositoryHandler> repositoriesConfigurer) {
-        this.name = name;
-        this.dependencyResolutionServices = dependencyResolutionServices;
-        this.instantiator = instantiator;
-        this.mapper = mapper;
-        this.repositoriesConfigurer = repositoriesConfigurer;
-    }
-
-    public PluginResolution resolve(final PluginRequest pluginRequest) {
-        final Dependency dependency = mapper.map(pluginRequest, dependencyResolutionServices.getDependencyHandler());
-        if (dependency == null) {
-            return null;
-        } else {
-            // TODO the dependency resolution config of this guy needs to be externalized
-            Factory<ClassPath> classPathFactory = new DependencyResolvingClasspathProvider(dependencyResolutionServices, dependency, repositoriesConfigurer);
-
-            return new ClassPathPluginResolution(instantiator, pluginRequest.getId(), classPathFactory);
-        }
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getName() + "[" + name + "]";
-    }
-
-    public abstract String getDescriptionForNotFoundMessage();
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequestSerializer.java b/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequestSerializer.java
deleted file mode 100644
index 6921d4d3fcba..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequestSerializer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.resolve.internal;
-
-import org.gradle.messaging.serialize.Decoder;
-import org.gradle.messaging.serialize.Encoder;
-import org.gradle.messaging.serialize.Serializer;
-
-public class PluginRequestSerializer implements Serializer<PluginRequest> {
-
-    public PluginRequest read(Decoder decoder) throws Exception {
-        return new DefaultPluginRequest(decoder.readString(), decoder.readNullableString());
-    }
-
-    public void write(Encoder encoder, PluginRequest value) throws Exception {
-        encoder.writeString(value.getId());
-        encoder.writeNullableString(value.getVersion());
-    }
-
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependenciesSpec.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependenciesSpec.java
new file mode 100644
index 000000000000..55ec582cf2b3
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependenciesSpec.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use;
+
+import org.gradle.api.Incubating;
+
+/**
+ * The DSL for declaring plugin dependencies.
+ * <p>
+ * The <code>plugins { }</code> script block delegates to this type.
+ * Moreover, the only code that is allowed during a <code>plugins { }</code> script block is <i>direct</i> usage of this API.
+ * That is, only the methods of this type can be called on only with <i>literal</i> string arguments.
+ */
+// TODO expand on this Javadoc by pointing to userguide chapter on plugin mechanism when added
+@Incubating
+public interface PluginDependenciesSpec {
+
+    /**
+     * Add a dependency on the plugin with the given id.
+     * <p>
+     * <pre>
+     * plugins {
+     *     id "org.company.myplugin"
+     * }
+     * </pre>
+     * Further constraints (e.g. version number) can be specified by the methods of the return value.
+     * <pre>
+     * plugins {
+     *     id "org.company.myplugin" version "1.3"
+     * }
+     * </pre>
+     *
+     * @param id the id of the plugin to depend on
+     * @return a mutable plugin dependency specification that can be used to further refine the dependency
+     */
+    PluginDependencySpec id(String id);
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependencySpec.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependencySpec.java
new file mode 100644
index 000000000000..c92400db6ee2
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/PluginDependencySpec.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use;
+
+import org.gradle.api.Incubating;
+import org.gradle.api.Nullable;
+
+/**
+ * A mutable specification of a dependency on a plugin.
+ *
+ * @see PluginDependenciesSpec
+ */
+@Incubating
+public interface PluginDependencySpec {
+
+    /**
+     * Specify the version of the plugin to depend on.
+     * <p>
+     * <pre>
+     * plugins {
+     *     id "org.company.myplugin" version "1.0"
+     * }
+     * </pre>
+     * <p>
+     * By default, dependencies have no (i.e. {@code null}) version.
+     * If no version is specified, plugin resolvers may infer the version.
+     * For example, “core” (e.g. {@code org.gradle.java}) plugins are always versioned with the Gradle platform.
+     * As such, they are required not to have a version number.
+     *
+     * @param version the version string ({@code null} for no specified version, which is the default)
+     */
+    void version(@Nullable String version);
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DefaultPluginRequest.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/DefaultPluginRequest.java
similarity index 62%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DefaultPluginRequest.java
rename to subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/DefaultPluginRequest.java
index db0c2bd8ca6f..86ac3e2238d3 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/DefaultPluginRequest.java
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/DefaultPluginRequest.java
@@ -14,24 +14,30 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.internal;
+
+import org.gradle.groovy.scripts.ScriptSource;
+import org.gradle.plugin.internal.PluginId;
 
 public class DefaultPluginRequest implements PluginRequest {
 
-    private final String id;
+    private final PluginId id;
     private final String version;
+    private final int lineNumber;
+    private final ScriptSource scriptSource;
 
-    public DefaultPluginRequest(String id) {
-        this.id = id;
-        this.version = null;
+    public DefaultPluginRequest(String id, String version, int lineNumber, ScriptSource scriptSource) {
+        this(PluginId.of(id), version, lineNumber, scriptSource);
     }
 
-    public DefaultPluginRequest(String id, String version) {
+    public DefaultPluginRequest(PluginId id, String version, int lineNumber, ScriptSource scriptSource) {
         this.id = id;
         this.version = version;
+        this.lineNumber = lineNumber;
+        this.scriptSource = scriptSource;
     }
 
-    public String getId() {
+    public PluginId getId() {
         return id;
     }
 
@@ -39,15 +45,27 @@ public String getVersion() {
         return version;
     }
 
+    public int getLineNumber() {
+        return lineNumber;
+    }
+
+    public ScriptSource getScriptSource() {
+        return scriptSource;
+    }
+
     @Override
     public String toString() {
         if (version == null) {
-            return String.format("[plugin: '%s']", id);
+            return String.format("[id: '%s']", id);
         } else {
-            return String.format("[plugin: '%s', version: '%s']", id, version);
+            return String.format("[id: '%s', version: '%s']", id, version);
         }
     }
 
+    public String getDisplayName() {
+        return toString();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -75,4 +93,6 @@ public int hashCode() {
         result = 31 * result + (version != null ? version.hashCode() : 0);
         return result;
     }
+
+
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/InvalidPluginRequestException.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/InvalidPluginRequestException.java
similarity index 71%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/InvalidPluginRequestException.java
rename to subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/InvalidPluginRequestException.java
index 2c82e5b08078..58e6d2f9b811 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/InvalidPluginRequestException.java
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/InvalidPluginRequestException.java
@@ -14,12 +14,19 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.internal;
 
 import org.gradle.api.GradleException;
 
 public class InvalidPluginRequestException extends GradleException {
-    public InvalidPluginRequestException(String message) {
+    private final PluginRequest pluginRequest;
+
+    public InvalidPluginRequestException(PluginRequest pluginRequest, String message) {
         super(message);
+        this.pluginRequest = pluginRequest;
+    }
+
+    public PluginRequest getPluginRequest() {
+        return pluginRequest;
     }
-}
+}
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginDependenciesService.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginDependenciesService.java
new file mode 100644
index 000000000000..16e3de292123
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginDependenciesService.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.internal;
+
+import org.gradle.api.Transformer;
+import org.gradle.groovy.scripts.ScriptSource;
+import org.gradle.plugin.internal.PluginId;
+import org.gradle.plugin.use.PluginDependenciesSpec;
+import org.gradle.plugin.use.PluginDependencySpec;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.gradle.util.CollectionUtils.collect;
+
+/**
+ * The real delegate of the plugins {} block.
+ *
+ * The PluginUseScriptBlockTransformer interacts with this type.
+ */
+public class PluginDependenciesService {
+
+    private final ScriptSource scriptSource;
+
+    public PluginDependenciesService(ScriptSource scriptSource) {
+        this.scriptSource = scriptSource;
+    }
+
+    private static class DependencySpecImpl implements PluginDependencySpec {
+        private final PluginId id;
+        private String version;
+        private final int lineNumber;
+
+        private DependencySpecImpl(String id, int lineNumber) {
+            this.id = PluginId.of(id);
+            this.lineNumber = lineNumber;
+        }
+
+        public void version(String version) {
+            this.version = version;
+        }
+    }
+
+    private final List<DependencySpecImpl> specs = new LinkedList<DependencySpecImpl>();
+
+    public PluginDependenciesSpec createSpec(final int lineNumber) {
+        return new PluginDependenciesSpec() {
+            public PluginDependencySpec id(String id) {
+                DependencySpecImpl spec = new DependencySpecImpl(id, lineNumber);
+                specs.add(spec);
+                return spec;
+            }
+        };
+    }
+
+    public List<PluginRequest> getRequests() {
+        return collect(specs, new Transformer<PluginRequest, DependencySpecImpl>() {
+            public PluginRequest transform(DependencySpecImpl original) {
+                return new DefaultPluginRequest(original.id, original.version, original.lineNumber, scriptSource);
+            }
+        });
+    }
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequest.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequest.java
similarity index 74%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequest.java
rename to subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequest.java
index 97ff8dcbdc5c..6cefc99fa8cd 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRequest.java
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequest.java
@@ -14,20 +14,22 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.internal;
 
-import org.gradle.api.Incubating;
 import org.gradle.api.Nullable;
+import org.gradle.groovy.scripts.ScriptSource;
+import org.gradle.plugin.internal.PluginId;
 
-/**
- * Represents a request for a plugin.
- */
-@Incubating
 public interface PluginRequest {
 
-    String getId();
+    PluginId getId();
 
     @Nullable
     String getVersion();
 
+    int getLineNumber();
+
+    ScriptSource getScriptSource();
+
+    String getDisplayName();
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/ComponentMetaDataArtifact.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestApplicator.java
similarity index 77%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/ComponentMetaDataArtifact.java
rename to subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestApplicator.java
index f9d42d9b6536..9ce3a2aeecf2 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/resolution/ComponentMetaDataArtifact.java
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestApplicator.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.artifacts.resolution;
 
-import org.gradle.api.artifacts.resolution.SoftwareArtifact;
+package org.gradle.plugin.use.internal;
 
-public interface ComponentMetaDataArtifact extends SoftwareArtifact {
+// Implementation is provided by 'plugin-use' module
+public interface PluginRequestApplicator {
+    void applyPlugin(PluginRequest request);
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestApplicatorFactory.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestApplicatorFactory.java
new file mode 100644
index 000000000000..766dbeb55261
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginRequestApplicatorFactory.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.internal;
+
+import org.gradle.api.plugins.PluginAware;
+
+public interface PluginRequestApplicatorFactory {
+
+    PluginRequestApplicator createRequestApplicator(PluginAware target);
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginUseScriptBlockTransformer.java b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginUseScriptBlockTransformer.java
new file mode 100644
index 000000000000..0a444174b291
--- /dev/null
+++ b/subprojects/core/src/main/groovy/org/gradle/plugin/use/internal/PluginUseScriptBlockTransformer.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.internal;
+
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.expr.*;
+import org.codehaus.groovy.ast.stmt.BlockStatement;
+import org.codehaus.groovy.ast.stmt.ExpressionStatement;
+import org.codehaus.groovy.ast.stmt.Statement;
+import org.codehaus.groovy.control.SourceUnit;
+import org.gradle.groovy.scripts.internal.RestrictiveCodeVisitor;
+import org.gradle.groovy.scripts.internal.ScriptBlock;
+import org.gradle.plugin.internal.InvalidPluginIdException;
+import org.gradle.plugin.internal.PluginId;
+
+public class PluginUseScriptBlockTransformer {
+
+    public static final String INVALID_ARGUMENT_LIST = "argument list must be exactly 1 literal non empty string";
+    public static final String BASE_MESSAGE = "only id(String) method calls allowed in plugins {} script block";
+    public static final String VERSION_MESSAGE = "only version(String) method calls allowed in plugins {} script block";
+    private static final String NOT_LITERAL_METHOD_NAME = "method name must be literal (i.e. not a variable)";
+    private static final String NOT_LITERAL_ID_METHOD_NAME = BASE_MESSAGE + " - " + NOT_LITERAL_METHOD_NAME;
+
+    private final String servicesFieldName;
+    private final Class<?> serviceClass;
+
+    public PluginUseScriptBlockTransformer(String servicesFieldName, Class<?> serviceClass) {
+        this.servicesFieldName = servicesFieldName;
+        this.serviceClass = serviceClass;
+    }
+
+    public Statement transform(SourceUnit sourceUnit, ScriptBlock scriptBlock) {
+        ClosureExpression closureArg = scriptBlock.getClosureExpression();
+
+        PropertyExpression servicesProperty = new PropertyExpression(VariableExpression.THIS_EXPRESSION, servicesFieldName);
+        final MethodCallExpression getServiceMethodCall = new MethodCallExpression(servicesProperty, "get",
+                new ArgumentListExpression(
+                        new ClassExpression(new ClassNode(serviceClass))
+                )
+        );
+
+        // Remove access to any surrounding context
+        Expression hydrateMethodCall = new MethodCallExpression(closureArg, "rehydrate", new ArgumentListExpression(
+                getServiceMethodCall, ConstantExpression.NULL, ConstantExpression.NULL
+        ));
+
+        Expression closureCall = new MethodCallExpression(hydrateMethodCall, "call", ArgumentListExpression.EMPTY_ARGUMENTS);
+
+        closureArg.getCode().visit(new RestrictiveCodeVisitor(sourceUnit, BASE_MESSAGE) {
+
+            @Override
+            public void visitBlockStatement(BlockStatement block) {
+                for (Statement statement : block.getStatements()) {
+                    statement.visit(this);
+                }
+            }
+
+            @Override
+            public void visitMethodCallExpression(MethodCallExpression call) {
+                if (!call.isImplicitThis()) {
+                    Expression target = call.getObjectExpression();
+                    if (!(target instanceof MethodCallExpression)) {
+                        restrict(target, BASE_MESSAGE);
+                        return;
+                    }
+
+                    visitMethodCallExpression((MethodCallExpression) target);
+                }
+
+                if (call.getMethod() instanceof ConstantExpression) {
+                    ConstantExpression methodName = (ConstantExpression) call.getMethod();
+                    if (isString(methodName)) {
+                        String methodNameText = methodName.getText();
+                        if (methodNameText.equals("id") || methodNameText.equals("version")) {
+                            ConstantExpression argumentExpression = hasSingleConstantStringArg(call);
+                            if (argumentExpression == null) {
+                                return;
+                            }
+
+                            String argStringValue = argumentExpression.getValue().toString();
+                            if (argStringValue.length() == 0) {
+                                restrict(argumentExpression, INVALID_ARGUMENT_LIST);
+                                return;
+                            }
+
+                            if (methodName.getText().equals("id")) {
+                                if (call.isImplicitThis()) {
+                                    try {
+                                        PluginId.validate(argStringValue);
+                                        call.setObjectExpression(new MethodCallExpression(new VariableExpression("this"), "createSpec", new ConstantExpression(call.getLineNumber(), true)));
+                                        call.setImplicitThis(false);
+                                    } catch (InvalidPluginIdException e) {
+                                        restrict(argumentExpression, e.getReason());
+                                    }
+                                } else {
+                                    restrict(call, BASE_MESSAGE);
+                                }
+                            }
+
+                            if (methodName.getText().equals("version")) {
+                                Expression objectExpression = call.getObjectExpression();
+                                if (!(objectExpression instanceof MethodCallExpression)) {
+                                    restrict(call, BASE_MESSAGE);
+                                }
+                            }
+                        } else {
+                            if (!call.isImplicitThis()) {
+                                restrict(methodName, VERSION_MESSAGE);
+                            } else {
+                                restrict(methodName, BASE_MESSAGE);
+                            }
+                        }
+                    } else {
+                        restrict(methodName, NOT_LITERAL_ID_METHOD_NAME);
+                    }
+                } else {
+                    restrict(call);
+                }
+            }
+
+            private ConstantExpression hasSingleConstantStringArg(MethodCallExpression call) {
+                ArgumentListExpression argumentList = (ArgumentListExpression) call.getArguments();
+                if (argumentList.getExpressions().size() == 1) {
+                    Expression argumentExpression = argumentList.getExpressions().get(0);
+                    if (argumentExpression instanceof ConstantExpression) {
+                        ConstantExpression constantArgumentExpression = (ConstantExpression) argumentExpression;
+                        if (isString(constantArgumentExpression)) {
+                            return constantArgumentExpression;
+                        } else {
+                            restrict(constantArgumentExpression, INVALID_ARGUMENT_LIST);
+                        }
+                    } else {
+                        restrict(argumentExpression, INVALID_ARGUMENT_LIST);
+                    }
+                } else {
+                    restrict(argumentList, INVALID_ARGUMENT_LIST);
+                }
+
+                return null;
+            }
+
+            private boolean isString(ConstantExpression constantExpression) {
+                return constantExpression.getType().getName().equals(String.class.getName());
+            }
+
+            @Override
+            public void visitExpressionStatement(ExpressionStatement statement) {
+                statement.getExpression().visit(this);
+            }
+        });
+
+        return new ExpressionStatement(closureCall);
+    }
+
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/profile/ProfileEventAdapter.java b/subprojects/core/src/main/groovy/org/gradle/profile/ProfileEventAdapter.java
index f28693cc3df6..f3237ec53c42 100644
--- a/subprojects/core/src/main/groovy/org/gradle/profile/ProfileEventAdapter.java
+++ b/subprojects/core/src/main/groovy/org/gradle/profile/ProfileEventAdapter.java
@@ -27,13 +27,14 @@
 import org.gradle.api.initialization.Settings;
 import org.gradle.api.invocation.Gradle;
 import org.gradle.api.tasks.TaskState;
+import org.gradle.initialization.BuildCompletionListener;
 import org.gradle.initialization.BuildRequestMetaData;
 import org.gradle.internal.TimeProvider;
 
 /**
  * Adapts various events to build a {@link BuildProfile} model, and then notifies a {@link ReportGeneratingProfileListener} when the model is ready.
  */
-public class ProfileEventAdapter implements BuildListener, ProjectEvaluationListener, TaskExecutionListener, DependencyResolutionListener {
+public class ProfileEventAdapter implements BuildListener, ProjectEvaluationListener, TaskExecutionListener, DependencyResolutionListener, BuildCompletionListener {
     private final BuildRequestMetaData buildMetaData;
     private final TimeProvider timeProvider;
     private final ProfileListener listener;
@@ -64,8 +65,11 @@ public void projectsLoaded(Gradle gradle) {
     public void projectsEvaluated(Gradle gradle) {}
 
     public void buildFinished(BuildResult result) {
-        buildProfile.setBuildFinished(timeProvider.getCurrentTime());
         buildProfile.setSuccessful(result.getFailure() == null);
+    }
+
+    public void completed() {
+        buildProfile.setBuildFinished(timeProvider.getCurrentTime());
         try {
             listener.buildFinished(buildProfile);
         } finally {
diff --git a/subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/ProjectBuilderImpl.java b/subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/ProjectBuilderImpl.java
index 047c0af2b9d6..a6676be82ee2 100644
--- a/subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/ProjectBuilderImpl.java
+++ b/subprojects/core/src/main/groovy/org/gradle/testfixtures/internal/ProjectBuilderImpl.java
@@ -23,6 +23,7 @@
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.file.TemporaryFileProvider;
 import org.gradle.api.internal.file.TmpDirTemporaryFileProvider;
+import org.gradle.api.internal.initialization.ClassLoaderScope;
 import org.gradle.api.internal.project.DefaultProject;
 import org.gradle.api.internal.project.IProjectFactory;
 import org.gradle.api.internal.project.ProjectInternal;
@@ -58,7 +59,8 @@ public Project createChildProject(String name, Project parent, File projectDir)
                 new StringScriptSource("test build file", null),
                 parentProject.getGradle(),
                 parentProject.getGradle().getServiceRegistryFactory(),
-                parentProject.getClassLoaderScope().createChild()
+                parentProject.getClassLoaderScope().createChild(),
+                parentProject.getBaseClassLoaderScope()
         );
         parentProject.addChildProject(project);
         parentProject.getProjectRegistry().addProject(project);
@@ -78,7 +80,9 @@ public Project createProject(String name, File inputProjectDir) {
 
         DefaultProjectDescriptor projectDescriptor = new DefaultProjectDescriptor(null, name, projectDir, new DefaultProjectDescriptorRegistry(),
                 topLevelRegistry.get(FileResolver.class));
-        ProjectInternal project = topLevelRegistry.get(IProjectFactory.class).createProject(projectDescriptor, null, gradle, gradle.getClassLoaderScope().createSibling());
+        ClassLoaderScope baseScope = gradle.getClassLoaderScope().createSibling();
+        ClassLoaderScope rootProjectScope = baseScope.createSibling();
+        ProjectInternal project = topLevelRegistry.get(IProjectFactory.class).createProject(projectDescriptor, null, gradle, rootProjectScope, baseScope);
 
         gradle.setRootProject(project);
         gradle.setDefaultProject(project);
diff --git a/subprojects/core/src/main/groovy/org/gradle/util/Jvm.java b/subprojects/core/src/main/groovy/org/gradle/util/Jvm.java
deleted file mode 100644
index ff0dcab63f59..000000000000
--- a/subprojects/core/src/main/groovy/org/gradle/util/Jvm.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.util;
-
-import org.gradle.internal.jvm.JavaHomeException;
-import org.gradle.internal.jvm.JavaInfo;
-
-import java.io.File;
-import java.util.Map;
-
-@Deprecated
-public class Jvm implements JavaInfo {
-    private final org.gradle.internal.jvm.Jvm jvm;
-
-    public Jvm(org.gradle.internal.jvm.Jvm current) {
-        this.jvm = current;
-    }
-
-    public static Jvm current() {
-        DeprecationLogger.nagUserOfDeprecated("The class org.gradle.util.Jvm");
-        return new Jvm(org.gradle.internal.jvm.Jvm.current());
-    }
-
-    public File getJavaExecutable() throws JavaHomeException {
-        return jvm.getJavaExecutable();
-    }
-
-    public File getJavadocExecutable() throws JavaHomeException {
-        return jvm.getJavadocExecutable();
-    }
-
-    public File getExecutable(String name) throws JavaHomeException {
-        return jvm.getExecutable(name);
-    }
-
-    public boolean isJava5() {
-        return jvm.getJavaVersion().isJava5();
-    }
-
-    public boolean isJava6() {
-        return jvm.getJavaVersion().isJava6();
-    }
-
-    public boolean isJava7() {
-        return jvm.getJavaVersion().isJava7();
-    }
-
-    public boolean isJava5Compatible() {
-        return jvm.getJavaVersion().isJava5Compatible();
-    }
-
-    public boolean isJava6Compatible() {
-        return jvm.getJavaVersion().isJava6Compatible();
-    }
-
-    public File getJavaHome() {
-        return jvm.getJavaHome();
-    }
-
-    public File getRuntimeJar() {
-        return jvm.getRuntimeJar();
-    }
-
-    public File getToolsJar() {
-        return jvm.getToolsJar();
-    }
-
-    public Map<String, ?> getInheritableEnvironmentVariables(Map<String, ?> envVars) {
-        return jvm.getInheritableEnvironmentVariables(envVars);
-    }
-
-    public boolean isIbmJvm() {
-        return jvm.isIbmJvm();
-    }
-    
-    public String toString(){
-        return jvm.toString();
-    }
-}
diff --git a/subprojects/core/src/main/groovy/org/gradle/util/VersionNumber.java b/subprojects/core/src/main/groovy/org/gradle/util/VersionNumber.java
index 10255ff66ba0..ea6e5bd1db07 100644
--- a/subprojects/core/src/main/groovy/org/gradle/util/VersionNumber.java
+++ b/subprojects/core/src/main/groovy/org/gradle/util/VersionNumber.java
@@ -18,38 +18,47 @@
 
 import com.google.common.base.Objects;
 import com.google.common.collect.Ordering;
-
 import org.gradle.api.Nullable;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
- * Represents, parses, and compares version numbers following a major.minor.micro-qualifier format.
- * The {@link #parse} method handles missing parts and allows "." to be used instead of "-".
+ * Represents, parses, and compares version numbers. Supports a couple of different schemes: <ul> <li>MAJOR.MINOR.MICRO-QUALIFIER (the default).</li> <li>MAJOR.MINOR.MICRO.PATCH-QUALIFIER.</li> </ul>
+ *
+ * <p>The {@link #parse} method handles missing parts and allows "." to be used instead of "-", and "_" to be used instead of "." for the patch number.
+ *
+ * <p>This class considers missing parts to be 0, so that "1.0" == "1.0.0" == "1.0.0_0".</p>
  *
- * <p>Note that this class considers "1.2.3-something" less than "1.2.3". Qualifiers are compared
- * lexicographically ("1.2.3-alpha" < "1.2.3-beta") and case-insensitive ("1.2.3-alpha" < "1.2.3.RELEASE").
+ * <p>Note that this class considers "1.2.3-something" less than "1.2.3". Qualifiers are compared lexicographically ("1.2.3-alpha" < "1.2.3-beta") and case-insensitive ("1.2.3-alpha" <
+ * "1.2.3.RELEASE").
  *
- * <p>To check if a version number is at least "1.2.3", disregarding a potential qualifier like "beta", use
- * {@code version.getBaseVersion().compareTo(VersionNumber.parse("1.2.3")) >= 0}.
+ * <p>To check if a version number is at least "1.2.3", disregarding a potential qualifier like "beta", use {@code version.getBaseVersion().compareTo(VersionNumber.parse("1.2.3")) >= 0}.
  */
 public class VersionNumber implements Comparable<VersionNumber> {
-    public static final VersionNumber UNKNOWN = new VersionNumber(0, 0, 0, null);
-
-    private static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)(?:\\.(\\d+))?+(?:\\.(\\d+))?+(?:[-\\.](.+))?");
-    private static final String VERSION_TEMPLATE = "%d.%d.%d%s";
+    private static final DefaultScheme DEFAULT_SCHEME = new DefaultScheme();
+    private static final SchemeWithPatchVersion PATCH_SCHEME = new SchemeWithPatchVersion();
+    public static final VersionNumber UNKNOWN = version(0);
 
     private final int major;
     private final int minor;
     private final int micro;
+    private final int patch;
     private final String qualifier;
+    private final AbstractScheme scheme;
 
     public VersionNumber(int major, int minor, int micro, @Nullable String qualifier) {
+        this(major, minor, micro, 0, qualifier, DEFAULT_SCHEME);
+    }
+
+    public VersionNumber(int major, int minor, int micro, int patch, @Nullable String qualifier) {
+        this(major, minor, micro, patch, qualifier, PATCH_SCHEME);
+    }
+
+    private VersionNumber(int major, int minor, int micro, int patch, @Nullable String qualifier, AbstractScheme scheme) {
         this.major = major;
         this.minor = minor;
         this.micro = micro;
+        this.patch = patch;
         this.qualifier = qualifier;
+        this.scheme = scheme;
     }
 
     public int getMajor() {
@@ -64,54 +73,214 @@ public int getMicro() {
         return micro;
     }
 
+    public int getPatch() {
+        return patch;
+    }
+
     public String getQualifier() {
         return qualifier;
     }
 
     public VersionNumber getBaseVersion() {
-        return new VersionNumber(major, minor, micro, null);
+        return new VersionNumber(major, minor, micro, patch, null, scheme);
     }
 
     public int compareTo(VersionNumber other) {
-        if (major != other.major) { return major - other.major; }
-        if (minor != other.minor) { return minor - other.minor; }
-        if (micro != other.micro) { return micro - other.micro; }
+        if (major != other.major) {
+            return major - other.major;
+        }
+        if (minor != other.minor) {
+            return minor - other.minor;
+        }
+        if (micro != other.micro) {
+            return micro - other.micro;
+        }
+        if (patch != other.patch) {
+            return patch - other.patch;
+        }
         return Ordering.natural().nullsLast().compare(toLowerCase(qualifier), toLowerCase(other.qualifier));
     }
 
     public boolean equals(Object other) {
-        return other instanceof VersionNumber && compareTo((VersionNumber)other) == 0;
+        return other instanceof VersionNumber && compareTo((VersionNumber) other) == 0;
     }
 
     public int hashCode() {
         int result = major;
         result = 31 * result + minor;
         result = 31 * result + micro;
+        result = 31 * result + patch;
         result = 31 * result + Objects.hashCode(qualifier);
         return result;
     }
 
     public String toString() {
-        return String.format(VERSION_TEMPLATE, major, minor, micro, qualifier == null ? "" : "-" + qualifier);
+        return scheme.format(this);
     }
 
-    public static VersionNumber parse(String versionString) {
-        if (versionString == null) { return UNKNOWN; }
-        Matcher m = VERSION_PATTERN.matcher(versionString);
-        if (!m.matches()) { return UNKNOWN; }
+    public static VersionNumber version(int major) {
+        return new VersionNumber(major, 0, 0, 0, null, DEFAULT_SCHEME);
+    }
 
-        int major = Integer.valueOf(m.group(1));
-        String minorString = m.group(2);
-        int minor = minorString == null ? 0 : Integer.valueOf(minorString);
-        String microString = m.group(3);
-        int micro = microString == null ? 0 : Integer.valueOf(microString);
-        String qualifier = m.group(4);
+    /**
+     * Returns the default MAJOR.MINOR.MICRO-QUALIFIER scheme.
+     */
+    public static Scheme scheme() {
+        return DEFAULT_SCHEME;
+    }
+
+    /**
+     * Returns the MAJOR.MINOR.MICRO.PATCH-QUALIFIER scheme.
+     */
+    public static Scheme withPatchNumber() {
+        return PATCH_SCHEME;
+    }
 
-        return new VersionNumber(major, minor, micro, qualifier);
+    public static VersionNumber parse(String versionString) {
+        return DEFAULT_SCHEME.parse(versionString);
     }
 
     private String toLowerCase(@Nullable String string) {
         return string == null ? null : string.toLowerCase();
     }
+
+    public interface Scheme {
+        public VersionNumber parse(String value);
+
+        public String format(VersionNumber versionNumber);
+    }
+
+    private abstract static class AbstractScheme implements Scheme {
+        final int depth;
+
+        protected AbstractScheme(int depth) {
+            this.depth = depth;
+        }
+
+        public VersionNumber parse(String versionString) {
+            if (versionString == null || versionString.length() == 0) {
+                return UNKNOWN;
+            }
+            Scanner scanner = new Scanner(versionString);
+
+            int major = 0;
+            int minor = 0;
+            int micro = 0;
+            int patch = 0;
+
+            if (!scanner.hasDigit()) {
+                return UNKNOWN;
+            }
+            major = scanner.scanDigit();
+            if (scanner.isSeparatorAndDigit('.')) {
+                scanner.skipSeparator();
+                minor = scanner.scanDigit();
+                if (scanner.isSeparatorAndDigit('.')) {
+                    scanner.skipSeparator();
+                    micro = scanner.scanDigit();
+                    if (depth > 3 && scanner.isSeparatorAndDigit('.', '_')) {
+                        scanner.skipSeparator();
+                        patch = scanner.scanDigit();
+                    }
+                }
+            }
+
+            if (scanner.isEnd()) {
+                return new VersionNumber(major, minor, micro, patch, null, this);
+            }
+
+            if (scanner.isQualifier()) {
+                scanner.skipSeparator();
+                return new VersionNumber(major, minor, micro, patch, scanner.remainder(), this);
+            }
+
+            return UNKNOWN;
+        }
+
+        private static class Scanner {
+            int pos;
+            final String str;
+
+            private Scanner(String string) {
+                this.str = string;
+            }
+
+            boolean hasDigit() {
+                return pos < str.length() && Character.isDigit(str.charAt(pos));
+            }
+
+            boolean isSeparatorAndDigit(char... separators) {
+                return pos < str.length() - 1 && oneOf(separators) && Character.isDigit(str.charAt(pos + 1));
+            }
+
+            private boolean oneOf(char... separators) {
+                char current = str.charAt(pos);
+                for (int i = 0; i < separators.length; i++) {
+                    char separator = separators[i];
+                    if (current == separator) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+
+            boolean isQualifier() {
+                return pos < str.length() - 1 && oneOf('.', '-');
+            }
+
+            int scanDigit() {
+                int start = pos;
+                while (hasDigit()) {
+                    pos++;
+                }
+                return Integer.parseInt(str.substring(start, pos));
+            }
+
+            public boolean isEnd() {
+                return pos == str.length();
+            }
+
+            private boolean skip(char ch) {
+                if (pos < str.length() && str.charAt(pos) == ch) {
+                    pos++;
+                    return true;
+                }
+                return false;
+            }
+
+            public void skipSeparator() {
+                pos++;
+            }
+
+            public String remainder() {
+                return pos == str.length() ? null : str.substring(pos);
+            }
+        }
+    }
+
+    private static class DefaultScheme extends AbstractScheme {
+        private static final String VERSION_TEMPLATE = "%d.%d.%d%s";
+
+        public DefaultScheme() {
+            super(3);
+        }
+
+        public String format(VersionNumber versionNumber) {
+            return String.format(VERSION_TEMPLATE, versionNumber.major, versionNumber.minor, versionNumber.micro, versionNumber.qualifier == null ? "" : "-" + versionNumber.qualifier);
+        }
+    }
+
+    private static class SchemeWithPatchVersion extends AbstractScheme {
+        private static final String VERSION_TEMPLATE = "%d.%d.%d.%d%s";
+
+        private SchemeWithPatchVersion() {
+            super(4);
+        }
+
+        public String format(VersionNumber versionNumber) {
+            return String.format(VERSION_TEMPLATE, versionNumber.major, versionNumber.minor, versionNumber.micro, versionNumber.patch, versionNumber.qualifier == null ? "" : "-" + versionNumber.qualifier);
+        }
+    }
+
 }
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/util/WrapUtil.java b/subprojects/core/src/main/groovy/org/gradle/util/WrapUtil.java
index 84588e68bb4c..95f434fb5dfb 100644
--- a/subprojects/core/src/main/groovy/org/gradle/util/WrapUtil.java
+++ b/subprojects/core/src/main/groovy/org/gradle/util/WrapUtil.java
@@ -16,7 +16,11 @@
 package org.gradle.util;
 
 import org.gradle.api.DomainObjectSet;
+import org.gradle.api.Named;
+import org.gradle.api.NamedDomainObjectSet;
 import org.gradle.api.internal.DefaultDomainObjectSet;
+import org.gradle.api.internal.DefaultNamedDomainObjectSet;
+import org.gradle.internal.reflect.DirectInstantiator;
 
 import java.util.*;
 
@@ -41,6 +45,15 @@ public static <T> DomainObjectSet<T> toDomainObjectSet(Class<T> type, T... items
         return new DefaultDomainObjectSet<T>(type, toSet(items));
     }
 
+    /**
+     * Wraps the given items in a named domain object set.
+     */
+    public static <T extends Named> NamedDomainObjectSet<T> toNamedDomainObjectSet(Class<T> type, T... items) {
+        DefaultNamedDomainObjectSet<T> domainObjectSet = new DefaultNamedDomainObjectSet<T>(type, new DirectInstantiator());
+        CollectionUtils.addAll(domainObjectSet, items);
+        return domainObjectSet;
+    }
+
     /**
      * Wraps the given items in a mutable ordered set.
      */
diff --git a/subprojects/core/src/test/groovy/org/gradle/StartParameterTest.groovy b/subprojects/core/src/test/groovy/org/gradle/StartParameterTest.groovy
index 2b4ade303c0c..eea9c1ba02f7 100644
--- a/subprojects/core/src/test/groovy/org/gradle/StartParameterTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/StartParameterTest.groovy
@@ -17,6 +17,7 @@
 package org.gradle
 
 import org.gradle.api.logging.LogLevel
+import org.gradle.internal.DefaultTaskParameter
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.SetSystemProperties
 import org.junit.Rule
@@ -102,6 +103,7 @@ class StartParameterTest extends Specification {
         parameter.logLevel == LogLevel.LIFECYCLE
         parameter.colorOutput
         parameter.taskNames.empty
+        parameter.taskParameters.empty
         parameter.excludedTaskNames.empty
         parameter.projectProperties.isEmpty()
         parameter.systemPropertiesArgs.isEmpty()
@@ -235,6 +237,22 @@ class StartParameterTest extends Specification {
         assertThat(parameter, isSerializable())
     }
 
+    void "considers system properties for null user home dir"() {
+        def gradleUserHome = tmpDir.file("someGradleUserHomePath")
+        System.setProperty(StartParameter.GRADLE_USER_HOME_PROPERTY_KEY, gradleUserHome.absolutePath)
+
+        given:
+        StartParameter parameter = new StartParameter()
+        parameter.gradleUserHomeDir = tmpDir.file("ignore-me")
+
+        when:
+        parameter.gradleUserHomeDir = null
+
+        then:
+        parameter.gradleUserHomeDir == gradleUserHome
+        assertThat(parameter, isSerializable())
+    }
+
     void "creates parameter for new build"() {
         StartParameter parameter = new StartParameter()
 
@@ -276,6 +294,7 @@ class StartParameterTest extends Specification {
         newParameter.recompileScripts == parameter.recompileScripts
 
         newParameter.buildFile == null
+        newParameter.taskParameters.empty
         newParameter.taskNames.empty
         newParameter.excludedTaskNames.empty
         newParameter.currentDir == new File(System.getProperty("user.dir")).getCanonicalFile()
@@ -314,4 +333,33 @@ class StartParameterTest extends Specification {
         then:
         parameter.allInitScripts == [userMainInit, userInit1, userInit2, distroInit1, distroInit2]
     }
+
+    def 'taskNames getter defaults to taskParameters'() {
+        StartParameter parameter = new StartParameter()
+
+        when:
+        parameter.taskParameters = [ new DefaultTaskParameter('a'), new DefaultTaskParameter('b') ]
+
+        then:
+        parameter.taskNames == [ 'a', 'b' ]
+        parameter.taskParameters == [ new DefaultTaskParameter('a'), new DefaultTaskParameter('b') ]
+    }
+
+    def 'taskNames setter defaults to taskParameters'() {
+        StartParameter parameter = new StartParameter()
+
+        when:
+        parameter.taskNames = [ 'a', 'b' ]
+
+        then:
+        parameter.taskNames == [ 'a', 'b' ]
+        parameter.taskParameters == [ new DefaultTaskParameter('a'), new DefaultTaskParameter('b') ]
+
+        when:
+        parameter.taskNames = null
+
+        then:
+        parameter.taskNames == []
+        parameter.taskParameters == []
+    }
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractClassGeneratorTestGroovy.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractClassGeneratorTestGroovy.groovy
index 26c24dda5345..6cbf0387306a 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractClassGeneratorTestGroovy.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractClassGeneratorTestGroovy.groovy
@@ -21,6 +21,19 @@ class AbstractClassGeneratorTestGroovy {
     public static class BeanWithGroovyBoolean {
         boolean smallB
         Boolean bigB
+        Boolean mixedB
+
+        boolean getMixedB() { mixedB }
+
+        Boolean isMixedB() { mixedB }
+
+        void setMixedB(Boolean mixedB) {
+            this.mixedB = mixedB
+        }
+
+        void setMixedB(boolean mixedB) {
+            this.mixedB = mixedB
+        }
     }
 
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractNamedDomainObjectContainerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractNamedDomainObjectContainerTest.groovy
index 9640f276dccb..a88e5261e8ef 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractNamedDomainObjectContainerTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/AbstractNamedDomainObjectContainerTest.groovy
@@ -103,7 +103,11 @@ class AbstractNamedDomainObjectContainerTest extends Specification {
 
         when:
         container.configure {
-            someObj { unknown { anotherUnknown(2) } }
+            someObj {
+                unknown {
+                    anotherUnknown(2)
+                }
+            }
         }
 
         then:
@@ -180,7 +184,9 @@ class AbstractNamedDomainObjectContainerTest extends Specification {
         container.configure {
             someObj {
                 children {
-                    child1 { prop = 'child1' }
+                    child1 {
+                        prop = 'child1'
+                    }
                     child2
                 }
             }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/AsmBackedClassGeneratorGroovyTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/AsmBackedClassGeneratorGroovyTest.groovy
index 02f5d4c0f9cb..eeca3823e40c 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/AsmBackedClassGeneratorGroovyTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/AsmBackedClassGeneratorGroovyTest.groovy
@@ -20,11 +20,14 @@ import org.gradle.api.Action
 import org.gradle.api.NonExtensible
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.internal.reflect.DirectInstantiator
+import org.gradle.internal.service.ServiceRegistry
 import org.gradle.internal.typeconversion.TypeConversionException
 import org.gradle.util.ConfigureUtil
 import spock.lang.Issue
 import spock.lang.Specification
 
+import javax.inject.Inject
+
 class AsmBackedClassGeneratorGroovyTest extends Specification {
 
     def generator = new AsmBackedClassGenerator()
@@ -228,7 +231,6 @@ class AsmBackedClassGeneratorGroovyTest extends Specification {
         i.calledWith == Integer
     }
 
-
     def "can use non extensible objects"() {
         def i = create(NonExtensibleObject)
 
@@ -272,6 +274,46 @@ class AsmBackedClassGeneratorGroovyTest extends Specification {
         then:
         obj.callsPrivateStringMethodWithGString("$foo") == "BAR"
     }
+
+    def "can inject service using a service getter method"() {
+        given:
+        def services = Mock(ServiceRegistry)
+        def service = Mock(Runnable)
+        _ * services.get(Runnable) >> service
+
+        when:
+        def obj = create(BeanWithServices, services)
+
+        then:
+        obj.thing == service
+        obj.getThing() == service
+        obj.getProperty("thing") == service
+    }
+
+    def "service lookup is lazy and the result is cached"() {
+        given:
+        def services = Mock(ServiceRegistry)
+        def service = Mock(Runnable)
+
+        when:
+        def obj = create(BeanWithServices, services)
+
+        then:
+        0 * services._
+
+        when:
+        obj.thing
+
+        then:
+        1 * services.get(Runnable) >> service
+        0 * services._
+
+        when:
+        obj.thing
+
+        then:
+        0 * services._
+    }
 }
 
 enum TestEnum {
@@ -426,3 +468,14 @@ class CallsPrivateMethods {
         str.toUpperCase()
     }
 }
+
+class BeanWithServices {
+    ServiceRegistry services
+
+    BeanWithServices(ServiceRegistry services) {
+        this.services = services
+    }
+
+    @Inject
+    Runnable getThing() { throw new UnsupportedOperationException() }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/AsmBackedClassGeneratorTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/AsmBackedClassGeneratorTest.java
index 844b60777656..b5c50a46c270 100755
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/AsmBackedClassGeneratorTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/AsmBackedClassGeneratorTest.java
@@ -33,18 +33,19 @@
 import javax.inject.Inject;
 import java.io.IOException;
 import java.lang.reflect.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.concurrent.Callable;
 
+import static org.gradle.api.internal.AbstractClassGeneratorTestGroovy.BeanWithGroovyBoolean;
+import static org.gradle.util.Matchers.isEmpty;
 import static org.gradle.util.TestUtil.TEST_CLOSURE;
 import static org.gradle.util.TestUtil.call;
-import static org.gradle.util.Matchers.isEmpty;
 import static org.gradle.util.WrapUtil.toList;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-import static org.gradle.api.internal.AbstractClassGeneratorTestGroovy.*;
-
 public class AsmBackedClassGeneratorTest {
     private final AbstractClassGenerator generator = new AsmBackedClassGenerator();
 
@@ -319,7 +320,7 @@ public void reportsConstructionFailure() {
     }
 
     @Test
-    public void appliesConventionMappingToEachGetter() throws Exception {
+    public void appliesConventionMappingToEachProperty() throws Exception {
         Class<? extends Bean> generatedClass = generator.generate(Bean.class);
         assertTrue(IConventionAware.class.isAssignableFrom(generatedClass));
         Bean bean = generatedClass.newInstance();
@@ -342,6 +343,85 @@ public String call() {
         assertThat(bean.getProp(), nullValue());
     }
 
+    @Test
+    public void appliesConventionMappingToPropertyWithMultipleSetters() throws Exception {
+        BeanWithVariousGettersAndSetters bean = generator.newInstance(BeanWithVariousGettersAndSetters.class);
+        new DslObject(bean).getConventionMapping().map("overloaded", new Callable<String>() {
+            public String call() {
+                return "conventionValue";
+            }
+        });
+
+        assertThat(bean.getOverloaded(), equalTo("conventionValue"));
+
+        bean.setOverloaded("value");
+        assertThat(bean.getOverloaded(), equalTo("chars = value"));
+
+        bean = generator.newInstance(BeanWithVariousGettersAndSetters.class);
+        new DslObject(bean).getConventionMapping().map("overloaded", new Callable<String>() {
+            public String call() {
+                return "conventionValue";
+            }
+        });
+
+        assertThat(bean.getOverloaded(), equalTo("conventionValue"));
+
+        bean.setOverloaded(12);
+        assertThat(bean.getOverloaded(), equalTo("number = 12"));
+
+        bean = generator.newInstance(BeanWithVariousGettersAndSetters.class);
+        new DslObject(bean).getConventionMapping().map("overloaded", new Callable<String>() {
+            public String call() {
+                return "conventionValue";
+            }
+        });
+
+        assertThat(bean.getOverloaded(), equalTo("conventionValue"));
+
+        bean.setOverloaded(true);
+        assertThat(bean.getOverloaded(), equalTo("object = true"));
+    }
+
+    @Test
+    public void appliesConventionMappingToPropertyWithGetterCovariantType() throws Exception {
+        CovariantPropertyTypes bean = generator.newInstance(CovariantPropertyTypes.class);
+
+        new DslObject(bean).getConventionMapping().map("value", new Callable<String>() {
+            public String call() {
+                return "conventionValue";
+            }
+        });
+
+        assertThat(bean.getValue(), equalTo("conventionValue"));
+
+        bean.setValue(12);
+        assertThat(bean.getValue(), equalTo("12"));
+    }
+
+    @Test
+    public void appliesConventionMappingToProtectedMethods() throws Exception {
+        BeanWithNonPublicProperties bean = generator.newInstance(BeanWithNonPublicProperties.class);
+
+        assertThat(bean.getPackageProtected(), equalTo("package-protected"));
+        assertThat(bean.getProtected(), equalTo("protected"));
+        assertThat(bean.getPrivate(), equalTo("private"));
+
+        IConventionAware conventionAware = (IConventionAware) bean;
+        conventionAware.getConventionMapping().map("packageProtected", new Callable<String>() {
+            public String call() {
+                return "1";
+            }
+        });
+        conventionAware.getConventionMapping().map("protected", new Callable<String>() {
+            public String call() {
+                return "2";
+            }
+        });
+
+        assertThat(bean.getPackageProtected(), equalTo("1"));
+        assertThat(bean.getProtected(), equalTo("2"));
+    }
+
     @Test
     @Issue("GRADLE-2163")
     public void appliesConventionMappingToGroovyBoolean() throws Exception {
@@ -350,6 +430,7 @@ public void appliesConventionMappingToGroovyBoolean() throws Exception {
         assertTrue(bean instanceof IConventionAware);
         assertThat(bean.getSmallB(), equalTo(false));
         assertThat(bean.getBigB(), nullValue());
+        assertThat(bean.getMixedB(), equalTo(false));
 
         IConventionAware conventionAware = (IConventionAware) bean;
 
@@ -375,6 +456,15 @@ public Object call() throws Exception {
         assertThat(bean.getBigB(), equalTo(Boolean.TRUE));
         bean.setBigB(Boolean.FALSE);
         assertThat(bean.getBigB(), equalTo(Boolean.FALSE));
+
+        conventionAware.getConventionMapping().map("mixedB", new Callable<Object>() {
+            public Object call() throws Exception {
+                return Boolean.TRUE;
+            }
+        });
+
+        assertThat(bean.getMixedB(), equalTo(true));
+        assertThat(bean.isMixedB(), equalTo(Boolean.TRUE));
     }
 
     @Test
@@ -546,6 +636,10 @@ public void usesExistingGetAsDynamicObjectMethod() throws Exception {
 
         bean.getAsDynamicObject().setProperty("dynamicProp", "value");
         assertThat(call("{ it.dynamicProp }", bean), equalTo((Object) "value"));
+
+        call("{ it.ext.anotherProp = 12 }", bean);
+        assertThat(bean.getAsDynamicObject().getProperty("anotherProp"), equalTo((Object) 12));
+        assertThat(call("{ it.anotherProp }", bean), equalTo((Object) 12));
     }
 
     @Test
@@ -570,6 +664,18 @@ public void mixesInSetValueMethodForSingleValuedProperty() throws Exception {
 
         call("{ it.primitive 12}", bean);
         assertThat(bean.getPrimitive(), equalTo(12));
+
+        call("{ it.bool true}", bean);
+        assertThat(bean.isBool(), equalTo(true));
+
+        call("{ it.overloaded 'value'}", bean);
+        assertThat(bean.getOverloaded(), equalTo("chars = value"));
+
+        call("{ it.overloaded 12}", bean);
+        assertThat(bean.getOverloaded(), equalTo("number = 12"));
+
+        call("{ it.overloaded true}", bean);
+        assertThat(bean.getOverloaded(), equalTo("object = true"));
     }
 
     @Test
@@ -666,6 +772,10 @@ public void mixesInClosureOverloadForActionMethod() throws Exception {
         bean.prop = "value";
 
         call("{def value; it.doStuff { value = it }; assert value == \'value\' }", bean);
+
+        BeanWithOverriddenMethods subBean = generator.generate(BeanWithOverriddenMethods.class).newInstance();
+
+        call("{def value; it.doStuff { value = it }; assert value == \'overloaded\' }", subBean);
     }
 
     @Test
@@ -700,12 +810,67 @@ public void doStuff(Action<String> action) {
         }
     }
 
+    public static class BeanWithOverriddenMethods extends Bean {
+        @Override
+        public String getProp() {
+            return super.getProp();
+        }
+
+        @Override
+        public void setProp(String prop) {
+            super.setProp(prop);
+        }
+
+        @Override
+        public String doStuff(String value) {
+            return super.doStuff(value);
+        }
+
+        @Override
+        public void doStuff(Action<String> action) {
+            action.execute("overloaded");
+        }
+    }
+
+    public static class ParentBean {
+        Object value;
+
+        public Object getValue() {
+            return value;
+        }
+
+        public void setValue(Object value) {
+            this.value = value;
+        }
+    }
+
+    public static class CovariantPropertyTypes extends ParentBean {
+        @Override
+        public String getValue() {
+            return String.valueOf(super.getValue());
+        }
+    }
+
     public static class BeanWithReadOnlyProperties {
         public String getProp() {
             return "value";
         }
     }
 
+    public static class BeanWithNonPublicProperties {
+        String getPackageProtected() {
+            return "package-protected";
+        }
+
+        protected String getProtected() {
+            return "protected";
+        }
+
+        private String getPrivate() {
+            return "private";
+        }
+    }
+
     public static class CollectionBean {
         private List<String> prop = new ArrayList<String>();
 
@@ -954,6 +1119,7 @@ public static class BeanWithVariousGettersAndSetters extends Bean {
         private boolean bool;
         private String finalGetter;
         private Integer writeOnly;
+        private String overloaded;
 
         public int getPrimitive() {
             return primitive;
@@ -963,6 +1129,14 @@ public void setPrimitive(int primitive) {
             this.primitive = primitive;
         }
 
+        public boolean isBool() {
+            return bool;
+        }
+
+        public void setBool(boolean bool) {
+            this.bool = bool;
+        }
+
         public final String getFinalGetter() {
             return finalGetter;
         }
@@ -974,6 +1148,22 @@ public void setFinalGetter(String value) {
         public void setWriteOnly(Integer value) {
             writeOnly = value;
         }
+
+        public String getOverloaded() {
+            return overloaded;
+        }
+
+        public void setOverloaded(Number overloaded) {
+            this.overloaded = String.format("number = %s", overloaded);
+        }
+
+        public void setOverloaded(CharSequence overloaded) {
+            this.overloaded = String.format("chars = %s", overloaded);
+        }
+
+        public void setOverloaded(Object overloaded) {
+            this.overloaded = String.format("object = %s", overloaded);
+        }
     }
 
     public interface SomeType {
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/DependencyClassPathProviderTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/DependencyClassPathProviderTest.groovy
index 815ba2babcf1..af124e70e2ef 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/DependencyClassPathProviderTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/DependencyClassPathProviderTest.groovy
@@ -31,11 +31,12 @@ class DependencyClassPathProviderTest extends Specification {
         def classpath = provider.findClassPath("GRADLE_API")
 
         then:
-        classpath.asFiles.collect{it.name} == ["gradle-core-runtime", "gradle-cli-runtime", "gradle-core-impl-runtime", "gradle-tooling-api-impl", "plugin1-runtime", "plugin2-runtime"]
+        classpath.asFiles.collect{it.name} == ["gradle-core-runtime", "gradle-cli-runtime", "gradle-core-impl-runtime", "gradle-plugin-use-runtime", "gradle-tooling-api-runtime", "plugin1-runtime", "plugin2-runtime"]
 
         and:
         1 * moduleRegistry.getModule("gradle-core") >> module("gradle-core", module("gradle-cli"))
         1 * moduleRegistry.getModule("gradle-core-impl") >> module("gradle-core-impl")
+        1 * moduleRegistry.getModule("gradle-plugin-use") >> module("gradle-plugin-use")
         1 * moduleRegistry.getModule("gradle-tooling-api") >> module("gradle-tooling-api")
         1 * pluginModuleRegistry.getPluginModules() >> ([module("plugin1"), module("plugin2")] as LinkedHashSet)
     }
@@ -43,7 +44,6 @@ class DependencyClassPathProviderTest extends Specification {
     def module(String name, Module ... requiredModules) {
         Module module = Mock()
         _ * module.classpath >> new DefaultClassPath(new File("$name-runtime"))
-        _ * module.implementationClasspath >> new DefaultClassPath(new File("$name-impl"))
         _ * module.allRequiredModules >> (([module] + (requiredModules as List)) as LinkedHashSet)
         return module
     }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/NestedConfigureAutoCreateNamedDomainObjectContainerSpec.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/NestedConfigureAutoCreateNamedDomainObjectContainerSpec.groovy
index 421ff585a048..28e3376dff8a 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/NestedConfigureAutoCreateNamedDomainObjectContainerSpec.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/NestedConfigureAutoCreateNamedDomainObjectContainerSpec.groovy
@@ -103,7 +103,7 @@ class NestedConfigureAutoCreateNamedDomainObjectContainerSpec extends Specificat
         e.method == "somethingThatDoesntExist"
         parent.c1.m1.prop == "c1c1m1"
         
-        // make sure the somethingThatDoesntExist() call didn't resolve against any of the parent containers, creating an entry
+        // make sure the somethingThatDoesntExist() call didn't resolve against any of the root containers, creating an entry
         parent.size() == 1
         parent.c1.size() == 1
     }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapperTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapperTest.groovy
new file mode 100644
index 000000000000..3f3083ca2844
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/TypedDomainObjectContainerWrapperTest.groovy
@@ -0,0 +1,157 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal
+
+import org.gradle.api.Action
+import org.gradle.api.Named
+import org.gradle.internal.reflect.DirectInstantiator
+import spock.lang.Specification
+
+class TypedDomainObjectContainerWrapperTest extends Specification {
+
+    DefaultPolymorphicDomainObjectContainer<Type> parent = new DefaultPolymorphicDomainObjectContainer<Type>(Type, new DirectInstantiator())
+
+    def setup() {
+        parent.add(type("typeOne"))
+        parent.add(type("typeTwo"))
+        parent.add(subtype("subTypeOne"))
+        parent.add(subtype("subTypeTwo"))
+        parent.add(otherSubtype("otherSubType"))
+
+        parent.registerFactory(CreatedSubType, { String name ->
+            return new DefaultCreatedSubType(name)
+        })
+    }
+
+    def "test returns subtype elements"() {
+        when:
+        def container = parent.containerWithType(SubType)
+
+        then:
+        containerHas container, "subTypeOne", "subTypeTwo"
+    }
+
+    def "returns all elements when filtered by parent type"() {
+        when:
+        def container = parent.containerWithType(Type)
+
+        then:
+        containerHas container, "otherSubType", "subTypeOne", "subTypeTwo", "typeOne", "typeTwo"
+    }
+
+    def "created elements are typed"() {
+        when:
+        def container = parent.containerWithType(CreatedSubType)
+        def action = { CreatedSubType subType ->
+            subType.value = "actioned"
+        } as Action<CreatedSubType>
+
+        and:
+        container.create("created1")
+        container.create("created2", {
+            it.value = "changed"
+        })
+        container.create("created3", action)
+
+        then:
+        containerHas container, "created1", "created2", "created3"
+        parent.collect({it.name}).containsAll(["created1", "created2", "created3"])
+
+        and:
+        container.getByName("created1").value == "original"
+        container.getByName("created2").value == "changed"
+        container.getByName("created3").value == "actioned"
+    }
+
+    def "can create and configure via DSL"() {
+        when:
+        def container = parent.containerWithType(CreatedSubType)
+
+        and:
+        container.configure {
+            createdOne
+            createdTwo {
+                value = "changed"
+            }
+        }
+
+        then:
+        containerHas container, "createdOne", "createdTwo"
+        parent.collect({it.name}).containsAll(["createdOne", "createdTwo"])
+
+        and:
+        container.getByName("createdOne").value == "original"
+        container.getByName("createdTwo").value == "changed"
+    }
+
+    def "can configure existing via DSL"() {
+        given:
+        def container = parent.containerWithType(CreatedSubType)
+        def created = container.create("createdOne")
+        assert container.asList() == [created]
+
+        when:
+        container.configure {
+            createdOne {
+                value = "changed"
+            }
+        }
+
+        then:
+        container.asList() == [created]
+        created.value == "changed"
+    }
+
+    def containerHas(def container, String... names) {
+        assert container.toList().collect {it.name} == names as List
+        true
+    }
+
+    def Type type(def name) {
+        Stub(Type) {
+            getName() >> name
+        }
+    }
+
+    def SubType subtype(def name) {
+        Stub(SubType) {
+            getName() >> name
+        }
+    }
+
+    def OtherSubType otherSubtype(def name) {
+        Stub(OtherSubType) {
+            getName() >> name
+        }
+    }
+    interface Type extends Named {}
+    interface SubType extends Type {}
+    interface OtherSubType extends Type {}
+    interface CreatedSubType extends Type {
+        String getValue()
+        void setValue(String value)
+    }
+
+    class DefaultCreatedSubType implements CreatedSubType {
+        final String name
+        String value = "original";
+
+        DefaultCreatedSubType(String name) {
+            this.name = name
+        }
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependencySpec.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependencySpec.groovy
index e5a1bca56e98..ddec9ddc46cd 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependencySpec.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependencySpec.groovy
@@ -14,35 +14,49 @@
  * limitations under the License.
  */
 package org.gradle.api.internal.artifacts.dependencies
-
+import org.gradle.api.InvalidUserDataException
 import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.DependencyArtifact
+import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.internal.artifacts.DefaultExcludeRule
-import org.gradle.util.TestUtil
 import org.gradle.util.WrapUtil
 import spock.lang.Specification
 
-class AbstractModuleDependencySpec extends Specification {
+abstract class AbstractModuleDependencySpec extends Specification {
 
     private dependency = createDependency("org.gradle", "gradle-core", "4.4-beta2")
 
-    private static createDependency(String group, String name, String version) {
-        createDependency(group, name, version, null)
+    def init() {
+        dependency = createDependency("org.gradle", "gradle-core", "4.4-beta2")
     }
 
-    private static createDependency(String group, String name, String version, String configuration) {
-        new DefaultExternalModuleDependency(group, name, version, configuration)
+    protected createDependency(String group, String name, String version) {
+        createDependency(group, name, version, null)
     }
 
+    protected abstract ExternalModuleDependency createDependency(String group, String name, String version, String configuration);
+
     void "has reasonable default values"() {
         expect:
+        dependency.group == "org.gradle"
+        dependency.name == "gradle-core"
+        dependency.version == "4.4-beta2"
         dependency.transitive
         dependency.artifacts.isEmpty()
         dependency.excludeRules.isEmpty()
         dependency.configuration == Dependency.DEFAULT_CONFIGURATION
     }
 
+    def "cannot create with null name"() {
+        when:
+        createDependency("group", null, "version")
+
+        then:
+        def e = thrown InvalidUserDataException
+        e.message == "Name must not be null!"
+    }
+
     void "can exclude dependencies"() {
         def excludeArgs1 = WrapUtil.toMap("group", "aGroup")
         def excludeArgs2 = WrapUtil.toMap("module", "aModule")
@@ -58,8 +72,8 @@ class AbstractModuleDependencySpec extends Specification {
     }
 
     void "can add artifacts"() {
-        DependencyArtifact artifact1 = createAnonymousArtifact()
-        DependencyArtifact artifact2 = createAnonymousArtifact()
+        def artifact1 = Mock(DependencyArtifact)
+        def artifact2 = Mock(DependencyArtifact)
 
         when:
         dependency.addArtifact(artifact1)
@@ -82,8 +96,12 @@ class AbstractModuleDependencySpec extends Specification {
         createDependency("group1", "name1", "version1", "depConf1") != createDependency("group1", "name1", "version1", "depConf2")
     }
 
-    private DependencyArtifact createAnonymousArtifact() {
-        return new DefaultDependencyArtifact(TestUtil.createUniqueId(), "type", "org", "classifier", "url")
+    def "creates deep copy"() {
+        when:
+        def copy = dependency.copy()
+
+        then:
+        assertDeepCopy(dependency, copy)
     }
 
     public static void assertDeepCopy(ModuleDependency dependency, ModuleDependency copiedDependency) {
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependencyTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependencyTest.java
deleted file mode 100644
index 118ea7bc1e8d..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/AbstractModuleDependencyTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.artifacts.dependencies;
-
-import org.gradle.api.artifacts.Dependency;
-import org.gradle.api.artifacts.DependencyArtifact;
-import org.gradle.api.artifacts.ExcludeRule;
-import org.gradle.api.artifacts.ModuleDependency;
-import org.gradle.api.internal.artifacts.DefaultExcludeRule;
-import org.gradle.util.TestUtil;
-import org.gradle.util.JUnit4GroovyMockery;
-import org.gradle.util.WrapUtil;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Map;
-
-import static org.gradle.util.Matchers.isEmpty;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(JMock.class)
-abstract public class AbstractModuleDependencyTest {
-    //TODO SF rework the remaining coverage of this hierarchy in the spirit of AbstractModuleDependencySpec and DefaultProjectDependencyTest
-
-    protected abstract AbstractModuleDependency getDependency();
-
-    protected abstract AbstractModuleDependency createDependency(String group, String name, String version);
-
-    protected abstract AbstractModuleDependency createDependency(String group, String name, String version, String configuration);
-
-    protected JUnit4Mockery context = new JUnit4GroovyMockery();
-
-    @Test
-    public void defaultValues() {
-        assertTrue(getDependency().isTransitive());
-        assertThat(getDependency().getArtifacts(), isEmpty());
-        assertThat(getDependency().getExcludeRules(), isEmpty());
-        assertThat(getDependency().getConfiguration(), equalTo(Dependency.DEFAULT_CONFIGURATION));
-    }
-
-    @Test
-    public void exclude() {
-        Map<String, String> excludeArgs1 = WrapUtil.toMap("group", "aGroup");
-        Map<String, String> excludeArgs2 = WrapUtil.toMap("module", "aModule");
-
-        getDependency().exclude(excludeArgs1);
-        getDependency().exclude(excludeArgs2);
-
-        assertThat(getDependency().getExcludeRules().size(), equalTo(2));
-        assertThat(getDependency().getExcludeRules(), hasItem((ExcludeRule) new DefaultExcludeRule("aGroup", null)));
-        assertThat(getDependency().getExcludeRules(), hasItem((ExcludeRule) new DefaultExcludeRule(null, "aModule")));
-    }
-
-    @Test
-    public void addArtifact() {
-        DependencyArtifact artifact1 = createAnonymousArtifact();
-        DependencyArtifact artifact2 = createAnonymousArtifact();
-
-        getDependency().addArtifact(artifact1);
-        getDependency().addArtifact(artifact2);
-
-        assertThat(getDependency().getArtifacts().size(), equalTo(2));
-        assertThat(getDependency().getArtifacts(), hasItem(artifact1));
-        assertThat(getDependency().getArtifacts(), hasItem(artifact2));
-    }
-
-    private DependencyArtifact createAnonymousArtifact() {
-        return new DefaultDependencyArtifact(TestUtil.createUniqueId(), "type", "org", "classifier", "url");
-    }
-
-    @Test
-    public void equality() {
-        assertThat(createDependency("group1", "name1", "version1"), equalTo(createDependency("group1", "name1", "version1")));
-        assertThat(createDependency("group1", "name1", "version1").hashCode(), equalTo(createDependency("group1", "name1", "version1").hashCode()));
-        assertThat(createDependency("group1", "name1", "version1"), not(equalTo(createDependency("group1", "name1", "version2"))));
-        assertThat(createDependency("group1", "name1", "version1"), not(equalTo(createDependency("group1", "name2", "version1"))));
-        assertThat(createDependency("group1", "name1", "version1"), not(equalTo(createDependency("group2", "name1", "version1"))));
-        assertThat(createDependency("group1", "name1", "version1"), not(equalTo(createDependency("group2", "name1", "version1"))));
-        assertThat(createDependency("group1", "name1", "version1", "depConf1"), not(equalTo(createDependency("group1", "name1", "version1", "depConf2"))));
-    }
-
-    protected void assertDeepCopy(ModuleDependency dependency, ModuleDependency copiedDependency) {
-        assertThat(copiedDependency.getGroup(), equalTo(dependency.getGroup()));
-        assertThat(copiedDependency.getName(), equalTo(dependency.getName()));
-        assertThat(copiedDependency.getVersion(), equalTo(dependency.getVersion()));
-        assertThat(copiedDependency.getConfiguration(), equalTo(dependency.getConfiguration()));
-        assertThat(copiedDependency.isTransitive(), equalTo(dependency.isTransitive()));
-        assertThat(copiedDependency.getArtifacts(), equalTo(dependency.getArtifacts()));
-        assertThat(copiedDependency.getArtifacts(), not(sameInstance(dependency.getArtifacts())));
-        assertThat(copiedDependency.getExcludeRules(), equalTo(dependency.getExcludeRules()));
-        assertThat(copiedDependency.getExcludeRules(), not(sameInstance(dependency.getExcludeRules())));
-    }
-}
\ No newline at end of file
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/ClientModuleDependencySpec.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/ClientModuleDependencySpec.groovy
new file mode 100644
index 000000000000..25b49e836845
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/ClientModuleDependencySpec.groovy
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+
+
+package org.gradle.api.internal.artifacts.dependencies
+
+import org.gradle.api.artifacts.ExternalModuleDependency
+import org.gradle.api.artifacts.ModuleDependency
+
+class ClientModuleDependencySpec extends AbstractModuleDependencySpec {
+
+    protected ExternalModuleDependency createDependency(String group, String name, String version, String configuration) {
+        new DefaultClientModule(group, name, version, configuration)
+    }
+
+    def "equals but content not equal with different module dependencies"() {
+        when:
+        def dep1 = createDependency("group1", "name1", "version1", null)
+        def dep2 = createDependency("group1", "name1", "version1", null)
+        dep2.addDependency(Mock(ModuleDependency))
+
+        then:
+        dep1 == dep2
+        !dep1.contentEquals(dep2)
+        !dep2.contentEquals(dep1)
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultClientModuleTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultClientModuleTest.java
deleted file mode 100644
index e99073c93fe4..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultClientModuleTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.dependencies;
-
-import org.gradle.api.InvalidUserDataException;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-
-public class DefaultClientModuleTest extends AbstractModuleDependencyTest {
-    private static final String TEST_GROUP = "org.gradle";
-    private static final String TEST_NAME = "gradle-core";
-    private static final String TEST_VERSION = "4.4-beta2";
-
-    DefaultClientModule clientModule;
-
-    protected AbstractModuleDependency getDependency() {
-        return clientModule;
-    }
-
-    protected AbstractModuleDependency createDependency(String group, String name, String version) {
-        return new DefaultClientModule(group, name, version);
-    }
-
-    protected AbstractModuleDependency createDependency(String group, String name, String version, String configuration) {
-        return new DefaultClientModule(group, name, version, configuration);
-    }
-
-    @Before
-    public void setUp() {
-        clientModule = new DefaultClientModule(TEST_GROUP, TEST_NAME, TEST_VERSION);
-    }
-
-    @Test
-    public void init() {
-        assertThat(clientModule.getGroup(), equalTo(TEST_GROUP));
-        assertThat(clientModule.getName(), equalTo(TEST_NAME));
-        assertThat(clientModule.getVersion(), equalTo(TEST_VERSION));
-        assertThat(clientModule.isForce(), equalTo(false));
-        assertThat(clientModule.isTransitive(), equalTo(true));
-    }
-
-    @Test(expected = InvalidUserDataException.class)
-    public void initWithNullNameShouldThrowInvalidUserDataEx() {
-        new DefaultClientModule(TEST_GROUP, null, TEST_VERSION);
-    }
-
-    @Test
-    public void contentEqualsWithEqualDependencies() {
-        DefaultClientModule clientModule1 = createModule();
-        DefaultClientModule clientModule2 = createModule();
-        assertThat(clientModule1.contentEquals(clientModule2), equalTo(true));
-    }
-
-    @Test
-    public void contentEqualsWithNonEqualDependencies() {
-        DefaultClientModule clientModule1 = createModule();
-        DefaultClientModule clientModule2 = createModule();
-        clientModule2.setGroup(clientModule1.getGroup() + "delta");
-        assertThat(clientModule1.contentEquals(clientModule2), equalTo(false));
-    }
-
-    @Test
-    public void copy() {
-        DefaultClientModule clientModule = createModule();
-        DefaultClientModule copiedClientModule = (DefaultClientModule) clientModule.copy();
-        assertThat(clientModule.contentEquals(copiedClientModule), equalTo(true));
-        assertDeepCopy(clientModule, copiedClientModule);
-        assertThat(copiedClientModule.getDependencies().iterator().next(), not(sameInstance(clientModule.getDependencies().iterator().next())));
-    }
-
-    private DefaultClientModule createModule() {
-        DefaultClientModule clientModule =  new DefaultClientModule("group", "name", "version", "conf");
-        clientModule.addArtifact(new DefaultDependencyArtifact("name", "type", "ext", "classifier", "url"));
-        clientModule.addDependency(new DefaultExternalModuleDependency("org", "name", "version"));
-        return clientModule;
-    }
-}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependencySpec.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependencySpec.groovy
new file mode 100644
index 000000000000..a727f97d0a63
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependencySpec.groovy
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.artifacts.dependencies
+
+import org.gradle.api.artifacts.ExternalModuleDependency
+
+class DefaultExternalModuleDependencySpec extends AbstractModuleDependencySpec {
+
+    protected ExternalModuleDependency createDependency(String group, String name, String version, String configuration) {
+        new DefaultExternalModuleDependency(group, name, version, configuration)
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependencyTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependencyTest.java
deleted file mode 100644
index 10194468b7fd..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/dependencies/DefaultExternalModuleDependencyTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.artifacts.dependencies;
-
-import org.gradle.api.InvalidUserDataException;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.lib.legacy.ClassImposteriser;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
-
-
-@RunWith(JMock.class)
-public class DefaultExternalModuleDependencyTest extends AbstractModuleDependencyTest {
-    private static final String TEST_GROUP = "org.gradle";
-    private static final String TEST_NAME = "gradle-core";
-    private static final String TEST_VERSION = "4.4-beta2";
-
-    private DefaultExternalModuleDependency moduleDependency;
-
-    public AbstractModuleDependency getDependency() {
-        return moduleDependency;
-    }
-
-    protected AbstractModuleDependency createDependency(String group, String name, String version) {
-        return new DefaultExternalModuleDependency(group, name, version);
-    }
-
-    protected AbstractModuleDependency createDependency(String group, String name, String version, String configuration) {
-        return new DefaultExternalModuleDependency(group, name, version, configuration);
-    }
-
-    @Before public void setUp() {
-        moduleDependency = new DefaultExternalModuleDependency(TEST_GROUP, TEST_NAME, TEST_VERSION);
-        context.setImposteriser(ClassImposteriser.INSTANCE);
-    }
-
-    @Test
-    public void init() {
-        assertThat(moduleDependency.getGroup(), equalTo(TEST_GROUP));
-        assertThat(moduleDependency.getName(), equalTo(TEST_NAME));
-        assertThat(moduleDependency.getVersion(), equalTo(TEST_VERSION));
-        assertThat(moduleDependency.isChanging(), equalTo(false));
-        assertThat(moduleDependency.isForce(), equalTo(false));
-        assertThat(moduleDependency.isTransitive(), equalTo(true));
-        assertThat(moduleDependency.getVersion(), equalTo(TEST_VERSION));
-    }
-
-    @Test(expected = InvalidUserDataException.class)
-    public void initWithNullNameShouldThrowInvalidUserDataEx() {
-        new DefaultExternalModuleDependency(TEST_GROUP, null, TEST_VERSION);
-    }
-    
-    @Test
-    public void contentEqualsWithEqualDependencies() {
-        DefaultExternalModuleDependency dependency1 = createModuleDependency();
-        DefaultExternalModuleDependency dependency2 = createModuleDependency();
-        assertThat(dependency1.contentEquals(dependency2), equalTo(true));
-    }
-
-    @Test
-    public void contentEqualsWithNonEqualDependencies() {
-        DefaultExternalModuleDependency dependency1 = createModuleDependency();
-        DefaultExternalModuleDependency dependency2 = createModuleDependency();
-        dependency2.setTransitive(!dependency1.isTransitive());
-        assertThat(dependency1.contentEquals(dependency2), equalTo(false));
-    }
-
-    @Test
-    public void copy() {
-        DefaultExternalModuleDependency dependency = createModuleDependency();
-        DefaultExternalModuleDependency copiedDependency = dependency.copy();
-        assertDeepCopy(dependency, copiedDependency);
-    }
-
-    private DefaultExternalModuleDependency createModuleDependency() {
-        DefaultExternalModuleDependency moduleDependency = new DefaultExternalModuleDependency("group", "name", "version", "conf");
-        moduleDependency.addArtifact(new DefaultDependencyArtifact("name", "type", "ext", "classifier", "url"));
-        return moduleDependency;
-    }
-}
-
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/publish/AbstractPublishArtifactTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/publish/AbstractPublishArtifactTest.java
index 2a911197d891..cfb0595f9c56 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/publish/AbstractPublishArtifactTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/publish/AbstractPublishArtifactTest.java
@@ -15,8 +15,6 @@
  */
 package org.gradle.api.internal.artifacts.publish;
 
-import org.apache.ivy.core.module.id.ModuleId;
-import org.apache.ivy.core.module.id.ModuleRevisionId;
 import org.gradle.api.artifacts.PublishArtifact;
 import org.gradle.util.JUnit4GroovyMockery;
 import org.jmock.integration.junit4.JUnit4Mockery;
@@ -34,7 +32,6 @@ public abstract class AbstractPublishArtifactTest {
     private static final String TEST_TYPE = "type";
     private static final String TEST_CLASSIFIER = "classifier";
     private static final Date TEST_DATE = new Date();
-    private static final ModuleRevisionId TEST_MODULE_REVISION_ID = new ModuleRevisionId(new ModuleId("group", "name"), "version");
 
     protected File getTestFile() {
         return TEST_FILE;
@@ -56,10 +53,6 @@ protected String getTestClassifier() {
         return TEST_CLASSIFIER;
     }
 
-    protected ModuleRevisionId getTestModuleRevisionId() {
-        return TEST_MODULE_REVISION_ID;
-    }
-
     protected Date getDate() {
         return TEST_DATE;
     }
@@ -68,8 +61,6 @@ protected Date getDate() {
         setImposteriser(ClassImposteriser.INSTANCE);
     }};
 
-    abstract PublishArtifact createPublishArtifact(String classifier);
-
     protected void assertCommonPropertiesAreSet(PublishArtifact artifact, boolean shouldHaveClassifier) {
         assertEquals(getTestName(), artifact.getName());
         assertEquals(getTestType(), artifact.getType());
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/publish/DefaultPublishArtifactTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/publish/DefaultPublishArtifactTest.java
index 681f65a65d02..1f59f46a8dae 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/publish/DefaultPublishArtifactTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/artifacts/publish/DefaultPublishArtifactTest.java
@@ -17,7 +17,6 @@
 package org.gradle.api.internal.artifacts.publish;
 
 import org.gradle.api.Task;
-import org.gradle.api.artifacts.PublishArtifact;
 import org.jmock.integration.junit4.JMock;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,9 +29,6 @@
 
 @RunWith(JMock.class)
 public class DefaultPublishArtifactTest extends AbstractPublishArtifactTest {
-    protected PublishArtifact createPublishArtifact(String classifier) {
-        return new DefaultPublishArtifact(getTestName(), getTestExt(), getTestType(), classifier, getDate(), getTestFile());
-    }
 
     @Test
     public void init() {
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/InputPropertiesSerializerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/InputPropertiesSerializerTest.groovy
new file mode 100644
index 000000000000..9ee5e0bd2ad8
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/changedetection/state/InputPropertiesSerializerTest.groovy
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.changedetection.state
+
+import org.gradle.api.GradleException
+import org.gradle.messaging.serialize.InputStreamBackedDecoder
+import org.gradle.messaging.serialize.MapSerializer
+import org.gradle.messaging.serialize.OutputStreamBackedEncoder
+import spock.lang.Specification
+import spock.lang.Subject
+
+class InputPropertiesSerializerTest extends Specification {
+
+    def output = new ByteArrayOutputStream()
+    def encoder = new OutputStreamBackedEncoder(output)
+
+    @Subject serializer = new InputPropertiesSerializer(this.class.getClassLoader())
+
+    def "serializes empty properties"() {
+        write [:]
+        expect:
+        [:] == written
+    }
+
+    def "serializes properties"() {
+        write([a: "x", b: "y"])
+        expect:
+        [a: "x", b: "y"] == written
+    }
+
+    def "serializes properties with custom classes"() {
+        write([a: new SomeSerializableObject(x:10)])
+        expect:
+        written["a"].x == 10
+    }
+
+    def "informs which properties are not serializable"() {
+        when: write([a: 'x', b: new SomeNotSerializableObject()])
+        then:
+        def ex = thrown(GradleException)
+        ex.message == "Unable to store task input properties. Property 'b' with value 'I'm not serializable' cannot be serialized."
+        ex.cause.class == MapSerializer.EntrySerializationException
+    }
+
+    static class SomeSerializableObject implements Serializable {
+        int x
+    }
+
+    static class SomeNotSerializableObject {
+        public String toString() { "I'm not serializable" }
+    }
+
+    private Map<String, Object> getWritten() {
+        serializer.read(new InputStreamBackedDecoder(new ByteArrayInputStream(output.toByteArray())))
+    }
+
+    private void write(Map map) {
+        serializer.write(encoder, map)
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/BasicFileResolverTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/BasicFileResolverTest.groovy
new file mode 100644
index 000000000000..9627aad34fad
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/BasicFileResolverTest.groovy
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.file
+
+import org.gradle.api.InvalidUserDataException
+import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
+import org.junit.Rule
+import spock.lang.Specification
+
+class BasicFileResolverTest extends Specification {
+    @Rule TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider()
+    def baseDir = tmpDir.createDir("base-dir")
+    def resolver = new BasicFileResolver(baseDir)
+
+    def "converts relative path"() {
+        expect:
+        resolver.transform("some-file") == baseDir.file("some-file")
+        resolver.transform("../other-file") == baseDir.file("../other-file")
+        resolver.transform(".") == baseDir
+    }
+
+    def "converts absolute path"() {
+        def target = tmpDir.file("some-file")
+
+        expect:
+        resolver.transform(target.absolutePath) == target
+    }
+
+    def "converts file URI"() {
+        def target = tmpDir.file("some-file")
+
+        expect:
+        resolver.transform(target.toURI().toString()) == target
+    }
+
+    def "does not convert http URI"() {
+        when:
+        resolver.transform("http://127.0.0.1")
+
+        then:
+        InvalidUserDataException e = thrown()
+        e.message == "Cannot convert URL 'http://127.0.0.1' to a file."
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImplTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImplTest.groovy
index 83c6f3fdf2c2..d8a245ede73a 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImplTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopyFileVisitorImplTest.groovy
@@ -26,7 +26,7 @@ import org.gradle.internal.reflect.Instantiator
 import spock.lang.Specification
 
 class CopyFileVisitorImplTest extends Specification {
-    CopySpecInternal spec = Mock()
+    CopySpecResolver specResolver = Mock()
     CopyActionProcessingStreamAction action = Mock()
     Instantiator instantiator = Mock()
     FileSystem fileSystem = Mock()
@@ -34,19 +34,19 @@ class CopyFileVisitorImplTest extends Specification {
     FileVisitor copyFileVisitorImpl
 
     def setup() {
-        copyFileVisitorImpl = new CopyFileVisitorImpl(spec, action, instantiator, fileSystem)
+        copyFileVisitorImpl = new CopyFileVisitorImpl(specResolver, action, instantiator, fileSystem)
     }
 
     def "visit directory"() {
         given:
         FileVisitDetails dirDetails = Mock()
-        DefaultFileCopyDetails defaultFileCopyDetails = new DefaultFileCopyDetails(dirDetails, spec, fileSystem)
+        DefaultFileCopyDetails defaultFileCopyDetails = new DefaultFileCopyDetails(dirDetails, specResolver, fileSystem)
 
         when:
         copyFileVisitorImpl.visitDir(dirDetails)
 
         then:
-        1 * instantiator.newInstance(DefaultFileCopyDetails.class, dirDetails, spec, fileSystem) >> defaultFileCopyDetails
+        1 * instantiator.newInstance(DefaultFileCopyDetails.class, dirDetails, specResolver, fileSystem) >> defaultFileCopyDetails
         1 * action.processFile(defaultFileCopyDetails)
         0 * defaultFileCopyDetails.excluded
     }
@@ -54,14 +54,14 @@ class CopyFileVisitorImplTest extends Specification {
     def "visit file if no action are defined in copy spec"() {
         given:
         FileVisitDetails dirDetails = Mock()
-        DefaultFileCopyDetails defaultFileCopyDetails = new DefaultFileCopyDetails(dirDetails, spec, fileSystem)
+        DefaultFileCopyDetails defaultFileCopyDetails = new DefaultFileCopyDetails(dirDetails, specResolver, fileSystem)
 
         when:
         copyFileVisitorImpl.visitFile(dirDetails)
 
         then:
-        1 * instantiator.newInstance(DefaultFileCopyDetails.class, dirDetails, spec, fileSystem) >> defaultFileCopyDetails
-        1 * spec.getAllCopyActions() >> []
+        1 * instantiator.newInstance(DefaultFileCopyDetails.class, dirDetails, specResolver, fileSystem) >> defaultFileCopyDetails
+        1 * specResolver.getAllCopyActions() >> []
         1 * action.processFile(defaultFileCopyDetails)
         0 * defaultFileCopyDetails.excluded
     }
@@ -77,8 +77,8 @@ class CopyFileVisitorImplTest extends Specification {
         copyFileVisitorImpl.visitFile(dirDetails)
 
         then:
-        1 * instantiator.newInstance(DefaultFileCopyDetails.class, dirDetails, spec, fileSystem) >> defaultFileCopyDetails
-        1 * spec.getAllCopyActions() >> [fileCopyAction1, fileCopyAction2]
+        1 * instantiator.newInstance(DefaultFileCopyDetails.class, dirDetails, specResolver, fileSystem) >> defaultFileCopyDetails
+        1 * specResolver.getAllCopyActions() >> [fileCopyAction1, fileCopyAction2]
         1 * action.processFile(defaultFileCopyDetails)
         1 * fileCopyAction1.execute(defaultFileCopyDetails)
         1 * fileCopyAction2.execute(defaultFileCopyDetails)
@@ -96,8 +96,8 @@ class CopyFileVisitorImplTest extends Specification {
         copyFileVisitorImpl.visitFile(dirDetails)
 
         then:
-        1 * instantiator.newInstance(DefaultFileCopyDetails.class, dirDetails, spec, fileSystem) >> defaultFileCopyDetails
-        1 * spec.getAllCopyActions() >> [fileCopyAction1, fileCopyAction2]
+        1 * instantiator.newInstance(DefaultFileCopyDetails.class, dirDetails, specResolver, fileSystem) >> defaultFileCopyDetails
+        1 * specResolver.getAllCopyActions() >> [fileCopyAction1, fileCopyAction2]
         0 * action.processFile(defaultFileCopyDetails)
         1 * fileCopyAction1.execute(defaultFileCopyDetails)
         1 * defaultFileCopyDetails.excluded >> true
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecActionImplTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecActionImplTest.groovy
index 19f685526dcf..63d3836bc06a 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecActionImplTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecActionImplTest.groovy
@@ -26,7 +26,7 @@ class CopySpecActionImplTest extends Specification {
     CopyActionProcessingStreamAction action = Mock()
     Instantiator instantiator = Mock()
     FileSystem fileSystem = Mock()
-    CopySpecInternal copySpecInternal = Mock()
+    CopySpecResolver copySpecResolver = Mock()
     FileTree source = Mock()
     Action<CopySpecInternal> copySpecInternalAction
 
@@ -36,10 +36,10 @@ class CopySpecActionImplTest extends Specification {
 
     def "can visit spec source"() {
         when:
-        copySpecInternalAction.execute(copySpecInternal)
+        copySpecInternalAction.execute(copySpecResolver)
 
         then:
-        1 * copySpecInternal.getSource() >> source
+        1 * copySpecResolver.getSource() >> source
         1 * source.visit(_ as CopyFileVisitorImpl)
     }
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecMatchingTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecMatchingTest.groovy
index f2f006cae2a6..f043bff30006 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecMatchingTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/CopySpecMatchingTest.groovy
@@ -27,7 +27,7 @@ import spock.lang.Specification
 
 class CopySpecMatchingTest extends Specification {
 
-    DefaultCopySpec copySpec = new DefaultCopySpec(TestFiles.resolver(), new DirectInstantiator(), null)
+    DefaultCopySpec copySpec = new DefaultCopySpec(TestFiles.resolver(), new DirectInstantiator())
 
     FileTree fileTree = Mock()
 
@@ -44,7 +44,7 @@ class CopySpecMatchingTest extends Specification {
 
         when:
         copySpec.filesMatching("**/a*", matchingAction)
-        copySpec.allCopyActions.each { copyAction ->
+        copySpec.copyActions.each { copyAction ->
             copyAction.execute(details1)
             copyAction.execute(details2)
         }
@@ -67,7 +67,7 @@ class CopySpecMatchingTest extends Specification {
 
         when:
         copySpec.filesNotMatching("**/a*", matchingAction)
-        copySpec.allCopyActions.each { copyAction ->
+        copySpec.copyActions.each { copyAction ->
             copyAction.execute(details1)
             copyAction.execute(details2)
         }
@@ -78,11 +78,12 @@ class CopySpecMatchingTest extends Specification {
 
     def matchingSpecInherited() {
         given:
-        DefaultCopySpec childSpec = copySpec.addChild()
+        DefaultCopySpec childSpec = new DefaultCopySpec(TestFiles.resolver(), new DirectInstantiator())
+        CopySpecResolver childResolver = childSpec.buildResolverRelativeToParent(copySpec.buildRootResolver())
         when:
         copySpec.filesMatching("**/*.java", Actions.doNothing())
         then:
-        1 == childSpec.allCopyActions.size()
-        childSpec.allCopyActions[0] instanceof MatchingCopyAction
+        1 == childResolver.allCopyActions.size()
+        childResolver.allCopyActions[0] instanceof MatchingCopyAction
     }
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecResolutionTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecResolutionTest.groovy
new file mode 100644
index 000000000000..c6291519a22c
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecResolutionTest.groovy
@@ -0,0 +1,323 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.file.copy
+
+import org.gradle.api.Action
+import org.gradle.api.file.CopySpec
+import org.gradle.api.file.DuplicatesStrategy
+import org.gradle.api.file.FileTree
+import org.gradle.api.file.RelativePath
+import org.gradle.api.internal.file.FileResolver
+import org.gradle.api.specs.Spec
+import org.gradle.api.tasks.util.PatternSet
+import org.gradle.internal.reflect.DirectInstantiator
+import org.gradle.internal.reflect.Instantiator
+import org.gradle.test.fixtures.file.TestFile
+import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
+import org.gradle.util.JUnit4GroovyMockery
+import org.jmock.integration.junit4.JMock
+import org.junit.Assert
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import static org.hamcrest.Matchers.equalTo
+import static org.hamcrest.Matchers.sameInstance
+import static org.junit.Assert.assertThat
+
+@RunWith(JMock)
+public class DefaultCopySpecResolutionTest {
+
+    @Rule
+    public TestNameTestDirectoryProvider testDir = new TestNameTestDirectoryProvider();
+    private TestFile baseFile = testDir.testDirectory
+    private final JUnit4GroovyMockery context = new JUnit4GroovyMockery();
+    private final FileResolver fileResolver = context.mock(FileResolver);
+    private final Instantiator instantiator = new DirectInstantiator()
+    private final DefaultCopySpec parentSpec = new DefaultCopySpec(fileResolver, instantiator)
+
+    @Test
+    public void testSpecHasRootPathAsDestinationByDefault() {
+        assertThat(parentSpec.buildRootResolver().getDestPath(), equalTo(new RelativePath(false)))
+    }
+
+    @Test
+    public void testChildResolvesUsingParentDestinationPathAsDefault() {
+        parentSpec.into 'parent'
+        CopySpecResolver parentContext = parentSpec.buildRootResolver()
+        assertThat(parentContext.destPath, equalTo(new RelativePath(false, 'parent')))
+
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        CopySpecResolver childResolver = child.buildResolverRelativeToParent(parentContext)
+        assertThat(childResolver.destPath, equalTo(new RelativePath(false, 'parent')))
+    }
+
+    @Test
+    public void testChildDestinationPathIsResolvedAsNestedWithinParent() {
+        parentSpec.into 'parent'
+        CopySpecResolver parentContext = parentSpec.buildRootResolver()
+        assertThat(parentContext.destPath, equalTo(new RelativePath(false, 'parent')))
+
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        child.into 'child'
+        CopySpecResolver childResolver = child.buildResolverRelativeToParent(parentContext)
+        assertThat(childResolver.destPath, equalTo(new RelativePath(false, 'parent', 'child')))
+    }
+
+    @Test
+    public void testChildUsesParentPatternsAsDefault() {
+
+        Spec specInclude = [:] as Spec
+        Spec specExclude = [:] as Spec
+
+        parentSpec.include('parent-include')
+        parentSpec.exclude('parent-exclude')
+        parentSpec.include(specInclude)
+        parentSpec.exclude(specExclude)
+
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+
+
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+        PatternSet patterns = childResolver.patternSet
+
+        assertThat(patterns.includes, equalTo(['parent-include'] as Set))
+        assertThat(patterns.excludes, equalTo(['parent-exclude'] as Set))
+        assertThat(patterns.includeSpecs, equalTo([specInclude] as Set))
+        assertThat(patterns.excludeSpecs, equalTo([specExclude] as Set))
+    }
+
+
+    @Test
+    public void testChildUsesPatternsFromParent() {
+        Spec specInclude = [:] as Spec
+        Spec specExclude = [:] as Spec
+
+
+        parentSpec.include('parent-include')
+        parentSpec.exclude('parent-exclude')
+        parentSpec.include(specInclude)
+        parentSpec.exclude(specExclude)
+
+        Spec childInclude = [:] as Spec
+        Spec childExclude = [:] as Spec
+
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        child.include('child-include')
+        child.exclude('child-exclude')
+        child.include(childInclude)
+        child.exclude(childExclude)
+
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+        PatternSet patterns = childResolver.patternSet
+
+        assertThat(patterns.includes, equalTo(['parent-include', 'child-include'] as Set))
+        assertThat(patterns.excludes, equalTo(['parent-exclude', 'child-exclude'] as Set))
+        assertThat(patterns.includeSpecs, equalTo([specInclude, childInclude] as Set))
+        assertThat(patterns.excludeSpecs, equalTo([specExclude, childExclude] as Set))
+    }
+
+    @Test
+    public void testResolvesSourceUsingOwnSourceFilteredByPatternset() {
+        //Does not get source from root
+        parentSpec.from 'x'
+        parentSpec.from 'y'
+
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        child.from 'a'
+        child.from 'b'
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+
+        def filteredTree = context.mock(FileTree, 'filtered')
+
+        context.checking {
+            one(fileResolver).resolveFilesAsTree(['a', 'b'] as Set)
+            def tree = context.mock(FileTree, 'source')
+            will(returnValue(tree))
+            one(tree).matching(withParam(equalTo(parentSpec.patternSet)))
+            will(returnValue(filteredTree))
+        }
+
+        assertThat(childResolver.source, sameInstance(filteredTree))
+    }
+
+
+
+    @Test
+    public void duplicatesStrategyDefaultsToInclude() {
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+        assert childResolver.duplicatesStrategy == DuplicatesStrategy.INCLUDE
+    }
+
+    @Test
+    public void childInheritsDuplicatesStrategyFromParent() {
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+
+        assert childResolver.duplicatesStrategy == DuplicatesStrategy.INCLUDE
+
+        parentSpec.duplicatesStrategy = 'EXCLUDE'
+        assert childResolver.duplicatesStrategy == DuplicatesStrategy.EXCLUDE
+
+        child.duplicatesStrategy = 'INCLUDE'
+        assert childResolver.duplicatesStrategy == DuplicatesStrategy.INCLUDE
+    }
+
+    @Test
+    public void caseSensitiveFlagDefaultsToTrue() {
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+        assert childResolver.caseSensitive
+        assert childResolver.patternSet.caseSensitive
+    }
+
+    @Test
+    public void childUsesCaseSensitiveFlagFromParentAsDefault() {
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+
+        assert childResolver.caseSensitive
+        assert childResolver.patternSet.caseSensitive
+
+        parentSpec.caseSensitive = false
+        assert !childResolver.caseSensitive
+        assert !childResolver.patternSet.caseSensitive
+
+        child.caseSensitive = true
+        assert childResolver.caseSensitive
+        assert childResolver.patternSet.caseSensitive
+    }
+
+    @Test
+    public void includeEmptyDirsFlagDefaultsToTrue() {
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+        assert childResolver.includeEmptyDirs
+
+    }
+
+    @Test
+    public void childUsesIncludeEmptyDirsFlagFromParentAsDefault() {
+
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+
+        assert childResolver.includeEmptyDirs
+
+        parentSpec.includeEmptyDirs = false
+        assert !childResolver.includeEmptyDirs
+
+        child.includeEmptyDirs = true
+        assert childResolver.includeEmptyDirs
+    }
+
+
+    @Test
+    public void testSpecInheritsActionsFromParent() {
+        Action parentAction = context.mock(Action, 'parent')
+        parentSpec.eachFile parentAction
+
+        Action childAction = context.mock(Action, 'child')
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        child.eachFile childAction
+
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+
+        assertThat(childResolver.allCopyActions, equalTo([parentAction, childAction]))
+    }
+
+    @Test
+    public void testHasNoPermissionsByDefault() {
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+        assert childResolver.fileMode == null
+        assert childResolver.dirMode == null
+    }
+
+    @Test
+    public void testInheritsPermissionsFromParent() {
+        DefaultCopySpec child = new DefaultCopySpec(fileResolver, instantiator)
+        DefaultCopySpec.DefaultCopySpecResolver childResolver = child.buildResolverRelativeToParent(parentSpec.buildRootResolver())
+        parentSpec.fileMode = 0x1
+        parentSpec.dirMode = 0x2
+
+        Assert.assertEquals(0x1, childResolver.fileMode)
+        Assert.assertEquals(0x2, childResolver.dirMode)
+
+        child.fileMode = 0x3
+        child.dirMode = 0x4
+
+        Assert.assertEquals(0x3, childResolver.fileMode)
+        Assert.assertEquals(0x4, childResolver.dirMode)
+    }
+
+    @Test
+    public void canWalkDownTreeCreatedUsingFromIntegrationTest() {
+
+        CopySpec child = parentSpec.from('somedir') { into 'child' }
+        child.from('somedir') { into 'grandchild' }
+        child.from('somedir') { into '/grandchild' }
+
+        List<RelativePath> paths = new ArrayList<RelativePath>()
+        parentSpec.buildRootResolver().walk(new Action<CopySpecResolver>() {
+            void execute(CopySpecResolver csr) {
+                paths.add(csr.destPath)
+            }
+        })
+
+        assertThat(paths.size(), equalTo(4))
+        assertThat(paths.get(0), equalTo(new RelativePath(false)))
+        assertThat(paths.get(1), equalTo(new RelativePath(false, 'child')))
+        assertThat(paths.get(2), equalTo(new RelativePath(false, 'child', 'grandchild')))
+        assertThat(paths.get(3), equalTo(new RelativePath(false, 'grandchild')))
+    }
+
+    @Test
+    public void canWalkDownTreeCreatedUsingWithIntegrationTest() {
+
+        DefaultCopySpec childOne = new DefaultCopySpec(fileResolver, instantiator)
+        childOne.into("child_one");
+        parentSpec.with(childOne);
+
+        DefaultCopySpec childTwo = new DefaultCopySpec(fileResolver, instantiator)
+         childTwo.into("child_two");
+        parentSpec.with( childTwo);
+
+        DefaultCopySpec grandchild = new DefaultCopySpec(fileResolver, instantiator)
+        grandchild.into("grandchild");
+        childOne.with(grandchild);
+         childTwo.with(grandchild);
+
+        List<RelativePath> paths = new ArrayList<RelativePath>()
+        parentSpec.buildRootResolver().walk(new Action<CopySpecResolver>() {
+            void execute(CopySpecResolver csr) {
+                paths.add(csr.destPath)
+            }
+        })
+
+        assertThat(paths.size(), equalTo(5))
+        assertThat(paths.get(0), equalTo(new RelativePath(false)))
+        assertThat(paths.get(1), equalTo(new RelativePath(false, 'child_one')))
+        assertThat(paths.get(2), equalTo(new RelativePath(false, 'child_one', 'grandchild')))
+        assertThat(paths.get(3), equalTo(new RelativePath(false, 'child_two')))
+        assertThat(paths.get(4), equalTo(new RelativePath(false, 'child_two', 'grandchild')))
+    }
+
+
+}
+
+
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecTest.groovy
index b956679c4cd9..c0df976f2b5e 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DefaultCopySpecTest.groovy
@@ -20,11 +20,9 @@ import org.apache.tools.ant.filters.StripJavaComments
 import org.gradle.api.Action
 import org.gradle.api.file.CopySpec
 import org.gradle.api.file.DuplicatesStrategy
-import org.gradle.api.file.FileTree
 import org.gradle.api.file.RelativePath
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.api.specs.Spec
-import org.gradle.api.tasks.util.PatternSet
 import org.gradle.internal.Actions
 import org.gradle.internal.reflect.DirectInstantiator
 import org.gradle.internal.reflect.Instantiator
@@ -32,7 +30,6 @@ import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.JUnit4GroovyMockery
 import org.jmock.integration.junit4.JMock
-import org.junit.Assert
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -93,23 +90,23 @@ public class DefaultCopySpecTest {
 
     @Test
     public void testDefaultDestinationPathForRootSpec() {
-        assertThat(spec.destPath, equalTo(new RelativePath(false)))
+        assertThat(spec.buildRootResolver().destPath, equalTo(new RelativePath(false)))
     }
 
     @Test
     public void testInto() {
         spec.into 'spec'
-        assertThat(spec.destPath, equalTo(new RelativePath(false, 'spec')))
+        assertThat(spec.buildRootResolver().destPath, equalTo(new RelativePath(false, 'spec')))
         spec.into '/'
-        assertThat(spec.destPath, equalTo(new RelativePath(false)))
+        assertThat(spec.buildRootResolver().destPath, equalTo(new RelativePath(false)))
     }
 
     @Test
     public void testIntoWithAClosure() {
         spec.into { 'spec' }
-        assertThat(spec.destPath, equalTo(new RelativePath(false, 'spec')))
+        assertThat(spec.buildRootResolver().destPath, equalTo(new RelativePath(false, 'spec')))
         spec.into { return { 'spec' } }
-        assertThat(spec.destPath, equalTo(new RelativePath(false, 'spec')))
+        assertThat(spec.buildRootResolver().destPath, equalTo(new RelativePath(false, 'spec')))
     }
 
     @Test
@@ -122,172 +119,31 @@ public class DefaultCopySpecTest {
         assertThat(spec.childSpecs.size(), equalTo(2))
     }
 
-    @Test
-    public void testWithSpecInheritsDestinationPathFromParent() {
-        DefaultCopySpec other = new DefaultCopySpec(fileResolver, instantiator)
-        other.into 'other'
-
-        spec.into 'spec'
-        spec.with other
-
-        CopySpecInternal child = spec.childSpecs[0]
-        assertThat(child.destPath, equalTo(new RelativePath(false, 'spec', 'other')))
-    }
-
     @Test
     public void testDestinationWithClosure() {
         CopySpec child = spec.into('target') {
         }
 
         assertThat(child, not(sameInstance(spec as CopySpec)))
-        assertThat(unpackWrapper(child).destPath, equalTo(new RelativePath(false, 'target')))
-    }
-
-    @Test
-    public void testRootSpecHasRootPathAsDestination() {
-        assertThat(spec.destPath, equalTo(new RelativePath(false)))
-    }
-
-    @Test
-    public void testChildSpecResolvesIntoArgRelativeToParentDestinationDir() {
-        CopySpec child = spec.from('somedir') { into 'child' }
-        assertThat(unpackWrapper(child).destPath, equalTo(new RelativePath(false, 'child')))
-
-        CopySpec grandchild = child.from('somedir') { into 'grandchild' }
-        assertThat(unpackWrapper(grandchild).destPath, equalTo(new RelativePath(false, 'child', 'grandchild')))
-
-        grandchild.into '/grandchild'
-        assertThat(unpackWrapper(grandchild).destPath, equalTo(new RelativePath(false, 'grandchild')))
-    }
-
-    @Test
-    public void testChildSpecUsesParentDestinationPathAsDefault() {
-        CopySpec child = spec.from('somedir') {}
-        assertThat(unpackWrapper(child).destPath, equalTo(spec.destPath))
-
-        child.into 'child'
-
-        CopySpec grandchild = child.from('somedir') {}
-        assertThat(unpackWrapper(grandchild).destPath, equalTo(unpackWrapper(child).destPath))
-    }
-
-    @Test
-    public void testSourceIsFilteredTreeOfSources() {
-        spec.from 'a'
-        spec.from 'b'
-
-        def filteredTree = context.mock(FileTree, 'filtered')
-
-        context.checking {
-            one(fileResolver).resolveFilesAsTree(['a', 'b'] as Set)
-            def tree = context.mock(FileTree, 'source')
-            will(returnValue(tree))
-            one(tree).matching(withParam(equalTo(spec.patternSet)))
-            will(returnValue(filteredTree))
-        }
-
-        assertThat(spec.source, sameInstance(filteredTree))
-    }
-
-    @Test
-    public void testChildUsesPatternsFromParent() {
-        CopySpec child = spec.from('dir') {}
-        Spec specInclude = [:] as Spec
-        Spec specExclude = [:] as Spec
-        Spec childInclude = [:] as Spec
-        Spec childExclude = [:] as Spec
-
-        spec.include('parent-include')
-        spec.exclude('parent-exclude')
-        spec.include(specInclude)
-        spec.exclude(specExclude)
-        child.include('child-include')
-        child.exclude('child-exclude')
-        child.include(childInclude)
-        child.exclude(childExclude)
-
-        PatternSet patterns = unpackWrapper(child).patternSet
-        assertThat(patterns.includes, equalTo(['parent-include', 'child-include'] as Set))
-        assertThat(patterns.excludes, equalTo(['parent-exclude', 'child-exclude'] as Set))
-        assertThat(patterns.includeSpecs, equalTo([specInclude, childInclude] as Set))
-        assertThat(patterns.excludeSpecs, equalTo([specExclude, childExclude] as Set))
-    }
-
-    @Test
-    public void testChildUsesParentPatternsAsDefault() {
-        CopySpec child = spec.from('dir') {}
-        Spec specInclude = [:] as Spec
-        Spec specExclude = [:] as Spec
-
-        spec.include('parent-include')
-        spec.exclude('parent-exclude')
-        spec.include(specInclude)
-        spec.exclude(specExclude)
-
-        PatternSet patterns = unpackWrapper(child).patternSet
-        assertThat(patterns.includes, equalTo(['parent-include'] as Set))
-        assertThat(patterns.excludes, equalTo(['parent-exclude'] as Set))
-        assertThat(patterns.includeSpecs, equalTo([specInclude] as Set))
-        assertThat(patterns.excludeSpecs, equalTo([specExclude] as Set))
-    }
-
-    @Test
-    public void caseSensitiveFlagDefaultsToTrue() {
-        assert spec.caseSensitive
-        assert spec.patternSet.caseSensitive
-    }
-
-    @Test
-    public void childUsesCaseSensitiveFlagFromParentAsDefault() {
-        def child = spec.from('dir') {}
-        def realChild = (child as CopySpecWrapper).delegate as DefaultCopySpec
-
-        assert child.caseSensitive
-        assert realChild.patternSet.caseSensitive
-
-        spec.caseSensitive = false
-        assert !child.caseSensitive
-        assert !realChild.patternSet.caseSensitive
-
-        child.caseSensitive = true
-        assert child.caseSensitive
-        assert realChild.patternSet.caseSensitive
-    }
-
-    @Test
-    public void includeEmptyDirsFlagDefaultsToTrue() {
-        assert spec.includeEmptyDirs
-    }
-
-    @Test
-    public void childUsesIncludeEmptyDirsFlagFromParentAsDefault() {
-        def child = spec.from('dir') {}
-
-        assert child.includeEmptyDirs
-
-        spec.includeEmptyDirs = false
-        assert !child.includeEmptyDirs
-
-        child.includeEmptyDirs = true
-        assert child.includeEmptyDirs
+        assertThat(unpackWrapper(child).buildRootResolver().destPath, equalTo(new RelativePath(false, 'target')))
     }
 
     @Test
     public void testNoArgFilter() {
         spec.filter(StripJavaComments)
-        assertThat(spec.allCopyActions.size(), equalTo(1))
+        assertThat(spec.copyActions.size(), equalTo(1))
     }
 
     @Test
     public void testArgFilter() {
         spec.filter(HeadFilter, lines: 15, skip: 2)
-        assertThat(spec.allCopyActions.size(), equalTo(1))
+        assertThat(spec.copyActions.size(), equalTo(1))
     }
 
     @Test
     public void testExpand() {
         spec.expand(version: '1.2', skip: 2)
-        assertThat(spec.allCopyActions.size(), equalTo(1))
+        assertThat(spec.copyActions.size(), equalTo(1))
     }
 
     @Test
@@ -295,33 +151,33 @@ public class DefaultCopySpecTest {
         spec.filter(StripJavaComments)
         spec.filter(HeadFilter, lines: 15, skip: 2)
 
-        assertThat(spec.allCopyActions.size(), equalTo(2))
+        assertThat(spec.copyActions.size(), equalTo(2))
     }
 
     @Test
     public void testAddsStringNameTransformerToActions() {
         spec.rename("regexp", "replacement")
 
-        assertThat(spec.allCopyActions.size(), equalTo(1))
-        assertThat(spec.allCopyActions[0], instanceOf(RenamingCopyAction))
-        assertThat(spec.allCopyActions[0].transformer, instanceOf(RegExpNameMapper))
+        assertThat(spec.copyActions.size(), equalTo(1))
+        assertThat(spec.copyActions[0], instanceOf(RenamingCopyAction))
+        assertThat(spec.copyActions[0].transformer, instanceOf(RegExpNameMapper))
     }
 
     @Test
     public void testAddsPatternNameTransformerToActions() {
         spec.rename(/regexp/, "replacement")
 
-        assertThat(spec.allCopyActions.size(), equalTo(1))
-        assertThat(spec.allCopyActions[0], instanceOf(RenamingCopyAction))
-        assertThat(spec.allCopyActions[0].transformer, instanceOf(RegExpNameMapper))
+        assertThat(spec.copyActions.size(), equalTo(1))
+        assertThat(spec.copyActions[0], instanceOf(RenamingCopyAction))
+        assertThat(spec.copyActions[0].transformer, instanceOf(RegExpNameMapper))
     }
 
     @Test
     public void testAddsClosureToActions() {
         spec.rename {}
 
-        assertThat(spec.allCopyActions.size(), equalTo(1))
-        assertThat(spec.allCopyActions[0], instanceOf(RenamingCopyAction))
+        assertThat(spec.copyActions.size(), equalTo(1))
+        assertThat(spec.copyActions[0], instanceOf(RenamingCopyAction))
     }
 
     @Test
@@ -329,7 +185,7 @@ public class DefaultCopySpecTest {
         def action = context.mock(Action)
         spec.eachFile(action)
 
-        assertThat(spec.allCopyActions, equalTo([action]))
+        assertThat(spec.copyActions, equalTo([action]))
     }
 
     @Test
@@ -337,37 +193,9 @@ public class DefaultCopySpecTest {
         def action = {}
         spec.eachFile(action)
 
-        assertThat(spec.allCopyActions.size(), equalTo(1))
-    }
-
-    @Test
-    public void testSpecInheritsActionsFromParent() {
-        Action parentAction = context.mock(Action, 'parent')
-        Action childAction = context.mock(Action, 'child')
-
-        spec.eachFile parentAction
-        CopySpec childSpec = spec.from('src') {
-            eachFile childAction
-        }
-
-        assertThat(unpackWrapper(childSpec).allCopyActions, equalTo([parentAction, childAction]))
-    }
-
-    @Test
-    public void testHasNoPermissionsByDefault() {
-        assert spec.fileMode == null
-        assert spec.dirMode == null
+        assertThat(spec.copyActions.size(), equalTo(1))
     }
 
-    @Test
-    public void testInheritsPermissionsFromParent() {
-        spec.fileMode = 0x1
-        spec.dirMode = 0x2
-
-        CopySpec child = spec.from('src') {}
-        Assert.assertEquals(0x1, child.fileMode)
-        Assert.assertEquals(0x2, child.dirMode)
-    }
 
     @Test
     public void testHasNoSourceByDefault() {
@@ -386,31 +214,14 @@ public class DefaultCopySpecTest {
         assertTrue(spec.hasSource())
     }
 
-    @Test
-    public void duplicatesStrategyDefaultsToInclude() {
-        assert spec.duplicatesStrategy == DuplicatesStrategy.INCLUDE
-    }
-
-    @Test
-    public void childInheritsDuplicatesStrategyFromParent() {
-        def child = spec.from('dir') {}
-
-        assert child.duplicatesStrategy == DuplicatesStrategy.INCLUDE
-
-        spec.duplicatesStrategy = 'EXCLUDE'
-        assert child.duplicatesStrategy == DuplicatesStrategy.EXCLUDE
-
-        child.duplicatesStrategy = 'INCLUDE'
-        assert child.duplicatesStrategy == DuplicatesStrategy.INCLUDE
-    }
 
     @Test
     public void testMatchingCreatesAppropriateAction() {
         spec.filesMatching "root/**/a*", Actions.doNothing()
-        assertEquals(1, spec.allCopyActions.size())
-        assertThat(spec.allCopyActions[0], instanceOf(MatchingCopyAction))
+        assertEquals(1, spec.copyActions.size())
+        assertThat(spec.copyActions[0], instanceOf(MatchingCopyAction))
 
-        Spec<RelativePath> matchSpec = spec.allCopyActions[0].matchSpec
+        Spec<RelativePath> matchSpec = spec.copyActions[0].matchSpec
         assertTrue(matchSpec.isSatisfiedBy(RelativePath.parse(true, '/root/folder/abc')))
         assertTrue(matchSpec.isSatisfiedBy(RelativePath.parse(true, '/root/abc')))
         assertFalse(matchSpec.isSatisfiedBy(RelativePath.parse(true, '/notRoot/abc')))
@@ -422,10 +233,10 @@ public class DefaultCopySpecTest {
     public void testNotMatchingCreatesAppropriateAction() {
         // no path component starting with an a
         spec.filesNotMatching("**/a*/**", Actions.doNothing())
-        assertEquals(1, spec.allCopyActions.size())
-        assertThat(spec.allCopyActions[0], instanceOf(MatchingCopyAction))
+        assertEquals(1, spec.copyActions.size())
+        assertThat(spec.copyActions[0], instanceOf(MatchingCopyAction))
 
-        Spec<RelativePath> matchSpec = spec.allCopyActions[0].matchSpec
+        Spec<RelativePath> matchSpec = spec.copyActions[0].matchSpec
         assertTrue(matchSpec.isSatisfiedBy(RelativePath.parse(true, 'root/folder1/folder2')))
         assertTrue(matchSpec.isSatisfiedBy(RelativePath.parse(true, 'modules/project1')))
         assertFalse(matchSpec.isSatisfiedBy(RelativePath.parse(true, 'archives/folder/file')))
@@ -498,6 +309,77 @@ public class DefaultCopySpecTest {
         assert spec.childSpecs[2] == child3
     }
 
+    @Test
+    void "properties accessed directly have defaults"() {
+
+        assert spec.caseSensitive == true;
+        assert spec.getIncludeEmptyDirs() == true;
+        assert spec.duplicatesStrategy == DuplicatesStrategy.INCLUDE
+        assert spec.fileMode == null
+        assert spec.dirMode == null
+
+        spec.caseSensitive = false
+        spec.includeEmptyDirs = false
+        spec.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        spec.fileMode = 1
+        spec.dirMode = 2
+
+        assert spec.caseSensitive == false;
+        assert spec.getIncludeEmptyDirs() == false;
+        assert spec.duplicatesStrategy == DuplicatesStrategy.EXCLUDE
+        assert spec.fileMode == 1
+        assert spec.dirMode == 2
+
+
+    }
+
+    @Test
+    void "properties accessed directly on specs created using from inherit from parents"() {
+
+        //set non defaults on root
+        spec.caseSensitive = false
+        spec.includeEmptyDirs = false
+        spec.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        spec.fileMode = 1
+        spec.dirMode = 2
+
+        DefaultCopySpec child = unpackWrapper(spec.from("child") {
+
+        })
+
+        //children still have defaults
+        assert child.caseSensitive == false;
+        assert child.getIncludeEmptyDirs() == false;
+        assert child.duplicatesStrategy == DuplicatesStrategy.EXCLUDE
+        assert child.fileMode == 1
+        assert child.dirMode == 2
+
+    }
+
+    @Test
+    void "properties accessed directly on specs created using into inherit from parents"() {
+
+        //set non defaults on root
+        spec.caseSensitive = false
+        spec.includeEmptyDirs = false
+        spec.duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        spec.fileMode = 1
+        spec.dirMode = 2
+
+        DefaultCopySpec child = unpackWrapper(spec.into("child") {
+
+        })
+
+        //children still have defaults
+        assert child.caseSensitive == false;
+        assert child.getIncludeEmptyDirs() == false;
+        assert child.duplicatesStrategy == DuplicatesStrategy.EXCLUDE
+        assert child.fileMode == 1
+        assert child.dirMode == 2
+
+    }
+
+
     DefaultCopySpec unpackWrapper(CopySpec copySpec) {
         (copySpec as CopySpecWrapper).delegate as DefaultCopySpec
     }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecoratorTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionExecutorTest.groovy
similarity index 89%
rename from subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecoratorTest.groovy
rename to subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionExecutorTest.groovy
index 7fbb8c75536d..dfc421757bf2 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionDecoratorTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/file/copy/DuplicateHandlingCopyActionExecutorTest.groovy
@@ -30,7 +30,7 @@ import org.junit.Rule
 import spock.lang.Shared
 import spock.lang.Specification
 
-class DuplicateHandlingCopyActionDecoratorTest extends Specification {
+class DuplicateHandlingCopyActionExecutorTest extends Specification {
 
     private static interface MyCopySpec extends CopySpec, CopySpecInternal {}
 
@@ -47,10 +47,11 @@ class DuplicateHandlingCopyActionDecoratorTest extends Specification {
     @Rule ConfigureLogging logging = new ConfigureLogging(appender)
 
     @Shared Instantiator instantiator = ThreadGlobalInstantiator.getOrCreate()
-    def driver = new CopyActionExecuter(instantiator, fileSystem)
+    def executer = new CopyActionExecuter(instantiator, fileSystem)
     def copySpec = Mock(MyCopySpec) {
         getChildren() >> []
     }
+    def copySpecResolver = Mock(CopySpecResolver)
 
     def duplicatesIncludedByDefault() {
         given:
@@ -99,7 +100,7 @@ class DuplicateHandlingCopyActionDecoratorTest extends Specification {
         given:
         files 'path/file1.txt', 'path/file2.txt', 'path/file1.txt'
         actions {}
-        copySpec.duplicatesStrategy >> DuplicatesStrategy.EXCLUDE
+        copySpecResolver.duplicatesStrategy >> DuplicatesStrategy.EXCLUDE
 
         when:
         visit()
@@ -113,7 +114,7 @@ class DuplicateHandlingCopyActionDecoratorTest extends Specification {
         given:
         files 'path/file1.txt', 'path/file2.txt', 'path/file1.txt'
         actions {}
-        copySpec.duplicatesStrategy >> DuplicatesStrategy.FAIL
+        copySpecResolver.duplicatesStrategy >> DuplicatesStrategy.FAIL
 
         when:
         visit()
@@ -128,7 +129,7 @@ class DuplicateHandlingCopyActionDecoratorTest extends Specification {
         given:
         files 'path/file1.txt', 'path/file2.txt', 'path/file1.txt'
         actions {}
-        copySpec.duplicatesStrategy >> DuplicatesStrategy.WARN
+        copySpecResolver.duplicatesStrategy >> DuplicatesStrategy.WARN
 
         when:
         visit()
@@ -170,9 +171,9 @@ class DuplicateHandlingCopyActionDecoratorTest extends Specification {
 
 
     void files(String... fileNames) {
-        copySpec.destPath >> new RelativePath(false, '/root')
+        copySpecResolver.destPath >> new RelativePath(false, '/root')
         def fileTree = Mock(FileTree)
-        copySpec.getSource() >> fileTree
+        copySpecResolver.getSource() >> fileTree
         fileTree.visit(_ as FileVisitor) >> { FileVisitor visitor ->
             fileNames.each { filename ->
                 def fvd = Mock(FileVisitDetails) {
@@ -182,15 +183,15 @@ class DuplicateHandlingCopyActionDecoratorTest extends Specification {
             }
             fileTree
         }
-        copySpec.walk(_) >> { Action it -> it.execute(copySpec) }
+        copySpec.walk(_) >> { Action it -> it.execute(copySpecResolver) }
     }
 
     void actions(Closure... actions) {
-        copySpec.allCopyActions >> actions.collect { new ClosureBackedAction<>(it) }
+        copySpecResolver.allCopyActions >> actions.collect { new ClosureBackedAction<>(it) }
     }
 
     void visit() {
-        driver.execute(copySpec, delegate)
+        executer.execute(copySpec, delegate)
     }
 
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScopeTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScopeTest.groovy
index 2ec75a815ca0..e96c95819d9a 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScopeTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultClassLoaderScopeTest.groovy
@@ -28,24 +28,21 @@ import spock.lang.Specification
 
 class DefaultClassLoaderScopeTest extends Specification {
 
-    ClassLoader parentClassLoader
-    ClassLoader baseClassLoader
+    ClassLoader rootClassLoader
 
-    ClassLoaderScope parent
-    ClassLoaderScope base
+    ClassLoaderScope root
     ClassLoaderScope scope
 
-    Cache<DefaultClassLoaderCache.Key, ClassLoader> backingCache = CacheBuilder.newBuilder().build();
-    ClassLoaderCache classLoaderCache = new DefaultClassLoaderCache(backingCache);
+    Cache<DefaultClassLoaderCache.Key, ClassLoader> backingCache = CacheBuilder.newBuilder().build()
+    ClassLoaderCache classLoaderCache = new DefaultClassLoaderCache(backingCache)
 
-    @Rule TestNameTestDirectoryProvider testDirectoryProvider = new TestNameTestDirectoryProvider()
+    @Rule
+    TestNameTestDirectoryProvider testDirectoryProvider = new TestNameTestDirectoryProvider()
 
     def setup() {
-        parentClassLoader = new URLClassLoader(classPath("root").asURLArray)
-        baseClassLoader = new URLClassLoader(classPath("base").asURLArray)
-        parent = new RootClassLoaderScope(parentClassLoader, classLoaderCache)
-        base = new RootClassLoaderScope(baseClassLoader, classLoaderCache)
-        scope = new DefaultClassLoaderScope(parent, base, classLoaderCache)
+        rootClassLoader = new URLClassLoader(classPath("root").asURLArray)
+        root = new RootClassLoaderScope(rootClassLoader, classLoaderCache)
+        scope = root.createChild()
     }
 
     TestFile file(String path) {
@@ -61,70 +58,64 @@ class DefaultClassLoaderScopeTest extends Specification {
         scope.lock()
 
         then:
-        scope.childClassLoader.is parentClassLoader
-        scope.scopeClassLoader.is parentClassLoader
+        scope.localClassLoader.is rootClassLoader
+        scope.exportClassLoader.is rootClassLoader
     }
 
     def "locked scope with only exports only exports exports"() {
         when:
         file("export/foo") << "bar"
-        def exportClassLoader = scope.export(classPath("export"))
-        scope.lock()
+        scope.export(root.loader(classPath("export"))).lock()
 
         then:
-        exportClassLoader.getResource("foo").text == "bar"
-        scope.childClassLoader.is scope.scopeClassLoader
-        scope.scopeClassLoader.getResource("foo").text == "bar"
+        scope.exportClassLoader.getResource("foo").text == "bar"
+        scope.localClassLoader.is scope.exportClassLoader
     }
 
     def "locked scope with only local exports parent loader to children"() {
         when:
         file("local/foo") << "bar"
-        def localClassLoader = scope.addLocal(classPath("local"))
-        scope.lock()
+        scope.local(root.loader(classPath("local"))).lock()
 
         then:
-        localClassLoader.getResource("foo").text == "bar"
-        scope.childClassLoader.is parentClassLoader
-        scope.scopeClassLoader.getResource("foo").text == "bar"
+        scope.localClassLoader.getResource("foo").text == "bar"
+        scope.exportClassLoader.is rootClassLoader
     }
 
     def "locked scope with local and exports exports custom classloader to children"() {
         when:
         file("local/local") << "bar"
         file("export/export") << "bar"
-        def localClassLoader = scope.addLocal(classPath("local"))
-        def exportClassLoader = scope.export(classPath("export"))
-        scope.lock()
+        scope.
+                local(root.loader(classPath("local"))).
+                export(root.loader(classPath("export"))).
+                lock()
 
         then:
-        localClassLoader.getResource("local").text == "bar"
-        exportClassLoader.getResource("export").text == "bar"
-        scope.childClassLoader.getResource("export").text == "bar"
-        scope.childClassLoader.getResource("local") == null
-        scope.scopeClassLoader instanceof CachingClassLoader
-        scope.scopeClassLoader.getResource("export").text == "bar"
-        scope.scopeClassLoader.getResource("local").text == "bar"
+        scope.exportClassLoader.getResource("export").text == "bar"
+        scope.exportClassLoader.getResource("local") == null
+        scope.localClassLoader instanceof CachingClassLoader
+        scope.localClassLoader.getResource("export").text == "bar"
+        scope.localClassLoader.getResource("local").text == "bar"
     }
 
     def "requesting loaders before locking creates pessimistic setup"() {
         given:
-        scope.scopeClassLoader // trigger
+        scope.localClassLoader // trigger
 
         when:
         file("local/local") << "bar"
         file("export/export") << "bar"
-        def localClassLoader = scope.addLocal(classPath("local"))
-        def exportClassLoader = scope.export(classPath("export"))
+        scope.
+                local(root.loader(classPath("local"))).
+                export(root.loader(classPath("export")))
 
         then:
-        localClassLoader.getResource("local").text == "bar"
-        exportClassLoader.getResource("export").text == "bar"
-        scope.childClassLoader.getResource("export").text == "bar"
-        scope.childClassLoader.getResource("local") == null
-        scope.scopeClassLoader instanceof CachingClassLoader
-        scope.scopeClassLoader.getResource("export").text == "bar"
-        scope.scopeClassLoader.getResource("local").text == "bar"
+        scope.exportClassLoader.getResource("export").text == "bar"
+        scope.exportClassLoader.getResource("local") == null
+        scope.localClassLoader instanceof CachingClassLoader
+        scope.localClassLoader.getResource("export").text == "bar"
+        scope.localClassLoader.getResource("local").text == "bar"
     }
 
     def "cannot modify after locking"() {
@@ -132,13 +123,13 @@ class DefaultClassLoaderScopeTest extends Specification {
         scope.lock()
 
         when:
-        scope.addLocal(classPath("local"))
+        scope.local(root.loader(classPath("local")))
 
         then:
         thrown IllegalStateException
 
         when:
-        scope.export(classPath("local"))
+        scope.export(root.loader(classPath("local")))
 
         then:
         thrown IllegalStateException
@@ -148,52 +139,30 @@ class DefaultClassLoaderScopeTest extends Specification {
         when:
         file("local/local") << "bar"
         file("export/export") << "bar"
-        scope.addLocal(classPath("local"))
-        scope.export(classPath("export"))
-        scope.lock()
-        def child = scope.createChild()
-        child.lock()
+        scope.local(root.loader(classPath("local")))
+        scope.export(root.loader(classPath("export")))
+        def child = scope.lock().createChild().lock()
 
         then:
-        child.scopeClassLoader.getResource("export").text == "bar"
-        child.scopeClassLoader.getResource("local") == null
-        child.childClassLoader.getResource("export").text == "bar"
-        child.childClassLoader.getResource("local") == null
+        child.localClassLoader.getResource("export").text == "bar"
+        child.localClassLoader.getResource("local") == null
+        child.exportClassLoader.getResource("export").text == "bar"
+        child.exportClassLoader.getResource("local") == null
     }
 
     def "sibling scopes can not access exported or local"() {
         when:
         file("local/local") << "bar"
         file("export/export") << "bar"
-        scope.addLocal(classPath("local"))
-        scope.export(classPath("export"))
-        scope.lock()
-        def sibling = scope.createSibling()
-        sibling.lock()
+        scope.local(root.loader(classPath("local")))
+        scope.export(root.loader(classPath("export")))
+        def sibling = scope.lock().createSibling().lock()
 
         then:
-        sibling.scopeClassLoader.getResource("export") == null
-        sibling.scopeClassLoader.getResource("local") == null
-        sibling.childClassLoader.getResource("export") == null
-        sibling.childClassLoader.getResource("local") == null
-    }
-
-    def "rebased children local additions can access parent exported"() {
-        when:
-        file("local/local") << "bar"
-        file("export/export") << "bar"
-        scope.addLocal(classPath("local"))
-        scope.export(classPath("export"))
-        scope.lock()
-        def child = scope.createRebasedChild()
-        file("childLocal/childLocal") << "bar"
-        def childLocalClassLoader = child.addLocal(classPath("childLocal"))
-        child.lock()
-
-        then:
-        childLocalClassLoader.getResource("local") == null
-        childLocalClassLoader.getResource("export").text == "bar"
-        childLocalClassLoader.getResource("childLocal").text == "bar"
+        sibling.localClassLoader.getResource("export") == null
+        sibling.localClassLoader.getResource("local") == null
+        sibling.exportClassLoader.getResource("export") == null
+        sibling.exportClassLoader.getResource("local") == null
     }
 
     def "class loaders are reused"() {
@@ -201,25 +170,25 @@ class DefaultClassLoaderScopeTest extends Specification {
         backingCache.size() == 0
 
         when:
-        file("c1/c1") << "bar"
-        file("c2/c2") << "bar"
-        def c1ExportLoader = scope.export(classPath("c1"))
-        def c2Local = scope.addLocal(classPath("c2"))
-        scope.lock()
+        def c1 = classPath("c1")
+        def c2 = classPath("c2")
+        def c1LoaderRoot = root.loader(c1)
+        def c2LoaderRoot = root.loader(c2)
+        scope.export(c1LoaderRoot).local(c2LoaderRoot).lock()
+
+        def sibling = scope.createSibling().lock()
+        def child = scope.createChild().lock()
 
-        def sibling = scope.createSibling()
-        def child = scope.createChild()
+        scope.localClassLoader
+        sibling.localClassLoader
+        child.localClassLoader
 
         then:
         backingCache.size() == 2
-        sibling.export(classPath("c1")).is c1ExportLoader
+        sibling.loader(c1).create().is c1LoaderRoot.create()
         backingCache.size() == 2
 
-        !child.export(classPath("c1")).is(c1ExportLoader) // classpath is the same, but parent is different
-        backingCache.size() == 3
-
-        sibling.addLocal(classPath("c2")).is c2Local
-        child.addLocal(classPath("c2")).is c2Local
+        !child.loader(c1).create().is(c1LoaderRoot.create()) // classpath is the same, but root is different
         backingCache.size() == 3
     }
 
@@ -228,7 +197,7 @@ class DefaultClassLoaderScopeTest extends Specification {
         file("root/root") << "foo"
 
         then:
-        scope.scopeClassLoader.getResource("root").text == "foo"
+        scope.localClassLoader.getResource("root").text == "foo"
     }
 
     def "optimised structure has parent visibility"() {
@@ -236,6 +205,6 @@ class DefaultClassLoaderScopeTest extends Specification {
         file("root/root") << "foo"
 
         then:
-        scope.lock().scopeClassLoader.getResource("root").text == "foo"
+        scope.lock().localClassLoader.getResource("root").text == "foo"
     }
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactoryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactoryTest.groovy
index ee7748a96733..1876d3018a5d 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactoryTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerFactoryTest.groovy
@@ -28,7 +28,7 @@ import spock.lang.Specification
 class DefaultScriptHandlerFactoryTest extends Specification {
     private final DependencyMetaDataProvider metaDataProvider = Mock()
     private final ClassLoaderScope parentScope = Stub() {
-        getScopeClassLoader() >> Stub(ClassLoader)
+        getLocalClassLoader() >> Stub(ClassLoader)
     }
     private final RepositoryHandler repositoryHandler = Mock()
     private final ConfigurationContainerInternal configurationContainer = Mock()
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerTest.groovy
index 53344141d7e6..9e9323264560 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/initialization/DefaultScriptHandlerTest.groovy
@@ -31,7 +31,7 @@ class DefaultScriptHandlerTest extends Specification {
     def scriptSource = Stub(ScriptSource)
     def baseClassLoader = new ClassLoader() {}
     def classLoaderScope = Stub(ClassLoaderScope) {
-        getScopeClassLoader() >> baseClassLoader
+        getLocalClassLoader() >> baseClassLoader
     }
 
     def "adds classpath configuration"() {
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultObjectConfigurationActionTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultObjectConfigurationActionTest.groovy
index c2e9129d385f..c0b9cda63b9e 100755
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultObjectConfigurationActionTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultObjectConfigurationActionTest.groovy
@@ -35,9 +35,10 @@ class DefaultObjectConfigurationActionTest extends Specification {
     def scriptHandlerFactory = Mock(ScriptHandlerFactory)
     def scriptHandler = Mock(ScriptHandler)
     def scriptCompileScope = Mock(ClassLoaderScope)
+    def parentCompileScope = Mock(ClassLoaderScope)
     def configurer = Mock(ScriptPlugin)
 
-    DefaultObjectConfigurationAction action = new DefaultObjectConfigurationAction(resolver, scriptPluginFactory, scriptHandlerFactory, scriptCompileScope, target)
+    DefaultObjectConfigurationAction action = new DefaultObjectConfigurationAction(resolver, scriptPluginFactory, scriptHandlerFactory, parentCompileScope, target)
 
     void doesNothingWhenNothingSpecified() {
         expect:
@@ -48,8 +49,9 @@ class DefaultObjectConfigurationActionTest extends Specification {
     public void appliesScriptsToDefaultTargetObject() {
         given:
         1 * resolver.resolveUri('script') >> file
+        1 * parentCompileScope.createChild() >> scriptCompileScope
         1 * scriptHandlerFactory.create(_, scriptCompileScope) >> scriptHandler
-        1 * scriptPluginFactory.create(_, scriptHandler, scriptCompileScope, "buildscript", DefaultScript) >> configurer
+        1 * scriptPluginFactory.create(_, scriptHandler, scriptCompileScope, parentCompileScope, "buildscript", DefaultScript, false) >> configurer
 
         when:
         action.from('script')
@@ -65,9 +67,11 @@ class DefaultObjectConfigurationActionTest extends Specification {
         Object target2 = new Object()
         1 * resolver.resolveUri('script') >> file
         1 * scriptHandlerFactory.create(_, scriptCompileScope) >> scriptHandler
-        1 * scriptPluginFactory.create(_, scriptHandler, scriptCompileScope, "buildscript", DefaultScript) >> configurer
+        1 * scriptPluginFactory.create(_, scriptHandler, scriptCompileScope, parentCompileScope,  "buildscript", DefaultScript, false) >> configurer
         1 * configurer.apply(target1)
         1 * configurer.apply(target2)
+        1 * parentCompileScope.createChild() >> scriptCompileScope
+
 
         then:
         action.from('script')
@@ -83,9 +87,11 @@ class DefaultObjectConfigurationActionTest extends Specification {
         Object target2 = new Object()
         1 * resolver.resolveUri('script') >> file
         1 * scriptHandlerFactory.create(_, scriptCompileScope) >> scriptHandler
-        1 * scriptPluginFactory.create(_, scriptHandler, scriptCompileScope, "buildscript", DefaultScript) >> configurer
+        1 * scriptPluginFactory.create(_, scriptHandler, scriptCompileScope, parentCompileScope, "buildscript", DefaultScript, false) >> configurer
         1 * configurer.apply(target1)
         1 * configurer.apply(target2)
+        1 * parentCompileScope.createChild() >> scriptCompileScope
+
 
         then:
         action.from('script')
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.groovy
new file mode 100644
index 000000000000..48b1488f031d
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.groovy
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.plugins
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.internal.project.TestPlugin1
+import org.gradle.api.internal.project.TestPlugin2
+import org.gradle.api.plugins.UnknownPluginException
+import org.gradle.util.TestUtil
+import spock.lang.Specification
+import spock.lang.Subject
+
+public class DefaultPluginContainerTest extends Specification {
+
+    def project = TestUtil.createRootProject()
+    def pluginRegistry = Mock(PluginRegistry)
+    @Subject container = new DefaultPluginContainer(pluginRegistry, project)
+
+    def "offers plugin management via plugin id"() {
+        def plugin = new TestPlugin1()
+        pluginRegistry.getTypeForId("plugin") >> TestPlugin1
+        pluginRegistry.loadPlugin(TestPlugin1) >> plugin
+        pluginRegistry.loadPlugin(TestPlugin2) >> new TestPlugin2()
+
+        when: def p = container.apply(TestPlugin1)
+        then:
+        p.is(plugin)
+        p.is(container.apply("plugin"))
+        p.is(container.apply(TestPlugin1))
+
+        p.is(container.findPlugin(TestPlugin1))
+        p.is(container.findPlugin("plugin"))
+
+        !container.findPlugin(UnknownPlugin)
+        !container.findPlugin("unknown")
+
+        container.hasPlugin("plugin")
+        container.hasPlugin(TestPlugin1)
+
+        !container.hasPlugin("unknown")
+        !container.hasPlugin(UnknownPlugin)
+    }
+
+    private class UnknownPlugin implements Plugin<Project> {
+        void apply(Project project) {}
+    }
+
+    def "offers plugin management via plugin type"() {
+        def plugin = new TestPlugin1()
+        pluginRegistry.loadPlugin(TestPlugin1) >> plugin
+        pluginRegistry.loadPlugin(TestPlugin2) >> new TestPlugin2()
+
+        when: def p = container.apply(TestPlugin1)
+        then:
+        p.is(plugin)
+        p.is(container.apply(TestPlugin1))
+        p.is(container.findPlugin(TestPlugin1))
+        container.hasPlugin(TestPlugin1)
+
+        !p.is(container.findPlugin(TestPlugin2))
+        !container.hasPlugin(TestPlugin2)
+    }
+
+    def "does not find plugin by unknown id"() {
+        pluginRegistry.getTypeForId("x") >> { throw new UnknownPluginException("x") }
+
+        expect:
+        !container.hasPlugin("x")
+        !container.findPlugin("x")
+    }
+
+    def "fails when getting unknown plugin"() {
+        when: container.getPlugin("unknown")
+        then: thrown(UnknownPluginException)
+    }
+
+    def "fails when getting plugin of unknown type"() {
+        when: container.getPlugin(TestPlugin1)
+        then: thrown(UnknownPluginException)
+    }
+
+    def "executes action for plugin with given id"() {
+        def plugin = new TestPlugin1()
+        pluginRegistry.getTypeForId("plugin") >> TestPlugin1
+        def plugins = []
+        container.add(plugin)
+
+        when: container.withId("plugin") { plugins << it }
+        then: plugins == [plugin]
+    }
+
+    def "executes action when plugin with given id is added later"() {
+        def plugins = []
+        when: container.withId("plugin") { plugins << it }
+        then: plugins.empty
+
+        def plugin = new TestPlugin1()
+        pluginRegistry.getTypeForId("plugin") >> TestPlugin1
+
+        when: container.add(plugin)
+        then: plugins == [plugin]
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.java
deleted file mode 100644
index 5f2e7564d033..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginContainerTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.plugins;
-
-import org.gradle.api.Plugin;
-import org.gradle.api.internal.project.DefaultProject;
-import org.gradle.api.internal.project.TestPlugin1;
-import org.gradle.api.internal.project.TestPlugin2;
-import org.gradle.api.plugins.UnknownPluginException;
-import org.gradle.util.TestUtil;
-import org.jmock.Expectations;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-
-public class DefaultPluginContainerTest {
-    protected String pluginId = "somePluginId";
-    protected JUnit4Mockery context = new JUnit4Mockery();
-    private final DefaultProject project = TestUtil.createRootProject();
-
-    private PluginRegistry pluginRegistryStub = context.mock(PluginRegistry.class);
-    private DefaultPluginContainer container = new DefaultPluginContainer(pluginRegistryStub, project);
-
-    private TestPlugin1 pluginWithIdMock = new TestPlugin1();
-    private TestPlugin2 pluginWithoutIdMock = new TestPlugin2();
-
-    @Before
-    public void setUp() {
-        context.checking(new Expectations() {{
-            allowing(pluginRegistryStub).getTypeForId(pluginId); will(returnValue(TestPlugin1.class));
-            allowing(pluginRegistryStub).loadPlugin(TestPlugin1.class); will(returnValue(pluginWithIdMock));
-            allowing(pluginRegistryStub).loadPlugin(TestPlugin2.class); will(returnValue(pluginWithoutIdMock));
-        }});
-    }
-
-    @Test
-    public void usePluginById() {
-        Plugin addedPlugin = container.apply(pluginId);
-        assertThat(pluginWithIdMock, sameInstance(addedPlugin));
-        assertThat(container.apply(pluginId), sameInstance(addedPlugin));
-
-        assertThat(container.findPlugin(addedPlugin.getClass()), sameInstance(addedPlugin));
-        assertThat(container.findPlugin(pluginId), sameInstance(addedPlugin));
-    }
-
-    @Test
-    public void usePluginWithIdByType() {
-        Class<? extends Plugin> type = pluginWithIdMock.getClass();
-
-        Plugin addedPlugin = container.apply(type);
-        assertThat(pluginWithIdMock, sameInstance(addedPlugin));
-        assertThat(container.apply(type), sameInstance(addedPlugin));
-        assertThat(container.apply(pluginId), sameInstance(addedPlugin));
-
-        assertThat(container.findPlugin(type), sameInstance(addedPlugin));
-        assertThat(container.findPlugin(pluginId), sameInstance(addedPlugin));
-    }
-
-    @Test
-    public void usePluginWithoutId() {
-        Class<? extends Plugin> type = pluginWithoutIdMock.getClass();
-        Plugin addedPlugin = container.apply(type);
-        assertThat(pluginWithoutIdMock, sameInstance(addedPlugin));
-        assertThat(container.apply(type), sameInstance(addedPlugin));
-
-        assertThat(container.findPlugin(type), sameInstance(addedPlugin));
-    }
-
-    @Test
-    public void hasAndFindForPluginWithId() {
-        container.apply(pluginId);
-        assertThat(container.hasPlugin(pluginId), equalTo(true));
-        assertThat(container.hasPlugin(pluginWithIdMock.getClass()), equalTo(true));
-        assertThat(container.findPlugin(pluginId), sameInstance((Plugin) pluginWithIdMock));
-        assertThat(container.findPlugin(pluginWithIdMock.getClass()), sameInstance((Plugin) pluginWithIdMock));
-    }
-
-    @Test
-    public void hasAndFindForUnknownPluginId() {
-        context.checking(new Expectations() {{
-            allowing(pluginRegistryStub).getTypeForId("unknown"); will(throwException(new UnknownPluginException("unknown")));
-        }});
-
-        assertThat(container.hasPlugin("unknown"), equalTo(false));
-        assertThat(container.findPlugin("unknown"), nullValue());
-    }
-
-    @Test
-    public void hasAndFindForPluginWithoutId() {
-        Plugin plugin = pluginWithoutIdMock;
-        Class<? extends Plugin> pluginType = plugin.getClass();
-        container.apply(pluginType);
-        assertThat(container.hasPlugin(pluginType), equalTo(true));
-        assertThat(container.findPlugin(pluginType), sameInstance(plugin));
-    }
-
-    @Test
-    public void hasAndFindPluginByTypeWithUnknownPlugin() {
-        assertThat(container.hasPlugin(TestPlugin2.class), equalTo(false));
-        assertThat(container.findPlugin(TestPlugin2.class), nullValue());
-    }
-
-    @Test(expected = UnknownPluginException.class)
-    public void getNonUsedPluginById() {
-        container.getPlugin(pluginId);
-    }
-
-    @Test(expected = UnknownPluginException.class)
-    public void getNonUsedPluginByType() {
-        container.getPlugin(TestPlugin1.class);
-    }
-}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistryTest.groovy
index 01176556559c..c0834fce1771 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistryTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/DefaultPluginRegistryTest.groovy
@@ -193,7 +193,7 @@ class DefaultPluginRegistryTest extends Specification {
 
         given:
         PluginRegistry child = pluginRegistry.createChild(lookupScope, childInstantiator)
-        _ * lookupScope.scopeClassLoader >> childClassLoader
+        _ * lookupScope.localClassLoader >> childClassLoader
         _ * childClassLoader.getResource("META-INF/gradle-plugins/somePlugin.properties") >> url
         _ * childClassLoader.loadClass(TestPlugin1.name) >> TestPlugin1
 
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/ExtraPropertiesDynamicObjectAdapterTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/ExtraPropertiesDynamicObjectAdapterTest.groovy
index e40f683c6b76..1682f2b85205 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/ExtraPropertiesDynamicObjectAdapterTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/plugins/ExtraPropertiesDynamicObjectAdapterTest.groovy
@@ -84,10 +84,6 @@ public class ExtraPropertiesDynamicObjectAdapterTest extends Specification {
         thrown(groovy.lang.MissingMethodException)
     }
 
-    static class NamedExtraPropertiesExtension extends DefaultExtraPropertiesExtension {
-        String name
-    }
-
     def "has property 'properties'"() {
         expect:
         adapter.hasProperty("properties")
@@ -96,3 +92,7 @@ public class ExtraPropertiesDynamicObjectAdapterTest extends Specification {
         new ExtraPropertiesDynamicObjectAdapter(delegate, new BeanDynamicObject(delegate), new NamedExtraPropertiesExtension()).hasProperty("name")
     }
 }
+
+class NamedExtraPropertiesExtension extends DefaultExtraPropertiesExtension {
+    String name
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/DefaultProjectTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/DefaultProjectTest.groovy
index 66e15b18e9c4..3b67c2e70cc7 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/DefaultProjectTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/DefaultProjectTest.groovy
@@ -38,7 +38,6 @@ import org.gradle.api.internal.initialization.ScriptHandlerFactory
 import org.gradle.api.internal.tasks.TaskContainerInternal
 import org.gradle.api.invocation.Gradle
 import org.gradle.api.plugins.PluginContainer
-import org.gradle.api.tasks.Directory
 import org.gradle.configuration.ScriptPluginFactory
 import org.gradle.configuration.project.ProjectConfigurationActionContainer
 import org.gradle.configuration.project.ProjectEvaluator
@@ -49,7 +48,6 @@ import org.gradle.internal.reflect.Instantiator
 import org.gradle.internal.service.ServiceRegistry
 import org.gradle.internal.service.scopes.ServiceRegistryFactory
 import org.gradle.logging.LoggingManagerInternal
-import org.gradle.logging.StandardOutputCapture
 import org.gradle.model.ModelRules
 import org.gradle.model.internal.ModelRegistry
 import org.gradle.model.internal.ModelRegistryBackedModelRules
@@ -62,6 +60,7 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 import java.awt.*
+import java.lang.reflect.Type
 import java.text.FieldPosition
 
 import static org.hamcrest.Matchers.*
@@ -108,7 +107,8 @@ class DefaultProjectTest {
     SoftwareComponentContainer softwareComponentsMock = context.mock(SoftwareComponentContainer.class)
     ProjectConfigurationActionContainer configureActions = context.mock(ProjectConfigurationActionContainer.class)
 
-    ClassLoaderScope rootProjectClassLoaderScope = new RootClassLoaderScope(getClass().classLoader, new DefaultClassLoaderCache()).createChild()
+    ClassLoaderScope baseClassLoaderScope = new RootClassLoaderScope(getClass().classLoader, new DefaultClassLoaderCache())
+    ClassLoaderScope rootProjectClassLoaderScope = baseClassLoaderScope.createChild()
 
     @Before
     void setUp() {
@@ -137,30 +137,29 @@ class DefaultProjectTest {
             allowing(taskContainerMock).getTasksAsDynamicObject(); will(returnValue(new BeanDynamicObject(new TaskContainerDynamicObject(someTask: testTask))))
             allowing(taskContainerMock).all(withParam(notNullValue()))
             allowing(taskContainerMock).whenObjectRemoved(withParam(notNullValue()))
-            allowing(serviceRegistryMock).get(RepositoryHandler); will(returnValue(repositoryHandlerMock))
+            allowing(serviceRegistryMock).get((Type)RepositoryHandler); will(returnValue(repositoryHandlerMock))
             allowing(serviceRegistryMock).get(ConfigurationContainerInternal); will(returnValue(configurationContainerMock))
             allowing(serviceRegistryMock).get(ArtifactHandler); will(returnValue(context.mock(ArtifactHandler)))
             allowing(serviceRegistryMock).get(DependencyHandler); will(returnValue(dependencyHandlerMock))
-            allowing(serviceRegistryMock).get(ComponentMetadataHandler); will(returnValue(moduleHandlerMock))
-            allowing(serviceRegistryMock).get(SoftwareComponentContainer); will(returnValue(softwareComponentsMock))
+            allowing(serviceRegistryMock).get((Type)ComponentMetadataHandler); will(returnValue(moduleHandlerMock))
+            allowing(serviceRegistryMock).get((Type)SoftwareComponentContainer); will(returnValue(softwareComponentsMock))
             allowing(serviceRegistryMock).get(ProjectEvaluator); will(returnValue(projectEvaluator))
             allowing(serviceRegistryMock).getFactory(AntBuilder); will(returnValue(antBuilderFactoryMock))
-            allowing(serviceRegistryMock).get(PluginContainer); will(returnValue(pluginContainerMock))
-            allowing(serviceRegistryMock).get(ScriptHandler); will(returnValue(scriptHandlerMock))
-            allowing(serviceRegistryMock).get(LoggingManagerInternal); will(returnValue(loggingManagerMock))
-            allowing(serviceRegistryMock).get(StandardOutputCapture); will(returnValue(context.mock(StandardOutputCapture)))
-            allowing(serviceRegistryMock).get(ProjectRegistry); will(returnValue(projectRegistry))
+            allowing(serviceRegistryMock).get((Type)PluginContainer); will(returnValue(pluginContainerMock))
+            allowing(serviceRegistryMock).get((Type)ScriptHandler); will(returnValue(scriptHandlerMock))
+            allowing(serviceRegistryMock).get((Type)LoggingManagerInternal); will(returnValue(loggingManagerMock))
+            allowing(serviceRegistryMock).get(projectRegistryType); will(returnValue(projectRegistry))
             allowing(serviceRegistryMock).get(DependencyMetaDataProvider); will(returnValue(dependencyMetaDataProviderMock))
             allowing(serviceRegistryMock).get(FileResolver); will(returnValue([toString: {-> "file resolver" }] as FileResolver))
             allowing(serviceRegistryMock).get(Instantiator); will(returnValue(instantiatorMock))
-            allowing(serviceRegistryMock).get(FileOperations); will(returnValue(fileOperationsMock))
-            allowing(serviceRegistryMock).get(ProcessOperations); will(returnValue(processOperationsMock))
-            allowing(serviceRegistryMock).get(ScriptPluginFactory); will(returnValue([toString: {-> "script plugin factory" }] as ScriptPluginFactory))
-            allowing(serviceRegistryMock).get(ScriptHandlerFactory); will(returnValue([toString: {-> "script plugin factory" }] as ScriptHandlerFactory))
-            allowing(serviceRegistryMock).get(ProjectConfigurationActionContainer); will(returnValue(configureActions))
+            allowing(serviceRegistryMock).get((Type)FileOperations); will(returnValue(fileOperationsMock))
+            allowing(serviceRegistryMock).get((Type)ProcessOperations); will(returnValue(processOperationsMock))
+            allowing(serviceRegistryMock).get((Type)ScriptPluginFactory); will(returnValue([toString: {-> "script plugin factory" }] as ScriptPluginFactory))
+            allowing(serviceRegistryMock).get((Type)ScriptHandlerFactory); will(returnValue([toString: {-> "script plugin factory" }] as ScriptHandlerFactory))
+            allowing(serviceRegistryMock).get((Type)ProjectConfigurationActionContainer); will(returnValue(configureActions))
             ModelRegistry modelRegistry = context.mock(ModelRegistry)
             ignoring(modelRegistry)
-            allowing(serviceRegistryMock).get(ModelRegistry); will(returnValue(modelRegistry))
+            allowing(serviceRegistryMock).get((Type)ModelRegistry); will(returnValue(modelRegistry))
             allowing(serviceRegistryMock).get(ModelRules); will(returnValue(new ModelRegistryBackedModelRules(modelRegistry)))
             Object listener = context.mock(ProjectEvaluationListener)
             ignoring(listener)
@@ -168,21 +167,24 @@ class DefaultProjectTest {
             will(returnValue(listener))
         }
 
-        // TODO - don't decorate the project objects
         AsmBackedClassGenerator classGenerator = new AsmBackedClassGenerator()
-        project = classGenerator.newInstance(DefaultProject.class, 'root', null, rootDir, script, build, projectServiceRegistryFactoryMock, rootProjectClassLoaderScope);
+        project = classGenerator.newInstance(DefaultProject.class, 'root', null, rootDir, script, build, projectServiceRegistryFactoryMock, rootProjectClassLoaderScope, baseClassLoaderScope);
         def child1ClassLoaderScope = rootProjectClassLoaderScope.createChild()
-        child1 = classGenerator.newInstance(DefaultProject.class, "child1", project, new File("child1"), script, build, projectServiceRegistryFactoryMock, child1ClassLoaderScope)
+        child1 = classGenerator.newInstance(DefaultProject.class, "child1", project, new File("child1"), script, build, projectServiceRegistryFactoryMock, child1ClassLoaderScope, baseClassLoaderScope)
         project.addChildProject(child1)
-        childchild = classGenerator.newInstance(DefaultProject.class, "childchild", child1, new File("childchild"), script, build, projectServiceRegistryFactoryMock, child1ClassLoaderScope.createChild())
+        childchild = classGenerator.newInstance(DefaultProject.class, "childchild", child1, new File("childchild"), script, build, projectServiceRegistryFactoryMock, child1ClassLoaderScope.createChild(), baseClassLoaderScope.createChild())
         child1.addChildProject(childchild)
-        child2 = classGenerator.newInstance(DefaultProject.class, "child2", project, new File("child2"), script, build, projectServiceRegistryFactoryMock, rootProjectClassLoaderScope.createChild())
+        child2 = classGenerator.newInstance(DefaultProject.class, "child2", project, new File("child2"), script, build, projectServiceRegistryFactoryMock, rootProjectClassLoaderScope.createChild(), baseClassLoaderScope.createChild())
         project.addChildProject(child2)
         [project, child1, childchild, child2].each {
             projectRegistry.addProject(it)
         }
     }
 
+    Type getProjectRegistryType() {
+        return AbstractProject.class.getDeclaredMethod("getProjectRegistry").getGenericReturnType()
+    }
+
     //TODO please move more coverage to NewDefaultProjectTest
 
     @Test
@@ -392,89 +394,6 @@ class DefaultProjectTest {
         project.evaluate()
     }
 
-    @Test
-    void testDependsOnWithNoEvaluation() {
-        boolean mockReaderCalled = false
-        final ProjectEvaluator mockReader = [evaluateProject: { DefaultProject project ->
-            mockReaderCalled = true
-            testScript
-        }] as ProjectEvaluator
-        child1.projectEvaluator = mockReader
-        project.dependsOn(child1.name, false)
-        assertFalse mockReaderCalled
-        assertEquals([child1] as Set, project.dependsOnProjects)
-        project.dependsOn(child2.path, false)
-        assertEquals([child1, child2] as Set, project.dependsOnProjects)
-    }
-
-    @Test
-    void testDependsOn() {
-        boolean mockReaderCalled = false
-        final ProjectEvaluator mockReader = [evaluate: { DefaultProject project, state ->
-            mockReaderCalled = true
-            testScript
-        }] as ProjectEvaluator
-        child1.projectEvaluator = mockReader
-        project.dependsOn(child1.name)
-        assertTrue mockReaderCalled
-        assertEquals([child1] as Set, project.dependsOnProjects)
-
-    }
-
-    @Test
-    void testChildrenDependsOnMe() {
-        project.childrenDependOnMe()
-        assertTrue(child1.dependsOnProjects.contains(project))
-        assertTrue(child2.dependsOnProjects.contains(project))
-        assertEquals(1, child1.dependsOnProjects.size())
-        assertEquals(1, child2.dependsOnProjects.size())
-    }
-
-    @Test
-    void testDependsOnChildren() {
-        context.checking {
-            never(projectEvaluator).evaluate(child1, child1.state)
-        }
-
-        project.dependsOnChildren()
-        context.assertIsSatisfied()
-        assertTrue(project.dependsOnProjects.contains(child1))
-        assertTrue(project.dependsOnProjects.contains(child2))
-        assertEquals(2, project.dependsOnProjects.size())
-    }
-
-    @Test
-    void testDependsOnChildrenIncludingEvaluate() {
-        context.checking {
-            one(projectEvaluator).evaluate(child1, child1.state)
-            one(projectEvaluator).evaluate(child2, child2.state)
-        }
-        project.dependsOnChildren(true)
-        assertTrue(project.dependsOnProjects.contains(child1))
-        assertTrue(project.dependsOnProjects.contains(child2))
-        assertEquals(2, project.dependsOnProjects.size())
-    }
-
-    @Test(expected = InvalidUserDataException)
-    void testDependsOnWithNullPath() {
-        project.dependsOn(null)
-    }
-
-    @Test(expected = InvalidUserDataException)
-    void testDependsOnWithEmptyPath() {
-        project.dependsOn('')
-    }
-
-    @Test(expected = UnknownProjectException)
-    void testDependsOnWithUnknownParentPath() {
-        project.dependsOn(child1.path + 'XXX')
-    }
-
-    @Test(expected = UnknownProjectException)
-    void testDependsOnWithUnknownProjectPath() {
-        project.dependsOn(child1.name + 'XXX')
-    }
-
     @Test
     void testAddAndGetChildProject() {
         ProjectInternal child1 = ['getName': {-> 'child1' }] as ProjectInternal
@@ -604,105 +523,6 @@ class DefaultProjectTest {
         assertEquals(child1.newProp, newPropValue)
     }
 
-    @Test
-    void testGetAllTasksRecursive() {
-        Task projectTask = TestUtil.createTask(DefaultTask.class)
-        Task child1Task = TestUtil.createTask(DefaultTask.class)
-        Task child2Task = TestUtil.createTask(DefaultTask.class)
-
-        Map expectedMap = new TreeMap()
-        expectedMap[project] = [projectTask] as TreeSet
-        expectedMap[child1] = [child1Task] as TreeSet
-        expectedMap[child2] = [child2Task] as TreeSet
-        expectedMap[childchild] = [] as TreeSet
-
-        context.checking {
-            atMost(1).of(taskContainerMock).size(); will(returnValue(1))
-            one(taskContainerMock).iterator(); will(returnValue(([projectTask] as Set).iterator()))
-            atMost(1).of(taskContainerMock).size(); will(returnValue(1))
-            one(taskContainerMock).iterator(); will(returnValue(([child1Task] as Set).iterator()))
-            atMost(1).of(taskContainerMock).size(); will(returnValue(1))
-            one(taskContainerMock).iterator(); will(returnValue(([child2Task] as Set).iterator()))
-            atMost(1).of(taskContainerMock).size(); will(returnValue(0))
-            one(taskContainerMock).iterator(); will(returnValue(([] as Set).iterator()))
-        }
-
-        assertEquals(expectedMap, project.getAllTasks(true))
-    }
-
-    @Test
-    void testGetAllTasksNonRecursive() {
-        Task projectTask = TestUtil.createTask(DefaultTask.class)
-
-        Map expectedMap = new TreeMap()
-        expectedMap[project] = [projectTask] as TreeSet
-
-        context.checking {
-            allowing(taskContainerMock).size(); will(returnValue(1))
-            one(taskContainerMock).iterator(); will(returnValue(([projectTask] as Set).iterator()))
-        }
-
-        assertEquals(expectedMap, project.getAllTasks(false))
-    }
-
-    @Test
-    void testGetTasksByNameRecursive() {
-        Task projectTask = TestUtil.createTask(DefaultTask.class)
-        Task child1Task = TestUtil.createTask(DefaultTask.class)
-
-        context.checking {
-            one(taskContainerMock).findByName('task'); will(returnValue(projectTask))
-            one(taskContainerMock).findByName('task'); will(returnValue(child1Task))
-            one(taskContainerMock).findByName('task'); will(returnValue(null))
-            one(taskContainerMock).findByName('task'); will(returnValue(null))
-        }
-
-        assertEquals([projectTask, child1Task] as Set, project.getTasksByName('task', true))
-    }
-
-    @Test
-    void testGetTasksByNameNonRecursive() {
-        Task projectTask = TestUtil.createTask(DefaultTask.class)
-
-        context.checking {
-            one(taskContainerMock).findByName('task'); will(returnValue(projectTask))
-        }
-
-        assertEquals([projectTask] as Set, project.getTasksByName('task', false))
-    }
-
-    @Test(expected = InvalidUserDataException)
-    void testGetTasksWithEmptyName() {
-        project.getTasksByName('', true)
-    }
-
-    @Test(expected = InvalidUserDataException)
-    void testGetTasksWithNullName() {
-        project.getTasksByName(null, true)
-    }
-
-    @Test
-    void testGetTasksWithUnknownName() {
-        context.checking {
-            allowing(taskContainerMock).findByName('task'); will(returnValue(null))
-        }
-
-        assertEquals([] as Set, project.getTasksByName('task', true))
-        assertEquals([] as Set, project.getTasksByName('task', false))
-    }
-
-    private List addTestTaskToAllProjects(String name) {
-        List tasks = []
-        project.allprojects.each { Project project ->
-            tasks << addTestTask(project, name)
-        }
-        tasks
-    }
-
-    private Task addTestTask(Project project, String name) {
-        new DefaultTask(project, name)
-    }
-
     @Test
     void testMethodMissing() {
         boolean closureCalled = false
@@ -865,59 +685,6 @@ def scriptMethod(Closure closure) {
         assertEquals(dir, child1.buildDir)
     }
 
-    @Test
-    public void testDir() {
-        Task dirTask1 = TestUtil.createTask(Directory.class)
-        Task dirTask12 = TestUtil.createTask(Directory.class)
-        Task dirTask123 = TestUtil.createTask(Directory.class)
-        context.checking {
-            one(taskContainerMock).findByName('dir1'); will(returnValue(null))
-            one(taskContainerMock).create('dir1', Directory); will(returnValue(dirTask1))
-            one(taskContainerMock).findByName('dir1/dir2'); will(returnValue(null))
-            one(taskContainerMock).create('dir1/dir2', Directory); will(returnValue(dirTask12))
-            one(taskContainerMock).findByName('dir1/dir2/dir3'); will(returnValue(null))
-            one(taskContainerMock).create('dir1/dir2/dir3', Directory); will(returnValue(dirTask123))
-        }
-        assertSame(dirTask123, project.dir('dir1/dir2/dir3'));
-    }
-
-    @Test
-    public void testDirWithExistingParentDirTask() {
-        Task dirTask1 = TestUtil.createTask(Directory.class)
-        context.checking {
-            one(taskContainerMock).findByName('dir1'); will(returnValue(null))
-            one(taskContainerMock).create('dir1', Directory); will(returnValue(dirTask1))
-        }
-        project.dir('dir1')
-
-        Task dirTask14 = TestUtil.createTask(Directory.class)
-        context.checking {
-            one(taskContainerMock).findByName('dir1'); will(returnValue(dirTask1))
-            one(taskContainerMock).findByName('dir1/dir4'); will(returnValue(null))
-            one(taskContainerMock).create('dir1/dir4', Directory); will(returnValue(dirTask14))
-        }
-        assertSame(dirTask14, project.dir('dir1/dir4'))
-    }
-
-    @Test
-    public void testDirWithConflictingNonDirTask() {
-        Task dirTask14 = TestUtil.createTask(DefaultTask.class)
-
-        Task dirTask1 = TestUtil.createTask(Directory.class)
-        context.checking {
-            one(taskContainerMock).findByName('dir1'); will(returnValue(null))
-            one(taskContainerMock).create('dir1', Directory); will(returnValue(dirTask1))
-            one(taskContainerMock).findByName('dir1/dir4'); will(returnValue(dirTask14))
-        }
-
-        try {
-            project.dir('dir1/dir4')
-            fail()
-        } catch (InvalidUserDataException e) {
-            assertThat(e.message, equalTo("Cannot add directory task 'dir1/dir4' as a non-directory task with this name already exists."))
-        }
-    }
-
     @Test
     void testCachingOfAnt() {
         assertSame(testAntBuilder, project.ant)
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/NewDefaultProjectTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/NewDefaultProjectTest.groovy
index 3c9a0bb501d1..1c27f6979d6e 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/NewDefaultProjectTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/NewDefaultProjectTest.groovy
@@ -16,22 +16,25 @@
 
 package org.gradle.api.internal.project
 
+import org.gradle.api.InvalidUserDataException
 import org.gradle.api.artifacts.dsl.ArtifactHandler
 import org.gradle.api.artifacts.dsl.DependencyHandler
 import org.gradle.api.internal.artifacts.configurations.ConfigurationContainerInternal
 import org.gradle.util.TestUtil
 import spock.lang.Specification
 
+import static org.gradle.util.TestUtil.createChildProject
+
 class NewDefaultProjectTest extends Specification {
 
-    def project = TestUtil.createRootProject()
+    DefaultProject root = TestUtil.createRootProject()
 
     void "delegates to artifacts handler"() {
         def handler = Mock(ArtifactHandler)
-        project.artifactHandler = handler
+        root.artifactHandler = handler
 
         when:
-        project.artifacts {
+        root.artifacts {
             add('conf', 'art')
         }
 
@@ -41,10 +44,10 @@ class NewDefaultProjectTest extends Specification {
 
     void "delegates to dependency handler"() {
         def handler = Mock(DependencyHandler)
-        project.dependencyHandler = handler
+        root.dependencyHandler = handler
 
         when:
-        project.dependencies {
+        root.dependencies {
             add('conf', 'dep')
         }
 
@@ -55,12 +58,91 @@ class NewDefaultProjectTest extends Specification {
     void "delegates to configuration container"() {
         Closure cl = {}
         def container = Mock(ConfigurationContainerInternal)
-        project.configurationContainer = container
+        root.configurationContainer = container
 
         when:
-        project.configurations cl
+        root.configurations cl
 
         then:
         1 * container.configure(cl)
     }
+
+    def "provides all tasks recursively"() {
+        def a = createChildProject(root, "a")
+
+        [root, a].each { it.task "foo"; it.task "bar" }
+
+        when:
+        def rootTasks = root.getAllTasks(true)
+        def aTasks = a.getAllTasks(true)
+
+        then:
+        rootTasks.size() == 2
+        rootTasks[root]*.path as Set == [":bar", ":foo"] as Set
+        rootTasks[a]*.path as Set == [":a:bar", ":a:foo"] as Set
+
+        aTasks.size() == 1
+        aTasks[a]*.path as Set == [":a:bar", ":a:foo"] as Set
+    }
+
+    def "provides all tasks non-recursively"() {
+        def a = createChildProject(root, "a")
+
+        [root, a].each { it.task "foo"; it.task "bar" }
+
+        when:
+        def rootTasks = root.getAllTasks(false)
+        def aTasks = a.getAllTasks(false)
+
+        then:
+        rootTasks.size() == 1
+        rootTasks[root]*.path as Set == [":bar", ":foo"] as Set
+
+        aTasks.size() == 1
+        aTasks[a]*.path as Set == [":a:bar", ":a:foo"] as Set
+    }
+
+    def "provides task by name recursively"() {
+        def a = createChildProject(root, "a")
+
+        [root, a].each { it.task "foo"; it.task "bar" }
+
+        when:
+        def rootTasks = root.getTasksByName("foo", true)
+        def aTasks = a.getTasksByName("bar", true)
+
+        then:
+        rootTasks*.path as Set == [":a:foo", ":foo"] as Set
+        aTasks*.path == [":a:bar"]
+    }
+
+    def "provides task by name non-recursively"() {
+        def a = createChildProject(root, "a")
+
+        [root, a].each { it.task "foo"; it.task "bar" }
+
+        when:
+        def rootTasks = root.getTasksByName("foo", false)
+        def aTasks = a.getTasksByName("bar", false)
+
+        then:
+        rootTasks*.path == [":foo"]
+        aTasks*.path == [":a:bar"]
+    }
+
+    def "does not allow asking for tasks using empty name"() {
+        when: root.getTasksByName('', true)
+        then: thrown(InvalidUserDataException)
+
+        when: root.getTasksByName(null, true)
+        then: thrown(InvalidUserDataException)
+    }
+
+    def "allows asking for unknown tasks"() {
+        root.task "bar"
+
+        expect:
+        root.getTasksByName('foo', true).empty
+        root.getTasksByName('foo', false).empty
+    }
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectFactoryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectFactoryTest.groovy
index 60e5e07e2afc..6370e42837a2 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectFactoryTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/ProjectFactoryTest.groovy
@@ -36,7 +36,8 @@ class ProjectFactoryTest extends Specification {
     def projectRegistry = Mock(ProjectRegistry)
     def project = Stub(DefaultProject)
     def factory = new ProjectFactory(instantiator, projectRegistry)
-    def classLoaderScope = Mock(ClassLoaderScope)
+    def rootProjectScope = Mock(ClassLoaderScope)
+    def baseScope = Mock(ClassLoaderScope)
 
     def setup() {
         gradle.serviceRegistryFactory >> serviceRegistryFactory
@@ -52,11 +53,11 @@ class ProjectFactoryTest extends Specification {
         projectDescriptor.buildFile >> buildFile
 
         when:
-        def result = factory.createProject(projectDescriptor, null, gradle, classLoaderScope)
+        def result = factory.createProject(projectDescriptor, null, gradle, rootProjectScope, baseScope)
 
         then:
         result == project
-        1 * instantiator.newInstance(DefaultProject, "name", null, projectDir, { it instanceof UriScriptSource }, gradle, serviceRegistryFactory, classLoaderScope) >> project
+        1 * instantiator.newInstance(DefaultProject, "name", null, projectDir, { it instanceof UriScriptSource }, gradle, serviceRegistryFactory, rootProjectScope, baseScope) >> project
         1 * projectRegistry.addProject(project)
     }
 
@@ -70,11 +71,11 @@ class ProjectFactoryTest extends Specification {
         projectDescriptor.buildFile >> buildFile
 
         when:
-        def result = factory.createProject(projectDescriptor, null, gradle, classLoaderScope)
+        def result = factory.createProject(projectDescriptor, null, gradle, rootProjectScope, baseScope)
 
         then:
         result == project
-        1 * instantiator.newInstance(DefaultProject, "name", null, projectDir, { it instanceof StringScriptSource }, gradle, serviceRegistryFactory, classLoaderScope) >> project
+        1 * instantiator.newInstance(DefaultProject, "name", null, projectDir, { it instanceof StringScriptSource }, gradle, serviceRegistryFactory, rootProjectScope, baseScope) >> project
         1 * projectRegistry.addProject(project)
     }
 
@@ -89,11 +90,11 @@ class ProjectFactoryTest extends Specification {
         projectDescriptor.buildFile >> buildFile
 
         when:
-        def result = factory.createProject(projectDescriptor, parent, gradle, classLoaderScope)
+        def result = factory.createProject(projectDescriptor, parent, gradle, rootProjectScope, baseScope)
 
         then:
         result == project
-        1 * instantiator.newInstance(DefaultProject, "name", parent, projectDir, _, gradle, serviceRegistryFactory, classLoaderScope) >> project
+        1 * instantiator.newInstance(DefaultProject, "name", parent, projectDir, _, gradle, serviceRegistryFactory, rootProjectScope, baseScope) >> project
         1 * parent.addChildProject(project)
         1 * projectRegistry.addProject(project)
     }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactoryTest.java b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactoryTest.java
index f5f6fe0bd5db..915e6409c394 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactoryTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactoryTest.java
@@ -22,9 +22,21 @@
 import org.gradle.api.Task;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.AbstractTask;
+import org.gradle.api.internal.ClassGenerator;
 import org.gradle.api.internal.TaskInternal;
 import org.gradle.api.internal.project.DefaultProject;
-import org.gradle.api.tasks.*;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.InputFile;
+import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Nested;
+import org.gradle.api.tasks.OutputDirectories;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.OutputFile;
+import org.gradle.api.tasks.OutputFiles;
+import org.gradle.api.tasks.SkipWhenEmpty;
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.TaskValidationException;
 import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
 import org.gradle.internal.UncheckedException;
 import org.gradle.test.fixtures.file.TestFile;
@@ -42,7 +54,12 @@
 
 import java.io.File;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 import static org.gradle.util.Matchers.isEmpty;
@@ -82,12 +99,13 @@ public void attachesAnActionToTaskForMethodMarkedWithTaskActionAnnotation() {
 
     private <T extends Task> T expectTaskCreated(final Class<T> type, final Object... params) {
         DefaultProject project = TestUtil.createRootProject();
+        final Class<? extends T> decorated = project.getServices().get(ClassGenerator.class).generate(type);
         T task = AbstractTask.injectIntoNewInstance(project, "task", new Callable<T>() {
             public T call() throws Exception {
                 if (params.length > 0) {
-                    return type.cast(type.getConstructors()[0].newInstance(params));
+                    return type.cast(decorated.getConstructors()[0].newInstance(params));
                 } else {
-                    return type.newInstance();
+                    return decorated.newInstance();
                 }
             }
         });
@@ -919,14 +937,15 @@ public List<File> getOutputFiles() {
     }
     
     public static class TaskWithOptionalOutputFile extends DefaultTask {
-        @OutputFile @Optional
+        @OutputFile @org.gradle.api.tasks.Optional
         public File getOutputFile() {
             return null;
         }
     }
 
     public static class TaskWithOptionalOutputFiles extends DefaultTask {
-        @OutputFiles @Optional
+        @OutputFiles
+        @org.gradle.api.tasks.Optional
         public List<File> getOutputFiles() {
             return null;
         }
@@ -959,14 +978,14 @@ public List<File> getOutputDirs() {
     }
     
     public static class TaskWithOptionalOutputDir extends DefaultTask {
-        @OutputDirectory @Optional
+        @OutputDirectory @org.gradle.api.tasks.Optional
         public File getOutputDir() {
             return null;
         }
     }
 
     public static class TaskWithOptionalOutputDirs extends DefaultTask {
-        @OutputDirectories @Optional
+        @OutputDirectories @org.gradle.api.tasks.Optional
         public File getOutputDirs() {
             return null;
         }
@@ -1002,7 +1021,7 @@ public void doStuff() {
     }
 
     public static class TaskWithOptionalInputFile extends DefaultTask {
-        @InputFile @Optional
+        @InputFile @org.gradle.api.tasks.Optional
         public File getInputFile() {
             return null;
         }
@@ -1048,7 +1067,7 @@ public File getOutputFile() {
     }
 
     public static class TaskWithOptionalNestedBean extends DefaultTask {
-        @Nested @Optional
+        @Nested @org.gradle.api.tasks.Optional
         public Bean getBean() {
             return null;
         }
@@ -1057,7 +1076,7 @@ public Bean getBean() {
     public static class TaskWithOptionalNestedBeanWithPrivateType extends DefaultTask {
         Bean2 bean = new Bean2();
 
-        @Nested @Optional
+        @Nested @org.gradle.api.tasks.Optional
         public Bean getBean() {
             return null;
         }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/DefaultTaskInputsTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/DefaultTaskInputsTest.groovy
index 8aba4011849e..7979d1d41fce 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/DefaultTaskInputsTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/DefaultTaskInputsTest.groovy
@@ -105,6 +105,19 @@ class DefaultTaskInputsTest extends Specification {
         inputs.properties == [a: files]
     }
 
+    def "GString input property values are evaluated to avoid serialization issues"() {
+        when:
+        inputs.property('a', { "hey ${new NotSerializable()}" })
+
+        then:
+        inputs.properties == [a: "hey Joe"]
+        String.is inputs.properties.a.class
+    }
+
+    class NotSerializable {
+        String toString() { "Joe" }
+    }
+
     def canRegisterSourceFile() {
         when:
         inputs.source('file')
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/tasks/AbstractCopyTaskTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/tasks/AbstractCopyTaskTest.groovy
index ad7f4a89ba3d..5808afa4b123 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/tasks/AbstractCopyTaskTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/tasks/AbstractCopyTaskTest.groovy
@@ -57,7 +57,7 @@ class AbstractCopyTaskTest extends WorkspaceTest {
         file("include") << "bar"
 
         expect:
-        task.rootSpec.source.isEmpty()
+        task.rootSpec.hasSource() == false
 
         when:
         task.from testDirectory.absolutePath
@@ -65,7 +65,7 @@ class AbstractCopyTaskTest extends WorkspaceTest {
 
         then:
         task.mainSpec.getIncludes() == ["include"].toSet()
-        task.mainSpec.source.files == task.project.fileTree(testDirectory).files
+        task.mainSpec.buildRootResolver().source.files == task.project.fileTree(testDirectory).files
     }
 
     static class TestCopyTask extends AbstractCopyTask {
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/tasks/DirectoryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/tasks/DirectoryTest.groovy
deleted file mode 100644
index f8e3842cd51e..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/api/tasks/DirectoryTest.groovy
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.tasks
-
-import org.gradle.api.GradleException
-import org.gradle.api.InvalidUserDataException
-import org.gradle.api.UncheckedIOException
-import org.gradle.api.internal.AbstractTask
-import org.junit.Before
-import org.junit.Test
-
-import static org.hamcrest.Matchers.instanceOf
-import static org.junit.Assert.*
-
-class DirectoryTest extends AbstractTaskTest {
-    static final String TASK_DIR_NAME = 'parent/child'
-    Directory directoryForAbstractTest
-    Directory directory
-
-    public AbstractTask getTask() {
-        return directoryForAbstractTest
-    }
-
-    @Before public void setUp() {
-        directoryForAbstractTest = createTask(Directory.class)
-        directory = createTask(Directory.class, project, TASK_DIR_NAME)
-    }
-
-    @Test public void testInit() {
-        assertEquals(new File(project.projectDir, TASK_DIR_NAME).absoluteFile, directory.dir)
-    }
-
-    @Test public void testInitWithAbsolutePathName() {
-        try {
-            createTask(Directory.class, project, new File('nonRelative').absolutePath)
-            fail()
-        } catch (GradleException e) {
-            assertThat(e.cause, instanceOf(InvalidUserDataException.class))
-        }
-    }
-
-    @Test public void testExecute() {
-        directory.execute()
-        assert new File(project.projectDir, TASK_DIR_NAME).isDirectory()
-    }
-
-    @Test public void testWithExistingDir() {
-        File dir = new File(project.projectDir, TASK_DIR_NAME)
-        dir.mkdirs()
-        // create new file to check later that dir has not been recreated 
-        File file = new File(dir, 'somefile')
-        file.createNewFile()
-        directory.execute()
-        assert dir.isDirectory()
-        assert file.isFile()
-    }
-
-    @Test (expected = UncheckedIOException) public void testWithExistingFile() {
-        File file = new File(project.projectDir, 'testname')
-        file.createNewFile()
-        directory = createTask(Directory.class, project, 'testname')
-        directory.mkdir()
-    }
-}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/tasks/GradleBuildTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/tasks/GradleBuildTest.groovy
index 676313aad68f..14ead0248407 100755
--- a/subprojects/core/src/test/groovy/org/gradle/api/tasks/GradleBuildTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/api/tasks/GradleBuildTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.api.tasks
 
 import org.gradle.BuildResult
-import org.gradle.GradleLauncher
+import org.gradle.initialization.GradleLauncher
 import org.gradle.initialization.GradleLauncherFactory
 import org.gradle.util.TestUtil
 import spock.lang.Specification
@@ -51,6 +51,7 @@ public class GradleBuildTest extends Specification {
         1 * launcherFactory.newInstance(task.startParameter) >> launcher
         1 * launcher.run() >> resultMock
         1 * resultMock.rethrowFailure()
+        1 * launcher.stop()
         0 * _._
     }
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/configuration/DefaultInitScriptProcessorTest.groovy b/subprojects/core/src/test/groovy/org/gradle/configuration/DefaultInitScriptProcessorTest.groovy
index 85d70593586c..edd48910effe 100644
--- a/subprojects/core/src/test/groovy/org/gradle/configuration/DefaultInitScriptProcessorTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/configuration/DefaultInitScriptProcessorTest.groovy
@@ -29,18 +29,18 @@ class DefaultInitScriptProcessorTest extends Specification {
         when:
         def scriptPluginFactory = Mock(ScriptPluginFactory)
         def scriptHandlerFactory = Mock(ScriptHandlerFactory)
-        def compileScope = Mock(ClassLoaderScope)
+        def gradleScope = Mock(ClassLoaderScope)
         def initScriptMock = Mock(ScriptSource)
         def gradleMock = Mock(GradleInternal)
+        def siblingScope = Mock(ClassLoaderScope)
         def scriptHandler = Mock(ScriptHandler)
         def scriptPlugin = Mock(ScriptPlugin)
 
-        1 * gradleMock.getClassLoaderScope() >> Mock(ClassLoaderScope) {
-            createSibling() >> compileScope
-        }
+        1 * gradleMock.getClassLoaderScope() >> gradleScope
+        1 * gradleScope.createSibling() >> siblingScope
 
-        1 * scriptHandlerFactory.create(initScriptMock, compileScope) >> scriptHandler
-        1 * scriptPluginFactory.create(initScriptMock, scriptHandler, compileScope, "initscript", InitScript) >> scriptPlugin
+        1 * scriptHandlerFactory.create(initScriptMock, siblingScope) >> scriptHandler
+        1 * scriptPluginFactory.create(initScriptMock, scriptHandler, siblingScope, gradleScope, "initscript", InitScript, false) >> scriptPlugin
         1 * scriptPlugin.apply(gradleMock)
 
         DefaultInitScriptProcessor processor = new DefaultInitScriptProcessor(scriptPluginFactory, scriptHandlerFactory)
diff --git a/subprojects/core/src/test/groovy/org/gradle/configuration/DefaultScriptPluginFactoryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/configuration/DefaultScriptPluginFactoryTest.groovy
index 57aabebac58c..426389631e74 100755
--- a/subprojects/core/src/test/groovy/org/gradle/configuration/DefaultScriptPluginFactoryTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/configuration/DefaultScriptPluginFactoryTest.groovy
@@ -23,11 +23,12 @@ import org.gradle.api.internal.initialization.ClassLoaderScope
 import org.gradle.api.internal.initialization.ScriptHandlerFactory
 import org.gradle.groovy.scripts.*
 import org.gradle.groovy.scripts.internal.StatementExtractingScriptTransformer
+import org.gradle.internal.Factories
 import org.gradle.internal.Factory
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.internal.service.ServiceRegistry
 import org.gradle.logging.LoggingManagerInternal
-import org.gradle.plugin.internal.PluginResolverFactory
+import org.gradle.plugin.use.internal.PluginRequestApplicatorFactory
 import spock.lang.Specification
 
 public class DefaultScriptPluginFactoryTest extends Specification {
@@ -39,12 +40,13 @@ public class DefaultScriptPluginFactoryTest extends Specification {
     def scriptRunner = Mock(ScriptRunner)
     def script = Mock(BasicScript)
     def instantiator = Mock(Instantiator)
-    def classLoaderScope = Mock(ClassLoaderScope)
-    def baseClassLoaderScope = Mock(ClassLoaderScope)
+    def targetScope = Mock(ClassLoaderScope)
+    def baseScope = Mock(ClassLoaderScope)
     def scopeClassLoader = Mock(ClassLoader)
     def baseChildClassLoader = Mock(ClassLoader)
+    def exportClassLoader = Mock(ClassLoader)
     def scriptHandlerFactory = Mock(ScriptHandlerFactory)
-    def pluginResolverFactory = Mock(PluginResolverFactory)
+    def pluginRequestApplicatorFactory = Mock(PluginRequestApplicatorFactory)
     def scriptHandler = Mock(ScriptHandler)
     def classPathScriptRunner = Mock(ScriptRunner)
     def classPathScript = Mock(BasicScript)
@@ -53,7 +55,7 @@ public class DefaultScriptPluginFactoryTest extends Specification {
     def loggingManager = Mock(LoggingManagerInternal)
     def fileLookup = Mock(FileLookup)
 
-    def factory = new DefaultScriptPluginFactory(scriptCompilerFactory, importsReader, loggingManagerFactory, instantiator, scriptHandlerFactory, pluginResolverFactory, fileLookup)
+    def factory = new DefaultScriptPluginFactory(scriptCompilerFactory, importsReader, loggingManagerFactory, instantiator, scriptHandlerFactory, pluginRequestApplicatorFactory, fileLookup)
 
     def setup() {
         def configurations = Mock(ConfigurationContainer)
@@ -61,10 +63,14 @@ public class DefaultScriptPluginFactoryTest extends Specification {
         def configuration = Mock(Configuration)
         configurations.getByName(ScriptHandler.CLASSPATH_CONFIGURATION) >> configuration
         configuration.getFiles() >> Collections.emptySet()
-        classLoaderScope.getBase() >> baseClassLoaderScope
-        baseClassLoaderScope.getChildClassLoader() >> baseChildClassLoader
+        baseScope.getExportClassLoader() >> baseChildClassLoader
 
-        1 * classLoaderScope.getScopeClassLoader() >> scopeClassLoader
+        def factory = Factories.constant(exportClassLoader)
+        targetScope.getParent() >> Mock(ClassLoaderScope) {
+            loader(_) >> factory
+        }
+        targetScope.export(factory)
+        1 * targetScope.getLocalClassLoader() >> scopeClassLoader
     }
 
     void configuresATargetObjectUsingScript() {
@@ -88,7 +94,7 @@ public class DefaultScriptPluginFactoryTest extends Specification {
         1 * scriptRunner.run()
 
         then:
-        ScriptPlugin configurer = factory.create(scriptSource, scriptHandler, classLoaderScope, "buildscript", DefaultScript)
+        ScriptPlugin configurer = factory.create(scriptSource, scriptHandler, targetScope, baseScope, "buildscript", DefaultScript, false)
         configurer.apply(target)
     }
 
@@ -113,7 +119,7 @@ public class DefaultScriptPluginFactoryTest extends Specification {
         1 * scriptRunner.run()
 
         then:
-        ScriptPlugin configurer = factory.create(scriptSource, scriptHandler, classLoaderScope, "buildscript", DefaultScript)
+        ScriptPlugin configurer = factory.create(scriptSource, scriptHandler, targetScope, baseScope, "buildscript", DefaultScript, false)
         configurer.apply(target)
     }
 }
\ No newline at end of file
diff --git a/subprojects/core/src/test/groovy/org/gradle/configuration/ImportsScriptSourceTest.java b/subprojects/core/src/test/groovy/org/gradle/configuration/ImportsScriptSourceTest.java
index 0760af7cc3cf..85147d8db82d 100644
--- a/subprojects/core/src/test/groovy/org/gradle/configuration/ImportsScriptSourceTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/configuration/ImportsScriptSourceTest.java
@@ -15,7 +15,7 @@
  */
 package org.gradle.configuration;
 
-import org.gradle.api.internal.resource.Resource;
+import org.gradle.internal.resource.Resource;
 import org.gradle.groovy.scripts.ScriptSource;
 import org.gradle.util.JUnit4GroovyMockery;
 import org.jmock.Expectations;
diff --git a/subprojects/core/src/test/groovy/org/gradle/configuration/project/BuildScriptProcessorTest.groovy b/subprojects/core/src/test/groovy/org/gradle/configuration/project/BuildScriptProcessorTest.groovy
index 40044b3b1146..eedfd4aefa29 100644
--- a/subprojects/core/src/test/groovy/org/gradle/configuration/project/BuildScriptProcessorTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/configuration/project/BuildScriptProcessorTest.groovy
@@ -29,7 +29,8 @@ public class BuildScriptProcessorTest extends Specification {
     def scriptSource = Mock(ScriptSource)
     def configurerFactory = Mock(ScriptPluginFactory)
     def scriptPlugin = Mock(ScriptPlugin)
-    def classLoaderScope = Mock(ClassLoaderScope)
+    def targetScope = Mock(ClassLoaderScope)
+    def baseScope = Mock(ClassLoaderScope)
     def BuildScriptProcessor buildScriptProcessor = new BuildScriptProcessor(configurerFactory)
     private ScriptHandler scriptHandler;
 
@@ -37,7 +38,8 @@ public class BuildScriptProcessorTest extends Specification {
         _ * project.buildScriptSource >> scriptSource
         scriptHandler = Mock(ScriptHandler)
         project.getBuildscript() >> scriptHandler
-        project.getClassLoaderScope() >> classLoaderScope
+        project.getClassLoaderScope() >> targetScope
+        project.getBaseClassLoaderScope() >> baseScope
     }
 
     def configuresProjectUsingBuildScript() {
@@ -45,7 +47,7 @@ public class BuildScriptProcessorTest extends Specification {
         buildScriptProcessor.execute(project)
 
         then:
-        1 * configurerFactory.create(scriptSource, scriptHandler, classLoaderScope, "buildscript", ProjectScript) >> scriptPlugin
+        1 * configurerFactory.create(scriptSource, scriptHandler, targetScope, baseScope, "buildscript", ProjectScript, true) >> scriptPlugin
         1 * scriptPlugin.apply(project)
     }
 }
\ No newline at end of file
diff --git a/subprojects/core/src/test/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolverTest.groovy b/subprojects/core/src/test/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolverTest.groovy
deleted file mode 100644
index 9be41ed174c2..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/configuration/project/ProjectDependencies2TaskResolverTest.groovy
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.configuration.project
-
-import org.gradle.util.TestUtil
-import spock.lang.Specification
-
-class ProjectDependencies2TaskResolverTest extends Specification {
-    private root = TestUtil.createRootProject()
-    private child = TestUtil.createChildProject(root, "child")
-    private rootTask = root.tasks.create('compile')
-    private childTask = child.tasks.create('compile')
-
-    private resolver = new ProjectDependencies2TaskResolver()
-
-    void "resolves task dependencies"() {
-        child.dependsOn(root.path, false)
-        when:
-        resolver.execute(child)
-        then:
-        childTask.taskDependencies.getDependencies(childTask) == [rootTask] as Set
-    }
-}
diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/DefaultTasksBuildExecutionActionTest.groovy b/subprojects/core/src/test/groovy/org/gradle/execution/DefaultTasksBuildExecutionActionTest.groovy
index 2b28cff7bc13..69f2dc4f9833 100644
--- a/subprojects/core/src/test/groovy/org/gradle/execution/DefaultTasksBuildExecutionActionTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/execution/DefaultTasksBuildExecutionActionTest.groovy
@@ -15,6 +15,7 @@
  */
 package org.gradle.execution
 
+import org.gradle.internal.DefaultTaskParameter
 import spock.lang.Specification
 import org.gradle.StartParameter
 import org.gradle.api.internal.project.ProjectInternal
@@ -35,7 +36,7 @@ class DefaultTasksBuildExecutionActionTest extends Specification {
 
     def "proceeds when task names specified in StartParameter"() {
         given:
-        _ * startParameter.taskNames >> ['a']
+        _ * startParameter.taskParameters >> [ new DefaultTaskParameter('a') ]
 
         when:
         action.configure(context)
@@ -47,6 +48,7 @@ class DefaultTasksBuildExecutionActionTest extends Specification {
     def "sets task names to project defaults when none specified in StartParameter"() {
         given:
         _ * startParameter.taskNames >> []
+        _ * startParameter.taskParameters >> []
         _ * defaultProject.defaultTasks >> ['a', 'b']
 
         when:
@@ -60,6 +62,7 @@ class DefaultTasksBuildExecutionActionTest extends Specification {
     def "uses the help task if no tasks specified in StartParameter or project"() {
         given:
         _ * startParameter.taskNames >> []
+        _ * startParameter.taskParameters >> []
         _ * defaultProject.defaultTasks >> []
 
         when:
diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionSpec.groovy b/subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionSpec.groovy
new file mode 100644
index 000000000000..3a9b06c69854
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionSpec.groovy
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.execution
+
+import com.google.common.collect.Sets
+import org.gradle.StartParameter
+import org.gradle.TaskParameter
+import org.gradle.api.Task
+import org.gradle.api.internal.GradleInternal
+import org.gradle.api.internal.tasks.options.OptionReader
+import org.gradle.execution.commandline.CommandLineTaskConfigurer
+import org.gradle.execution.commandline.CommandLineTaskParser
+import org.gradle.internal.DefaultTaskParameter
+import spock.lang.Specification
+
+class TaskNameResolvingBuildConfigurationActionSpec extends Specification {
+    TaskSelector selector
+    GradleInternal gradle
+    BuildExecutionContext context
+    def TaskNameResolvingBuildConfigurationAction action
+
+    def setup() {
+        selector = Mock(TaskSelector)
+        gradle = Mock(GradleInternal)
+        context = Mock(BuildExecutionContext)
+        OptionReader optionReader = new OptionReader();
+        CommandLineTaskParser parser = new CommandLineTaskParser(new CommandLineTaskConfigurer(optionReader));
+        action = new TaskNameResolvingBuildConfigurationAction(parser, selector)
+    }
+
+    def "empty task parameters are no-op action"() {
+        given:
+        def startParameters = Mock(StartParameter)
+
+        when:
+        _ * context.getGradle() >> gradle
+        _ * gradle.getStartParameter() >> startParameters
+        _ * startParameters.getTaskParameters() >> []
+
+        action.configure(context)
+
+        then:
+        1 * context.proceed()
+        0 * context._()
+        0 * startParameters._()
+    }
+
+    def "expand task parameters to tasks"() {
+        given:
+        def startParameters = Mock(StartParameter)
+        def executer = Mock(TaskGraphExecuter)
+        TaskParameter taskParameter1 = new DefaultTaskParameter('task1', ':')
+        TaskParameter taskParameter2 = new DefaultTaskParameter('task2', ':')
+        def selection1 = Mock(TaskSelector.TaskSelection)
+        def task1a = Mock(Task)
+        def task1b = Mock(Task)
+        def selection2 = Mock(TaskSelector.TaskSelection)
+        def task2 = Mock(Task)
+
+        when:
+        _ * context.getGradle() >> gradle
+        _ * gradle.getStartParameter() >> startParameters
+        _ * startParameters.getTaskParameters() >> [taskParameter1, taskParameter2]
+        _ * selector.getSelection(taskParameter1) >> selection1
+        _ * selector.getSelection(taskParameter2) >> selection2
+        _ * gradle.taskGraph >> executer
+
+        1 * selection1.tasks >> Sets.newLinkedHashSet([task1a, task1b])
+        1 * selection2.tasks >> [task2]
+
+        action.configure(context)
+
+        then:
+        0 * startParameters.setTaskNames(_)
+        1 * executer.addTasks(Sets.newLinkedHashSet([task1a, task1b]))
+        1 * executer.addTasks(Sets.newLinkedHashSet([task2]))
+        1 * context.proceed()
+        0 * context._()
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionTest.java b/subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionTest.java
index ee0abe1cd95c..92666977ffcd 100644
--- a/subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/execution/TaskNameResolvingBuildConfigurationActionTest.java
@@ -15,9 +15,13 @@
  */
 package org.gradle.execution;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
 import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import org.gradle.StartParameter;
+import org.gradle.TaskParameter;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.Task;
 import org.gradle.api.internal.GradleInternal;
@@ -27,6 +31,7 @@
 import org.gradle.api.internal.tasks.options.OptionReader;
 import org.gradle.execution.commandline.CommandLineTaskConfigurer;
 import org.gradle.execution.commandline.CommandLineTaskParser;
+import org.gradle.internal.DefaultTaskParameter;
 import org.gradle.util.GUtil;
 import org.gradle.util.JUnit4GroovyMockery;
 import org.jmock.Expectations;
@@ -36,8 +41,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import static org.gradle.util.WrapUtil.*;
@@ -82,8 +89,8 @@ public void selectsAllTasksWithTheProvidedNameInCurrentProjectAndSubprojects() {
         final Task task3 = task("other");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("name")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("name")));
 
             one(resolver).selectAll("name", project);
             will(returnValue(tasks(task1, task2, task3)));
@@ -121,8 +128,8 @@ private void assertMatches(final String pattern, final String matches, String...
         tasks.add(task("other"));
 
         context.checking(new Expectations() {{
-            one(startParameter).getTaskNames();
-            will(returnValue(toList(pattern)));
+            one(startParameter).getTaskParameters();
+            will(returnValue(toParameters(pattern)));
 
             one(resolver).selectAll(pattern, project);
             will(returnValue(tasks(tasks)));
@@ -139,8 +146,8 @@ public void selectsTaskWithMatchingRelativePath() {
         final Task task2 = task("a");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("a:b")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("a:b")));
 
             one(project).getChildProjects();
             will(returnValue(toMap("a", otherProject)));
@@ -159,8 +166,8 @@ public void selectsTaskWithMatchingTaskInRootProject() {
         final Task task2 = task("a");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList(":b")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters(":b")));
 
             one(project).getRootProject();
             will(returnValue(rootProject));
@@ -179,8 +186,8 @@ public void selectsTaskWithMatchingAbsolutePath() {
         final Task task2 = task("a");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList(":a:b")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters(":a:b")));
 
             one(project).getRootProject();
             will(returnValue(rootProject));
@@ -201,8 +208,8 @@ public void usesCamelCaseAbbreviationToSelectTasksWhenNoExactMatchAndPathProvide
         final Task task2 = task("other");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("anotherProject:soTa")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("anotherProject:soTa")));
 
             one(project).getChildProjects();
             will(returnValue(toMap("anotherProject", otherProject)));
@@ -221,8 +228,8 @@ public void usesCamelCaseAbbreviationToSelectProjectWhenPathProvided() {
         final Task task2 = task("other");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("anPr:soTa")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("anPr:soTa")));
 
             one(project).getChildProjects();
             will(returnValue(toMap("anotherProject", otherProject)));
@@ -241,8 +248,8 @@ public void failsWhenProvidedTaskNameIsAmbiguous() {
         final Task task2 = task("someTasks");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("soTa")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("soTa")));
 
             one(resolver).selectAll("soTa", project);
             will(returnValue(tasks(task1, task2)));
@@ -264,8 +271,8 @@ public void reportsTyposInTaskName() {
         final Task task4 = task("other");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("ssomeTask")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("ssomeTask")));
 
             one(resolver).selectAll("ssomeTask", project);
             will(returnValue(tasks(task1, task2, task3, task4)));
@@ -285,8 +292,8 @@ public void treatsEachProvidedNameAsASeparateGroup() {
         final Task task2 = task("name2");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("child:name1", "name2")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("child:name1", "name2")));
 
             one(project).getChildProjects();
             will(returnValue(toMap("child", otherProject)));
@@ -315,8 +322,8 @@ public void canConfigureSingleTaskUsingCommandLineOptions() {
         final Task task2 = task("name2");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("name1", "--all", "name2")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("name1", "--all", "name2")));
 
             one(resolver).selectAll("name1", project);
             will(returnValue(tasks(task1)));
@@ -345,8 +352,8 @@ public void failsWhenUnknownTaskNameIsProvided() {
         final Task task2 = task("t2");
 
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("b3")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("b3")));
 
             one(resolver).selectAll("b3", project);
             will(returnValue(tasks(task1, task2)));
@@ -363,8 +370,8 @@ public void failsWhenUnknownTaskNameIsProvided() {
     @Test
     public void failsWhenCannotFindProjectInPath() {
         context.checking(new Expectations() {{
-            allowing(startParameter).getTaskNames();
-            will(returnValue(toList("a:b", "name2")));
+            allowing(startParameter).getTaskParameters();
+            will(returnValue(toParameters("a:b", "name2")));
 
             one(project).getChildProjects();
             will(returnValue(GUtil.map("aa", otherProject, "ab", otherProject)));
@@ -378,6 +385,17 @@ public void failsWhenCannotFindProjectInPath() {
         }
     }
 
+    private List<TaskParameter> toParameters(String ... parameters) {
+        return Lists.newArrayList(Iterables.transform(
+                Lists.newArrayList(parameters),
+                new Function<String, TaskParameter>() {
+                    @Nullable
+                    public TaskParameter apply(@Nullable String input) {
+                        return new DefaultTaskParameter(input);
+                    }
+                }));
+    }
+
     private Task task(String name) {
         return task(name, Task.class);
     }
diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/commandline/CommandLineTaskConfigurerSpec.groovy b/subprojects/core/src/test/groovy/org/gradle/execution/commandline/CommandLineTaskConfigurerSpec.groovy
index b48548309d86..443a9529795b 100644
--- a/subprojects/core/src/test/groovy/org/gradle/execution/commandline/CommandLineTaskConfigurerSpec.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/execution/commandline/CommandLineTaskConfigurerSpec.groovy
@@ -21,6 +21,7 @@ import org.gradle.api.internal.tasks.options.Option
 import org.gradle.api.internal.tasks.options.OptionReader
 import org.gradle.api.tasks.TaskAction
 import org.gradle.execution.TaskSelector
+import org.gradle.internal.DefaultTaskParameter
 import org.gradle.internal.typeconversion.TypeConversionException
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Specification
@@ -38,7 +39,7 @@ class CommandLineTaskConfigurerSpec extends Specification {
 
     def "does not configure if option doesn't match"() {
         when:
-        configurer.configureTasks([task, task2], ['foo'])
+        configurer.configureTasks([task, task2], toTaskParameters(['foo']))
         then:
         task.content == 'default content'
         task2.content == 'default content'
@@ -52,16 +53,16 @@ class CommandLineTaskConfigurerSpec extends Specification {
         configurer = Spy(CommandLineTaskConfigurer, constructorArgs: [new OptionReader()])
 
         when:
-        def out = configurer.configureTasks([task, task2], ['foo'])
+        def out = configurer.configureTasks([task, task2], toTaskParameters(['foo']))
 
         then:
-        out == ['foo']
+        out == toTaskParameters(['foo'])
         0 * configurer.configureTasksNow(_, _)
     }
 
     def "configures string option on all tasks"() {
         when:
-        configurer.configureTasks([task, task2], ['--content', 'Hey!', 'foo'])
+        configurer.configureTasks([task, task2], toTaskParameters(['--content', 'Hey!', 'foo']))
         then:
         task.content == 'Hey!'
         task2.content == 'Hey!'
@@ -69,19 +70,19 @@ class CommandLineTaskConfigurerSpec extends Specification {
 
     def "configures boolean option"() {
         when:
-        configurer.configureTasks([task], ['--someFlag'])
+        configurer.configureTasks([task], toTaskParameters(['--someFlag']))
         then:
         task.someFlag
     }
 
     def "configures enum option"() {
         when:
-        configurer.configureTasks([task], ['--someEnum', "value1"])
+        configurer.configureTasks([task], toTaskParameters(['--someEnum', "value1"]))
         then:
         task.anEnum == TestEnum.value1
 
         when:
-        configurer.configureTasks([task], ['--someEnum', "unsupportedEnumValue"])
+        configurer.configureTasks([task], toTaskParameters(['--someEnum', "unsupportedEnumValue"]))
         then:
         def e = thrown(TaskConfigurationException)
         e.message == "Problem configuring option 'someEnum' on task ':someTask' from command line."
@@ -92,7 +93,7 @@ class CommandLineTaskConfigurerSpec extends Specification {
 
     def "configures options on all types that can accommodate the setting"() {
         when:
-        configurer.configureTasks([task, otherTask], ['--someFlag'])
+        configurer.configureTasks([task, otherTask], toTaskParameters(['--someFlag']))
         then:
         task.someFlag
         otherTask.someFlag
@@ -100,7 +101,7 @@ class CommandLineTaskConfigurerSpec extends Specification {
 
     def "fails if some of the types cannot accommodate the setting"() {
         when:
-        configurer.configureTasks([task, defaultTask], ['--someFlag'])
+        configurer.configureTasks([task, defaultTask], toTaskParameters(['--someFlag']))
 
         then:
         def ex = thrown(TaskConfigurationException)
@@ -116,19 +117,19 @@ class CommandLineTaskConfigurerSpec extends Specification {
         ex.cause.message.contains('someFlag2')
 
         where:
-        input << [['--someFlag', '--someFlag2'], ['--someFlag2', '--someFlag']]
+        input << [toTaskParameters(['--someFlag', '--someFlag2']), toTaskParameters(['--someFlag2', '--someFlag'])]
     }
 
     def "configures the Boolean option"() {
         when:
-        configurer.configureTasks([task], ['--someFlag2'])
+        configurer.configureTasks([task], toTaskParameters(['--someFlag2']))
         then:
         task.someFlag2
     }
 
     def "configures mixed options"() {
         when:
-        configurer.configureTasks([task, task2], ['--someFlag', '--content', 'Hey!'])
+        configurer.configureTasks([task, task2], toTaskParameters(['--someFlag', '--content', 'Hey!']))
         then:
         task.someFlag
         task2.someFlag
@@ -137,15 +138,24 @@ class CommandLineTaskConfigurerSpec extends Specification {
     }
 
     def "configures options and returns unused arguments"() {
-        def args = ['--someFlag', '--content', 'Hey!', 'foo', '--baz', '--someFlag']
+        def args = toTaskParameters(['--someFlag', '--content', 'Hey!', 'foo', '--baz', '--someFlag'])
         when:
         def out = configurer.configureTasks([task, task2], args)
         then:
-        out == ['foo', '--baz', '--someFlag']
+        out == toTaskParameters(['foo', '--baz', '--someFlag'])
+    }
+
+    def "configures options and returns unused arguments when TaskParameter is used"() {
+        def args = toTaskParameters(['--someFlag', '--content', 'Hey!'])
+        def parameter = new DefaultTaskParameter('foo', ':')
+        when:
+        def out = configurer.configureTasks([task, task2], args + parameter)
+        then:
+        out == [parameter]
     }
 
     def "fails on unknown option"() {
-        def args = ['--xxx']
+        def args = toTaskParameters(['--xxx'])
         when:
         configurer.configureTasks([task, task2], args)
 
@@ -155,7 +165,7 @@ class CommandLineTaskConfigurerSpec extends Specification {
     }
 
     def "fails neatly when short option used"() {
-        def args = ['--someFlag', '-c']
+        def args = toTaskParameters(['--someFlag', '-c'])
         when:
         configurer.configureTasks([task], args)
 
@@ -164,6 +174,10 @@ class CommandLineTaskConfigurerSpec extends Specification {
         ex.cause.message.contains("Unknown command-line option '-c'")
     }
 
+    def toTaskParameters(List<String> arguments) {
+        arguments.collect { new DefaultTaskParameter(it) }
+    }
+
     public static class SomeTask extends DefaultTask {
         String content = 'default content'
 
diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/commandline/CommandLineTaskParserSpec.groovy b/subprojects/core/src/test/groovy/org/gradle/execution/commandline/CommandLineTaskParserSpec.groovy
index a93383d2014e..87237d70d2ed 100644
--- a/subprojects/core/src/test/groovy/org/gradle/execution/commandline/CommandLineTaskParserSpec.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/execution/commandline/CommandLineTaskParserSpec.groovy
@@ -16,11 +16,13 @@
 
 package org.gradle.execution.commandline
 
+import org.gradle.TaskParameter
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
 import org.gradle.api.tasks.TaskAction
 import org.gradle.execution.TaskSelectionResult
 import org.gradle.execution.TaskSelector
+import org.gradle.internal.DefaultTaskParameter
 import org.gradle.testfixtures.ProjectBuilder
 import spock.lang.Specification
 
@@ -50,14 +52,19 @@ class CommandLineTaskParserSpec extends Specification {
 
     def "parses a single task"() {
         given:
-        selector.getSelection('foo') >> new TaskSelector.TaskSelection('foo task', asTaskSelectionResults(task))
+        def foo = new DefaultTaskParameter('foo')
+        selector.getSelection(foo) >> new TaskSelector.TaskSelection('foo task', asTaskSelectionResults(task))
 
         when:
-        def out = parser.parseTasks(['foo'], selector)
+        def out = parser.parseTasks([foo], selector)
 
         then:
         out.size() == 1
-        out.get('foo task') == [task] as Set
+        out.get(foo) == [task] as Set
+    }
+
+    List<TaskParameter> asTaskParameters(List<?> arguments) {
+        arguments.collect { it instanceof TaskParameter ? it : new DefaultTaskParameter(it) }
     }
 
     Set<TaskSelectionResult> asTaskSelectionResults(SomeTask... someTasks) {
@@ -70,43 +77,49 @@ class CommandLineTaskParserSpec extends Specification {
 
     def "parses single task with multiple matches"() {
         given:
-        selector.getSelection('foo') >> new TaskSelector.TaskSelection('foo task', asTaskSelectionResults(task, task2))
+        def foo = new DefaultTaskParameter('foo')
+        selector.getSelection(foo) >> new TaskSelector.TaskSelection('foo task', asTaskSelectionResults(task, task2))
 
         when:
-        def out = parser.parseTasks(['foo'], selector)
+        def out = parser.parseTasks([foo], selector)
 
         then:
         out.size() == 2
-        out.get('foo task') == [task, task2] as Set
+        out.get(foo) == [task, task2] as Set
     }
 
     def "parses multiple matching tasks"() {
         given:
-        selector.getSelection('foo') >> new TaskSelector.TaskSelection('foo task', asTaskSelectionResults(task, task2))
-        selector.getSelection('bar') >> new TaskSelector.TaskSelection('bar task', asTaskSelectionResults(task3))
+        def foo = new DefaultTaskParameter('foo')
+        def bar = new DefaultTaskParameter('bar')
+        selector.getSelection(foo) >> new TaskSelector.TaskSelection('foo task', asTaskSelectionResults(task, task2))
+        selector.getSelection(bar) >> new TaskSelector.TaskSelection('bar task', asTaskSelectionResults(task3))
 
         when:
-        def out = parser.parseTasks(['foo', 'bar'], selector)
+        def out = parser.parseTasks([foo, bar], selector)
 
         then:
         out.size() == 3
-        out.get('foo task') == [task, task2] as Set
-        out.get('bar task') == [task3] as Set
+        out.get(foo) == [task, task2] as Set
+        out.get(bar) == [task3] as Set
     }
 
     def "configures tasks if configuration options specified"() {
         given:
-        selector.getSelection('foo') >> new TaskSelector.TaskSelection('foo task', asTaskSelectionResults(task, task2))
-        selector.getSelection('bar') >> new TaskSelector.TaskSelection('bar task', asTaskSelectionResults(task3))
-        selector.getSelection('lastTask') >> new TaskSelector.TaskSelection('last task', asTaskSelectionResults(task3))
+        def foo = new DefaultTaskParameter('foo')
+        def bar = new DefaultTaskParameter('bar')
+        def last = new DefaultTaskParameter('lastTask')
+        selector.getSelection(foo) >> new TaskSelector.TaskSelection('foo task', asTaskSelectionResults(task, task2))
+        selector.getSelection(bar) >> new TaskSelector.TaskSelection('bar task', asTaskSelectionResults(task3))
+        selector.getSelection(last) >> new TaskSelector.TaskSelection('last task', asTaskSelectionResults(task3))
 
         when:
-        def out = parser.parseTasks(['foo', '--all', 'bar', '--include', 'stuff', 'lastTask'], selector)
+        def out = parser.parseTasks(asTaskParameters([foo, '--all', bar, '--include', 'stuff', last]), selector)
 
         then:
         out.size() == 4
-        1 * parser.taskConfigurer.configureTasks(newHashSet(task, task2), ['--all', 'bar', '--include', 'stuff', 'lastTask']) >> ['bar', '--include', 'stuff', 'lastTask']
-        1 * parser.taskConfigurer.configureTasks(newHashSet(task3), ['--include', 'stuff', 'lastTask']) >> ['lastTask']
+        1 * parser.taskConfigurer.configureTasks(newHashSet(task, task2), asTaskParameters(['--all', bar, '--include', 'stuff', last])) >> asTaskParameters([bar, '--include', 'stuff', last])
+        1 * parser.taskConfigurer.configureTasks(newHashSet(task3), asTaskParameters(['--include', 'stuff', last])) >> [last]
         1 * parser.taskConfigurer.configureTasks(newHashSet(task3), []) >> []
         0 * parser.taskConfigurer._
     }
diff --git a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/CachingScriptSourceTest.java b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/CachingScriptSourceTest.java
index d6c6f4dbd4c8..75371d827966 100755
--- a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/CachingScriptSourceTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/CachingScriptSourceTest.java
@@ -15,8 +15,8 @@
  */
 package org.gradle.groovy.scripts;
 
-import org.gradle.api.internal.resource.CachingResource;
-import org.gradle.api.internal.resource.Resource;
+import org.gradle.internal.resource.CachingResource;
+import org.gradle.internal.resource.Resource;
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JMock;
 import org.jmock.integration.junit4.JUnit4Mockery;
diff --git a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/StringScriptSourceTest.java b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/StringScriptSourceTest.java
index 65dce341639f..c100368ecc5a 100644
--- a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/StringScriptSourceTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/StringScriptSourceTest.java
@@ -19,7 +19,7 @@
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
-import org.gradle.api.internal.resource.StringResource;
+import org.gradle.internal.resource.StringResource;
 import org.junit.Test;
 
 public class StringScriptSourceTest {
diff --git a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/UriScriptSourceTest.java b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/UriScriptSourceTest.java
index f5942d667ed7..a423ebca9e5b 100644
--- a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/UriScriptSourceTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/UriScriptSourceTest.java
@@ -16,7 +16,7 @@
 
 package org.gradle.groovy.scripts;
 
-import org.gradle.api.internal.resource.UriResource;
+import org.gradle.internal.resource.UriResource;
 import org.gradle.test.fixtures.file.TestFile;
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider;
 import org.junit.Before;
diff --git a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandlerTest.java b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandlerTest.java
index 3ced6626ab53..3700411ad28a 100644
--- a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandlerTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/DefaultScriptCompilationHandlerTest.java
@@ -27,7 +27,7 @@
 import org.codehaus.groovy.control.Phases;
 import org.codehaus.groovy.control.SourceUnit;
 import org.gradle.api.GradleException;
-import org.gradle.api.internal.resource.Resource;
+import org.gradle.internal.resource.Resource;
 import org.gradle.groovy.scripts.ScriptCompilationException;
 import org.gradle.groovy.scripts.ScriptSource;
 import org.gradle.groovy.scripts.StringScriptSource;
diff --git a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompilerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompilerTest.groovy
index d533a3ebd23d..4eda58da2027 100644
--- a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompilerTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/FileCacheBackedScriptClassCompilerTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.groovy.scripts.internal
 
 import org.gradle.api.Action
-import org.gradle.api.internal.resource.Resource
+import org.gradle.internal.resource.Resource
 import org.gradle.cache.CacheBuilder
 import org.gradle.cache.CacheRepository
 import org.gradle.cache.CacheValidator
diff --git a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/ShortCircuitEmptyScriptCompilerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/ShortCircuitEmptyScriptCompilerTest.groovy
index 1719427ca858..53199cf7ff61 100644
--- a/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/ShortCircuitEmptyScriptCompilerTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/groovy/scripts/internal/ShortCircuitEmptyScriptCompilerTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.groovy.scripts.internal
 
 import spock.lang.Specification
-import org.gradle.api.internal.resource.Resource
+import org.gradle.internal.resource.Resource
 import org.gradle.groovy.scripts.ScriptSource
 import org.gradle.groovy.scripts.Transformer
 import org.gradle.groovy.scripts.Script
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/BuildLayoutParametersTest.groovy b/subprojects/core/src/test/groovy/org/gradle/initialization/BuildLayoutParametersTest.groovy
index 4954dc8632cf..ba9799461ed9 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/BuildLayoutParametersTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/BuildLayoutParametersTest.groovy
@@ -34,7 +34,7 @@ class BuildLayoutParametersTest extends Specification {
         expect:
         def params = new BuildLayoutParameters()
         params.searchUpwards
-        params.gradleUserHomeDir == canonicalise(StartParameter.DEFAULT_GRADLE_USER_HOME)
+        params.gradleUserHomeDir == canonicalise(BuildLayoutParameters.DEFAULT_GRADLE_USER_HOME)
         params.projectDir == canonicalise(SystemProperties.getCurrentDir())
     }
 
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultCommandLineConverterTest.java b/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultCommandLineConverterTest.java
index 231e265f017d..e31295ad813c 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultCommandLineConverterTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultCommandLineConverterTest.java
@@ -43,7 +43,7 @@ public class DefaultCommandLineConverterTest {
 
     private TestFile currentDir = testDir.file("current-dir");
     private File expectedBuildFile;
-    private File expectedGradleUserHome = StartParameter.DEFAULT_GRADLE_USER_HOME;
+    private File expectedGradleUserHome = new BuildLayoutParameters().getGradleUserHomeDir();
     private File expectedProjectDir = currentDir;
     private List<String> expectedTaskNames = toList();
     private Set<String> expectedExcludedTasks = toSet();
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherFactoryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherFactoryTest.groovy
index 933fae0b84bb..e9d9cf504685 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherFactoryTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherFactoryTest.groovy
@@ -15,9 +15,7 @@
  */
 package org.gradle.initialization
 
-import org.gradle.GradleLauncher
 import org.gradle.StartParameter
-import org.gradle.cli.CommandLineConverter
 import org.gradle.internal.nativeplatform.services.NativeServices
 import org.gradle.internal.service.DefaultServiceRegistry
 import org.gradle.internal.service.ServiceRegistry
@@ -26,29 +24,9 @@ import org.gradle.logging.LoggingServiceRegistry
 import spock.lang.Specification
 
 class DefaultGradleLauncherFactoryTest extends Specification {
-    final CommandLineConverter<StartParameter> parameterConverter = Mock()
     final ServiceRegistry sharedServices = new DefaultServiceRegistry(LoggingServiceRegistry.newEmbeddableLogging(), NativeServices.getInstance()).addProvider(new GlobalScopeServices(false))
     final DefaultGradleLauncherFactory factory = new DefaultGradleLauncherFactory(sharedServices)
 
-    def setup() {
-        factory.setCommandLineConverter(parameterConverter);
-    }
-
-    def cleanup() {
-        GradleLauncher.injectCustomFactory(null);
-    }
-
-    def registersSelfWithGradleLauncher() {
-        StartParameter startParameter = new StartParameter();
-
-        when:
-        def result = GradleLauncher.createStartParameter('a')
-
-        then:
-        result == startParameter
-        1 * parameterConverter.convert(['a']) >> startParameter
-    }
-
     def newInstanceWithStartParameterAndRequestMetaData() {
         StartParameter startParameter = new StartParameter();
         BuildRequestMetaData metaData = new DefaultBuildRequestMetaData(System.currentTimeMillis());
@@ -84,16 +62,4 @@ class DefaultGradleLauncherFactoryTest extends Specification {
         request != requestMetaData
         request.client == clientMetaData
     }
-
-    def createStartParameter() {
-        StartParameter startParameter = new StartParameter();
-
-        when:
-        def result = factory.createStartParameter('a')
-
-        then:
-        result == startParameter
-        1 * parameterConverter.convert(['a']) >> startParameter
-    }
-
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherTest.java b/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherTest.java
index 57138dae9439..7b7a632e8fe0 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/DefaultGradleLauncherTest.java
@@ -18,7 +18,6 @@
 
 import org.gradle.BuildListener;
 import org.gradle.BuildResult;
-import org.gradle.GradleLauncher;
 import org.gradle.StartParameter;
 import org.gradle.api.initialization.ProjectDescriptor;
 import org.gradle.api.internal.ExceptionAnalyser;
@@ -40,13 +39,15 @@
 import org.jmock.Expectations;
 import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.Closeable;
 import java.io.File;
+import java.io.IOException;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
 import static org.junit.Assert.assertThat;
 
 @RunWith(org.jmock.integration.junit4.JMock.class)
@@ -72,13 +73,13 @@ public class DefaultGradleLauncherTest {
     private JUnit4Mockery context = new JUnit4GroovyMockery();
 
     private ClassLoaderScope settingsClassLoaderScope = context.mock(ClassLoaderScope.class);
-    private ClassLoaderScope rootProjectClassLoaderScope = context.mock(ClassLoaderScope.class);
+    private ClassLoaderScope baseClassLoaderScope = context.mock(ClassLoaderScope.class);
     private ExceptionAnalyser exceptionAnalyserMock = context.mock(ExceptionAnalyser.class);
     private LoggingManagerInternal loggingManagerMock = context.mock(LoggingManagerInternal.class);
     private ModelConfigurationListener modelListenerMock = context.mock(ModelConfigurationListener.class);
     private TasksCompletionListener tasksCompletionListener = context.mock(TasksCompletionListener.class);
-
-    @Rule
+    private BuildCompletionListener buildCompletionListener = context.mock(BuildCompletionListener.class);
+    private Closeable buildServices = context.mock(Closeable.class);
     public TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider();
 
     @Before
@@ -109,7 +110,7 @@ public void setUp() {
 
         gradleLauncher = new DefaultGradleLauncher(gradleMock, initscriptHandlerMock, settingsHandlerMock,
                 buildLoaderMock, buildConfigurerMock, buildBroadcaster, exceptionAnalyserMock, loggingManagerMock,
-                modelListenerMock, tasksCompletionListener, buildExecuter);
+                modelListenerMock, tasksCompletionListener, buildExecuter, buildCompletionListener, buildServices);
 
         context.checking(new Expectations() {
             {
@@ -118,7 +119,9 @@ public void setUp() {
                 allowing(settingsMock).getClassLoaderScope();
                 will(returnValue(settingsClassLoaderScope));
                 allowing(settingsClassLoaderScope).createSibling();
-                will(returnValue(rootProjectClassLoaderScope));
+                will(returnValue(baseClassLoaderScope));
+                allowing(baseClassLoaderScope).lock();
+                will(returnValue(baseClassLoaderScope));
                 allowing(gradleMock).getRootProject();
                 will(returnValue(expectedRootProject));
                 allowing(gradleMock).getDefaultProject();
@@ -133,7 +136,7 @@ public void setUp() {
 
     @Test
     public void testRun() {
-        expectLoggingStartedAndStoped();
+        expectLoggingStarted();
         expectInitScriptsExecuted();
         expectSettingsBuilt();
         expectDagBuilt();
@@ -144,26 +147,14 @@ public void testRun() {
         assertThat(buildResult.getFailure(), nullValue());
     }
 
-    @Test
-    public void testGetBuildAndRunAnalysis() {
-        expectLoggingStartedAndStoped();
-        expectInitScriptsExecuted();
-        expectSettingsBuilt();
-        expectDagBuilt();
-        expectBuildListenerCallbacks();
-        BuildResult buildResult = gradleLauncher.getBuildAndRunAnalysis();
-        assertThat(buildResult.getGradle(), sameInstance((Object) gradleMock));
-        assertThat(buildResult.getFailure(), nullValue());
-    }
-
     @Test
     public void testGetBuildAnalysis() {
-        expectLoggingStartedAndStoped();
+        expectLoggingStarted();
         expectInitScriptsExecuted();
         expectSettingsBuilt();
         expectBuildListenerCallbacks();
         context.checking(new Expectations() {{
-            one(buildLoaderMock).load(expectedRootProjectDescriptor, gradleMock, rootProjectClassLoaderScope);
+            one(buildLoaderMock).load(expectedRootProjectDescriptor, gradleMock, baseClassLoaderScope);
             one(buildConfigurerMock).configure(gradleMock);
         }});
         BuildResult buildResult = gradleLauncher.getBuildAnalysis();
@@ -175,12 +166,12 @@ public void testGetBuildAnalysis() {
     public void testGetBuildAnalysisWithFailure() {
         final RuntimeException exception = new RuntimeException();
         final RuntimeException transformedException = new RuntimeException();
-        expectLoggingStartedAndStoped();
+        expectLoggingStarted();
         expectInitScriptsExecuted();
         expectSettingsBuilt();
         context.checking(new Expectations() {{
             one(buildBroadcaster).buildStarted(gradleMock);
-            one(buildLoaderMock).load(expectedRootProjectDescriptor, gradleMock, rootProjectClassLoaderScope);
+            one(buildLoaderMock).load(expectedRootProjectDescriptor, gradleMock, baseClassLoaderScope);
             will(throwException(exception));
             one(exceptionAnalyserMock).transform(exception);
             will(returnValue(transformedException));
@@ -193,12 +184,12 @@ public void testGetBuildAnalysisWithFailure() {
 
     @Test
     public void testNotifiesListenerOfBuildAnalysisStages() {
-        expectLoggingStartedAndStoped();
+        expectLoggingStarted();
         expectInitScriptsExecuted();
         expectSettingsBuilt();
         expectBuildListenerCallbacks();
         context.checking(new Expectations() {{
-            one(buildLoaderMock).load(expectedRootProjectDescriptor, gradleMock, rootProjectClassLoaderScope);
+            one(buildLoaderMock).load(expectedRootProjectDescriptor, gradleMock, baseClassLoaderScope);
             one(buildConfigurerMock).configure(gradleMock);
         }});
 
@@ -207,7 +198,7 @@ public void testNotifiesListenerOfBuildAnalysisStages() {
 
     @Test
     public void testNotifiesListenerOfBuildStages() {
-        expectLoggingStartedAndStoped();
+        expectLoggingStarted();
         expectInitScriptsExecuted();
         expectSettingsBuilt();
         expectDagBuilt();
@@ -221,7 +212,7 @@ public void testNotifiesListenerOfBuildStages() {
     public void testNotifiesListenerOnSettingsInitWithFailure() {
         final RuntimeException failure = new RuntimeException();
         final RuntimeException transformedException = new RuntimeException();
-        expectLoggingStartedAndStoped();
+        expectLoggingStarted();
         expectInitScriptsExecuted();
         context.checking(new Expectations() {{
             one(buildBroadcaster).buildStarted(gradleMock);
@@ -240,7 +231,7 @@ public void testNotifiesListenerOnSettingsInitWithFailure() {
     public void testNotifiesListenerOnBuildCompleteWithFailure() {
         final RuntimeException failure = new RuntimeException();
         final RuntimeException transformedException = new RuntimeException();
-        expectLoggingStartedAndStoped();
+        expectLoggingStarted();
         expectInitScriptsExecuted();
         expectSettingsBuilt();
         expectDagBuilt();
@@ -259,10 +250,20 @@ public void testNotifiesListenerOnBuildCompleteWithFailure() {
         assertThat(buildResult.getFailure(), sameInstance((Throwable) transformedException));
     }
 
-    private void expectLoggingStartedAndStoped() {
+    @Test
+    public void testCleansUpOnStop() throws IOException {
         context.checking(new Expectations() {{
-            one(loggingManagerMock).start();
             one(loggingManagerMock).stop();
+            one(buildServices).close();
+            one(buildCompletionListener).completed();
+        }});
+
+        gradleLauncher.stop();
+    }
+
+    private void expectLoggingStarted() {
+        context.checking(new Expectations() {{
+            one(loggingManagerMock).start();
         }});
     }
 
@@ -295,7 +296,7 @@ private void expectBuildListenerCallbacks() {
     private void expectDagBuilt() {
         context.checking(new Expectations() {
             {
-                one(buildLoaderMock).load(expectedRootProjectDescriptor, gradleMock, rootProjectClassLoaderScope);
+                one(buildLoaderMock).load(expectedRootProjectDescriptor, gradleMock, baseClassLoaderScope);
                 one(buildConfigurerMock).configure(gradleMock);
                 one(buildExecuter).select(gradleMock);
             }
@@ -320,14 +321,6 @@ private void expectTasksRunWithFailure(final Throwable failure) {
         });
     }
 
-    // todo: This test is rather weak. Make it stronger.
-    @Test
-    public void testNewInstanceFactory() {
-        StartParameter startParameter = new StartParameter();
-        GradleLauncher gradleLauncher = GradleLauncher.newInstance(startParameter);
-        assertThat(gradleLauncher, notNullValue());
-    }
-
     private Matcher<BuildResult> result(final Matcher<? extends Throwable> exceptionMatcher) {
         return new BaseMatcher<BuildResult>() {
             public void describeTo(Description description) {
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/InstantiatingBuildLoaderTest.groovy b/subprojects/core/src/test/groovy/org/gradle/initialization/InstantiatingBuildLoaderTest.groovy
index a0129454f0da..46c63adf5a69 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/InstantiatingBuildLoaderTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/InstantiatingBuildLoaderTest.groovy
@@ -44,6 +44,9 @@ class InstantiatingBuildLoaderTest extends Specification {
     ProjectInternal childProject
     GradleInternal build
     def rootProjectClassLoaderScope = Mock(ClassLoaderScope)
+    def baseClassLoaderScope = Mock(ClassLoaderScope) {
+        1 * createChild() >> rootProjectClassLoaderScope
+    }
 
     @Rule
     public TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider();
@@ -68,37 +71,27 @@ class InstantiatingBuildLoaderTest extends Specification {
         ProjectDescriptor rootDescriptor = descriptor('root', null, rootProjectDir)
         ProjectInternal rootProject = project(rootDescriptor, null)
 
-        projectFactory.createProject(rootDescriptor, null, !null, rootProjectClassLoaderScope) >> rootProject
+        projectFactory.createProject(rootDescriptor, null, !null, rootProjectClassLoaderScope, baseClassLoaderScope) >> rootProject
         1 * build.setRootProject(rootProject)
         build.getRootProject() >> rootProject
         1 * build.setDefaultProject(rootProject)
 
         then:
-        buildLoader.load(rootDescriptor, build, rootProjectClassLoaderScope)
+        buildLoader.load(rootDescriptor, build, baseClassLoaderScope)
     }
 
     def createsBuildWithMultipleProjects() {
         when:
         expectProjectsCreated()
-        buildLoader.load(rootDescriptor, build, rootProjectClassLoaderScope)
+        buildLoader.load(rootDescriptor, build, baseClassLoaderScope)
 
         then:
         rootProject.childProjects['child'].is childProject
     }
 
-    def createsBuildWithMultipleProjectsAndSetsDefaultFromPath() {
-        when:
-        expectProjectsCreatedNoDefaultProject()
-        startParameter.projectPath = ':child'
-        buildLoader.load(rootDescriptor, build, rootProjectClassLoaderScope)
-
-        then:
-        1 * build.setDefaultProject(childProject)
-    }
-
     def expectProjectsCreatedNoDefaultProject() {
-        1 * projectFactory.createProject(rootDescriptor, null, !null, rootProjectClassLoaderScope) >> rootProject
-        1 * projectFactory.createProject(childDescriptor, rootProject, !null, _ as ClassLoaderScope) >> childProject
+        1 * projectFactory.createProject(rootDescriptor, null, !null, rootProjectClassLoaderScope, baseClassLoaderScope) >> rootProject
+        1 * projectFactory.createProject(childDescriptor, rootProject, !null, _ as ClassLoaderScope, baseClassLoaderScope) >> childProject
         1 * build.setRootProject(rootProject)
         build.getRootProject() >> rootProject
     }
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/LayoutCommandLineConverterTest.groovy b/subprojects/core/src/test/groovy/org/gradle/initialization/LayoutCommandLineConverterTest.groovy
index 3841fb1c9d12..a45ee6f9d5f1 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/LayoutCommandLineConverterTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/LayoutCommandLineConverterTest.groovy
@@ -16,8 +16,6 @@
 
 package org.gradle.initialization
 
-import org.gradle.StartParameter
-import org.gradle.api.internal.file.TestFiles
 import org.gradle.internal.SystemProperties
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
@@ -27,17 +25,17 @@ import static org.gradle.util.GFileUtils.canonicalise
 
 class LayoutCommandLineConverterTest extends Specification {
 
-    def converter = new LayoutCommandLineConverter(TestFiles.fileLookup())
+    def converter = new LayoutCommandLineConverter()
     @Rule TestNameTestDirectoryProvider temp = new TestNameTestDirectoryProvider()
 
     def convert(String... args) {
-        converter.convert(Arrays.asList(args))
+        converter.convert(Arrays.asList(args), new BuildLayoutParameters())
     }
 
     def "has reasonable defaults"() {
         expect:
         convert().projectDir == canonicalise(SystemProperties.getCurrentDir())
-        convert().gradleUserHomeDir == canonicalise(StartParameter.DEFAULT_GRADLE_USER_HOME)
+        convert().gradleUserHomeDir == canonicalise(BuildLayoutParameters.DEFAULT_GRADLE_USER_HOME)
         convert().searchUpwards
     }
 
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/ProjectPathProjectSpecTest.java b/subprojects/core/src/test/groovy/org/gradle/initialization/ProjectPathProjectSpecTest.java
deleted file mode 100644
index 784b9e74e62a..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/ProjectPathProjectSpecTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.initialization;
-
-import org.gradle.api.InvalidUserDataException;
-import org.gradle.api.internal.project.ProjectIdentifier;
-import org.gradle.api.internal.project.ProjectRegistry;
-import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider;
-import org.jmock.Expectations;
-import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.gradle.util.WrapUtil.toSet;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-@RunWith(JMock.class)
-public class ProjectPathProjectSpecTest {
-    private final JUnit4Mockery context = new JUnit4Mockery();
-    @Rule
-    public TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider();
-    private final String path = ":subproject";
-    private final ProjectPathProjectSpec spec = new ProjectPathProjectSpec(path);
-    private int counter;
-
-    @Test
-    public void containsMatchWhenAtLeastOneProjectHasSpecifiedProjectDir() {
-        assertFalse(spec.containsProject(registry()));
-        assertFalse(spec.containsProject(registry(project(":other"))));
-
-        assertTrue(spec.containsProject(registry(project(path))));
-        assertTrue(spec.containsProject(registry(project(path), project(":"), project(":other"))));
-        assertTrue(spec.containsProject(registry(project(path), project(path))));
-    }
-
-    @Test
-    public void selectsSingleProjectWhichHasSpecifiedProjectDir() {
-        ProjectIdentifier project = project(path);
-        assertThat(spec.selectProject(registry(project, project(":other"))), sameInstance(project));
-    }
-
-    @Test
-    public void selectProjectFailsWhenNoProjectHasSpecifiedProjectDir() {
-        try {
-            spec.selectProject(registry());
-            fail();
-        } catch (InvalidUserDataException e) {
-            assertThat(e.getMessage(), equalTo("No projects in this build have path '" + path + "'."));
-        }
-    }
-
-    @Test
-    public void selectProjectFailsWhenMultipleProjectsHaveSpecifiedProjectDir() {
-        // this is really artificial
-        ProjectIdentifier project1 = project(path);
-        ProjectIdentifier project2 = project(path);
-        try {
-            spec.selectProject(registry(project1, project2));
-            fail();
-        } catch (InvalidUserDataException e) {
-            assertThat(e.getMessage(), startsWith("Multiple projects in this build have path '" + path + "':"));
-        }
-    }
-
-    @Test
-    public void cannotSelectProjectWhenBuildFileIsNotAFile() {
-
-        try {
-            new ProjectPathProjectSpec(null).containsProject(registry());
-            fail();
-        } catch (InvalidUserDataException e) {
-            assertThat(e.getMessage(), equalTo("Project path must not be empty."));
-        }
-
-        try {
-            new ProjectPathProjectSpec("").containsProject(registry());
-            fail();
-        } catch (InvalidUserDataException e) {
-            assertThat(e.getMessage(), equalTo("Project path must not be empty."));
-        }
-    }
-
-    private ProjectRegistry<ProjectIdentifier> registry(final ProjectIdentifier... projects) {
-        final ProjectRegistry<ProjectIdentifier> registry = context.mock(ProjectRegistry.class, String.valueOf(counter++));
-        context.checking(new Expectations(){{
-            allowing(registry).getAllProjects();
-            will(returnValue(toSet(projects)));
-        }});
-        return registry;
-    }
-
-    private ProjectIdentifier project(final String path) {
-        final ProjectIdentifier projectIdentifier = context.mock(ProjectIdentifier.class, String.valueOf(counter++));
-        context.checking(new Expectations(){{
-            allowing(projectIdentifier).getPath();
-            will(returnValue(path));
-        }});
-        return projectIdentifier;
-    }
-}
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/ProjectSpecsTest.groovy b/subprojects/core/src/test/groovy/org/gradle/initialization/ProjectSpecsTest.groovy
index 28bb87ef4037..9282c7c1b1b8 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/ProjectSpecsTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/ProjectSpecsTest.groovy
@@ -35,18 +35,6 @@ class ProjectSpecsTest extends Specification {
 
     }
 
-    def "path based spec"() {
-        given:
-        StartParameter parameter = new StartParameter()
-        parameter.setProjectPath(':a')
-        parameter.setBuildFile(buildFile)
-        parameter.setProjectDir(projectDir)
-        parameter.setCurrentDir(currentDir)
-
-        expect:
-        ProjectSpecs.forStartParameter(parameter).class == ProjectPathProjectSpec
-    }
-
     def "build file based spec"() {
         given:
         StartParameter parameter = new StartParameter()
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/SettingsHandlerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/initialization/SettingsHandlerTest.groovy
index 6bc529fc3e7d..1b940c4ae80e 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/SettingsHandlerTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/SettingsHandlerTest.groovy
@@ -54,7 +54,8 @@ class SettingsHandlerTest extends Specification {
         gradle.getServices() >> services
         settingsFinder.find(startParameter) >> settingsLocation
         1 * buildSourceBuilder.buildAndCreateClassLoader({ StartParameter sp -> sp.currentDir == new File(settingsLocation.getSettingsDir(), BaseSettings.DEFAULT_BUILD_SRC_DIR) }) >> classLoaderScope
-        1 * classLoaderScope.createRebasedChild() >> settingsClassLoaderScope
+        1 * classLoaderScope.createChild() >> settingsClassLoaderScope
+        1 * settingsClassLoaderScope.lock() >> settingsClassLoaderScope
         1 * settingsProcessor.process(gradle, settingsLocation, settingsClassLoaderScope, startParameter) >> settings
 
         then:
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilderTest.groovy b/subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilderTest.groovy
index 753ac9dc1a8f..43937a564f88 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilderTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSourceBuilderTest.groovy
@@ -15,6 +15,7 @@
  */
 package org.gradle.initialization.buildsrc
 
+import org.gradle.initialization.GradleLauncher
 import org.gradle.StartParameter
 import org.gradle.api.internal.initialization.ClassLoaderScope
 import org.gradle.cache.CacheRepository
@@ -46,6 +47,8 @@ class BuildSourceBuilderTest extends Specification {
     void "creates classpath when build src exists"() {
         def cache = Mock(PersistentCache)
         def classpath = Mock(ClassPath)
+        def launcher = Mock(GradleLauncher)
+        launcherFactory.newInstance(_) >> launcher
         buildSourceBuilder.createCache(parameter) >> cache
         cache.useCache(_ as String, _ as BuildSrcUpdateFactory) >> classpath
 
diff --git a/subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactoryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactoryTest.groovy
index ce52264dbd87..776f9c17db1a 100644
--- a/subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactoryTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/initialization/buildsrc/BuildSrcUpdateFactoryTest.groovy
@@ -16,7 +16,7 @@
 
 package org.gradle.initialization.buildsrc
 
-import org.gradle.GradleLauncher
+import org.gradle.initialization.GradleLauncher
 import org.gradle.cache.PersistentCache
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/PathKeyFileStoreTest.groovy b/subprojects/core/src/test/groovy/org/gradle/internal/resource/local/PathKeyFileStoreTest.groovy
similarity index 99%
rename from subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/PathKeyFileStoreTest.groovy
rename to subprojects/core/src/test/groovy/org/gradle/internal/resource/local/PathKeyFileStoreTest.groovy
index 3dfbc15024b8..299314486309 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/PathKeyFileStoreTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/internal/resource/local/PathKeyFileStoreTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.filestore
+package org.gradle.internal.resource.local
 
 import org.gradle.api.Action
 import org.gradle.api.GradleException
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/PathNormalisingKeyFileStoreTest.groovy b/subprojects/core/src/test/groovy/org/gradle/internal/resource/local/PathNormalisingKeyFileStoreTest.groovy
similarity index 89%
rename from subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/PathNormalisingKeyFileStoreTest.groovy
rename to subprojects/core/src/test/groovy/org/gradle/internal/resource/local/PathNormalisingKeyFileStoreTest.groovy
index b02bdeb71646..920d568178d3 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/PathNormalisingKeyFileStoreTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/internal/resource/local/PathNormalisingKeyFileStoreTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.filestore
+package org.gradle.internal.resource.local
 
 import org.gradle.api.Action
 import org.gradle.test.fixtures.file.TestFile
@@ -24,7 +24,8 @@ import spock.lang.Specification
 
 class PathNormalisingKeyFileStoreTest extends Specification {
 
-    @Rule TestNameTestDirectoryProvider dir = new TestNameTestDirectoryProvider()
+    @Rule
+    TestNameTestDirectoryProvider dir = new TestNameTestDirectoryProvider()
     TestFile fsBase
     PathNormalisingKeyFileStore store
 
@@ -47,8 +48,8 @@ class PathNormalisingKeyFileStoreTest extends Specification {
 
     def "can add to filestore"() {
         when:
-        store.add("!.zip", {File file -> file.text = "abc"} as Action<File>)
-        store.add("  ", {File file -> file.text = "def"} as Action<File>)
+        store.add("!.zip", { File file -> file.text = "abc" } as Action<File>)
+        store.add("  ", { File file -> file.text = "def" } as Action<File>)
         then:
         fsBase.file("_.zip").text == "abc"
         fsBase.file("__").text == "def"
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/UniquePathKeyFileStoreTest.groovy b/subprojects/core/src/test/groovy/org/gradle/internal/resource/local/UniquePathKeyFileStoreTest.groovy
similarity index 95%
rename from subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/UniquePathKeyFileStoreTest.groovy
rename to subprojects/core/src/test/groovy/org/gradle/internal/resource/local/UniquePathKeyFileStoreTest.groovy
index c1ec9cb52d70..22f9748c1b81 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/filestore/UniquePathKeyFileStoreTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/internal/resource/local/UniquePathKeyFileStoreTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.filestore
+package org.gradle.internal.resource.local
 
 import org.gradle.api.Action
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
@@ -23,7 +23,8 @@ import spock.lang.Specification
 
 class UniquePathKeyFileStoreTest extends Specification {
 
-    @Rule TestNameTestDirectoryProvider temporaryFolder = new TestNameTestDirectoryProvider();
+    @Rule
+    TestNameTestDirectoryProvider temporaryFolder = new TestNameTestDirectoryProvider();
     Action<File> action = Mock()
 
     UniquePathKeyFileStore uniquePathKeyFileStore
diff --git a/subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/BuildScopeServicesTest.groovy b/subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/BuildScopeServicesTest.groovy
index d4079c251836..5064250378cd 100644
--- a/subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/BuildScopeServicesTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/internal/service/scopes/BuildScopeServicesTest.groovy
@@ -44,6 +44,7 @@ import org.gradle.listener.ListenerManager
 import org.gradle.logging.LoggingManagerInternal
 import org.gradle.logging.ProgressLoggerFactory
 import org.gradle.messaging.remote.MessagingServer
+import org.gradle.plugin.use.internal.PluginRequestApplicatorFactory
 import org.gradle.process.internal.DefaultWorkerProcessFactory
 import org.gradle.process.internal.WorkerProcessBuilder
 import org.gradle.profile.ProfileEventAdapter
@@ -81,6 +82,7 @@ public class BuildScopeServicesTest extends Specification {
         parent.get(CacheFactory) >> Stub(CacheFactory)
         parent.get(DocumentationRegistry) >> new DocumentationRegistry()
         parent.get(FileLookup) >> Stub(FileLookup)
+        parent.get(PluginRequestApplicatorFactory) >> Mock(PluginRequestApplicatorFactory)
     }
 
     def delegatesToParentForUnknownService() {
diff --git a/subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/MapNotationParserTest.groovy b/subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/MapNotationParserTest.groovy
index 474a47482874..043e1a0b774b 100644
--- a/subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/MapNotationParserTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/internal/typeconversion/MapNotationParserTest.groovy
@@ -81,7 +81,9 @@ class MapNotationParserTest extends Specification {
         parser.parseNotation([name: 'name', version: 1.2, unknown: 'unknown'])
 
         then:
-        MissingFieldException e = thrown()
+        MissingPropertyException e = thrown()
+        e.property == 'unknown'
+        e.type == TargetObject
     }
 
     def "does not parse notation that is not a map"() {
@@ -99,11 +101,11 @@ class MapNotationParserTest extends Specification {
             return new TargetObject(key1:  name, key2:  version, optional:  optional)
         }
     }
+}
 
-    static class TargetObject {
-        String key1;
-        String key2;
-        String optional;
-        String prop1;
-    }
+class TargetObject {
+    String key1;
+    String key2;
+    String optional;
+    String prop1;
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/invocation/DefaultGradleTest.java b/subprojects/core/src/test/groovy/org/gradle/invocation/DefaultGradleTest.java
index 54fd2dc6ea1b..027e7a4f23b9 100644
--- a/subprojects/core/src/test/groovy/org/gradle/invocation/DefaultGradleTest.java
+++ b/subprojects/core/src/test/groovy/org/gradle/invocation/DefaultGradleTest.java
@@ -33,6 +33,7 @@
 import org.gradle.api.plugins.PluginContainer;
 import org.gradle.configuration.ScriptPluginFactory;
 import org.gradle.execution.TaskGraphExecuter;
+import org.gradle.initialization.ClassLoaderScopeRegistry;
 import org.gradle.internal.classloader.MultiParentClassLoader;
 import org.gradle.internal.service.ServiceRegistry;
 import org.gradle.internal.service.scopes.ServiceRegistryFactory;
@@ -76,6 +77,7 @@ public class DefaultGradleTest {
     private final PluginContainer pluginContainer = context.mock(PluginContainer.class);
     private final ScriptPluginFactory scriptPluginFactory = context.mock(ScriptPluginFactory.class);
     private final ScriptHandlerFactory scriptHandlerFactory = context.mock(ScriptHandlerFactory.class);
+    private final ClassLoaderScopeRegistry classLoaderScopeRegistry = context.mock(ClassLoaderScopeRegistry.class);
     private final ClassLoaderScope classLoaderScope = context.mock(ClassLoaderScope.class);
 
     private DefaultGradle gradle;
@@ -87,7 +89,9 @@ public void setUp() {
             will(returnValue(gradleServiceRegistryMock));
             allowing(gradleServiceRegistryMock).get(ScriptHandler.class);
             will(returnValue(scriptHandlerMock));
-            allowing(gradleServiceRegistryMock).get(ClassLoaderScope.class);
+            allowing(gradleServiceRegistryMock).get(ClassLoaderScopeRegistry.class);
+            will(returnValue(classLoaderScopeRegistry));
+            allowing(classLoaderScopeRegistry).getGradleApiScope();
             will(returnValue(classLoaderScope));
             allowing(gradleServiceRegistryMock).get(PluginRegistry.class);
             will(returnValue(pluginRegistry));
diff --git a/subprojects/core/src/test/groovy/org/gradle/logging/internal/LoggingCommandLineConverterTest.groovy b/subprojects/core/src/test/groovy/org/gradle/logging/internal/LoggingCommandLineConverterTest.groovy
index e77d3cf72f5a..42afca03c527 100644
--- a/subprojects/core/src/test/groovy/org/gradle/logging/internal/LoggingCommandLineConverterTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/logging/internal/LoggingCommandLineConverterTest.groovy
@@ -91,7 +91,7 @@ class LoggingCommandLineConverterTest extends Specification {
     }
 
     void checkConversion(List<String> args) {
-        def actual = converter.convert(args)
+        def actual = converter.convert(args, new LoggingConfiguration())
         assert actual.logLevel == expectedConfig.logLevel
         assert actual.colorOutput == expectedConfig.colorOutput
         assert actual.showStacktrace == expectedConfig.showStacktrace
diff --git a/subprojects/core/src/test/groovy/org/gradle/plugin/bintray/JCenterPluginMapperSpec.groovy b/subprojects/core/src/test/groovy/org/gradle/plugin/bintray/JCenterPluginMapperSpec.groovy
deleted file mode 100644
index 3ef797b15da6..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/plugin/bintray/JCenterPluginMapperSpec.groovy
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.bintray
-
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.artifacts.dsl.DependencyHandler
-import org.gradle.cache.PersistentIndexedCache
-import org.gradle.internal.Factories
-import org.gradle.internal.Supplier
-import org.gradle.internal.Suppliers
-import org.gradle.messaging.serialize.BaseSerializerFactory
-import org.gradle.plugin.resolve.internal.DefaultPluginRequest
-import org.gradle.plugin.resolve.internal.InvalidPluginRequestException
-import org.gradle.plugin.resolve.internal.JCenterPluginMapper
-import org.gradle.plugin.resolve.internal.PluginRequest
-import org.gradle.testfixtures.internal.InMemoryIndexedCache
-import spock.lang.Specification
-
-class JCenterPluginMapperSpec extends Specification {
-
-    public static final String TEST_PLUGIN_MAVEN_GROUP_ID = 'com.bintray.gradle.test'
-    public static final String TEST_PLUGIN_MAVEN_ARTIFACT_ID = 'test-plugin'
-    public static final String TEST_PLUGIN_EXPLICIT_VERSION = '1.0'
-    public static final String TEST_PLUGIN_ID = 'gradle-test-plugin'
-
-    private DependencyHandler getMockForVersion(String version) {
-        Mock(DependencyHandler) {
-            create("$TEST_PLUGIN_MAVEN_GROUP_ID:$TEST_PLUGIN_MAVEN_ARTIFACT_ID:$version") >> Stub(Dependency) {
-                getGroup() >> TEST_PLUGIN_MAVEN_GROUP_ID
-                getName() >> TEST_PLUGIN_MAVEN_ARTIFACT_ID
-                getVersion() >> version
-            }
-            0 * _ //fail if create called with any other string
-        }
-    }
-
-    PersistentIndexedCache<PluginRequest, String> cache = new InMemoryIndexedCache<PluginRequest, String>(BaseSerializerFactory.STRING_SERIALIZER)
-    Supplier<PersistentIndexedCache<PluginRequest, String>> cacheSupplier = Suppliers.of(Factories.constant(cache))
-    JCenterPluginMapper mapper = new JCenterPluginMapper(cacheSupplier)
-
-    def 'Latest version of plugin maps correctly from Bintray'() {
-        when:
-        def dependencyHandler = Mock(DependencyHandler)
-        0 * dependencyHandler._
-        mapper.map(new DefaultPluginRequest(TEST_PLUGIN_ID), dependencyHandler)
-
-        then:
-        def e = thrown InvalidPluginRequestException
-        e.message.startsWith "No version number supplied for plugin '$TEST_PLUGIN_ID'"
-    }
-
-    def 'Explicit version of plugin maps correctly from Bintray'() {
-        when:
-        Dependency dependency = mapper.map(new DefaultPluginRequest(TEST_PLUGIN_ID, TEST_PLUGIN_EXPLICIT_VERSION), getMockForVersion(TEST_PLUGIN_EXPLICIT_VERSION))
-
-        then:
-        dependency.group == TEST_PLUGIN_MAVEN_GROUP_ID
-        dependency.name == TEST_PLUGIN_MAVEN_ARTIFACT_ID
-        dependency.version == TEST_PLUGIN_EXPLICIT_VERSION
-    }
-
-    def 'Query for non-existing plugin returns null'() {
-        expect:
-        mapper.map(new DefaultPluginRequest("not-exist"), getMockForVersion(TEST_PLUGIN_EXPLICIT_VERSION)) == null
-    }
-}
\ No newline at end of file
diff --git a/subprojects/core/src/test/groovy/org/gradle/plugin/internal/DefaultPluginHandlerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/plugin/internal/DefaultPluginHandlerTest.groovy
deleted file mode 100644
index 9c8d86fae469..000000000000
--- a/subprojects/core/src/test/groovy/org/gradle/plugin/internal/DefaultPluginHandlerTest.groovy
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.plugin.internal
-
-import org.gradle.api.InvalidUserDataException
-import org.gradle.plugin.resolve.internal.DefaultPluginRequest
-import spock.lang.Specification
-import spock.lang.Unroll
-
-class DefaultPluginHandlerTest extends Specification {
-
-    def requests = []
-    def handler = new DefaultPluginHandler(requests)
-
-    @Unroll
-    def "errors on invalid notation - #map"() {
-        when:
-        handler.apply(map)
-
-        then:
-        thrown InvalidUserDataException
-
-        where:
-        map << [
-                [:],
-                [foo: "bar"],
-                [version: "1.0"],
-                [version: "1"]
-        ]
-    }
-
-    @Unroll
-    def "accepts valid notation and applies when resolved - #map"() {
-        when:
-        handler.apply(map)
-
-        then:
-        requests.first() == request
-
-        where:
-        map                             | request
-        [plugin: "foo"]                 | new DefaultPluginRequest("foo")
-        [plugin: "foo", version: "bar"] | new DefaultPluginRequest("foo", "bar")
-        [plugin: "foo", version: 1]     | new DefaultPluginRequest("foo", "1")
-        [plugin: "foo", version: []]    | new DefaultPluginRequest("foo", "[]")
-    }
-
-}
diff --git a/subprojects/core/src/test/groovy/org/gradle/plugin/internal/PluginDependenciesServiceTest.groovy b/subprojects/core/src/test/groovy/org/gradle/plugin/internal/PluginDependenciesServiceTest.groovy
new file mode 100644
index 000000000000..530a2ed226f3
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/plugin/internal/PluginDependenciesServiceTest.groovy
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.internal
+
+import org.gradle.groovy.scripts.StringScriptSource
+import org.gradle.plugin.use.internal.DefaultPluginRequest
+import org.gradle.plugin.use.internal.PluginDependenciesService
+import org.gradle.plugin.use.internal.PluginRequest
+import spock.lang.Specification
+
+class PluginDependenciesServiceTest extends Specification {
+
+    final scriptSource = new StringScriptSource("d", "c")
+
+    List<PluginRequest> plugins(Closure<?> closure) {
+        new PluginDependenciesService(scriptSource).with {
+            createSpec(10).with(closure)
+            getRequests()
+        }
+    }
+
+    List<PluginRequest> requests(Map<String, String> requests) {
+        requests.collect { new DefaultPluginRequest(it.key, it.value, 10, scriptSource) }
+    }
+
+    def "can use spec dsl to build one request"() {
+        expect:
+        requests(foo: "bar") == plugins {
+            id "foo" version "bar"
+        }
+    }
+
+    def "version is optional"() {
+        expect:
+        requests(foo: null) == plugins {
+            id "foo"
+        }
+    }
+
+    def "returns empty list if none specified"() {
+        expect:
+        plugins {}.isEmpty()
+    }
+
+    def "can specify multiple"() {
+        expect:
+        requests(foo: "1.0", "bar": "2.0") == plugins {
+            id "foo" version "1.0"
+            id "bar" version "2.0"
+        }
+    }
+
+    def "does not prevent duplicate ids"() {
+        expect:
+        (requests(foo: "1.0") * 2) == plugins {
+            id "foo" version "1.0"
+            id "foo" version "1.0"
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/subprojects/core/src/test/groovy/org/gradle/plugin/internal/PluginIdTest.groovy b/subprojects/core/src/test/groovy/org/gradle/plugin/internal/PluginIdTest.groovy
new file mode 100644
index 000000000000..fcab4b826ed3
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/plugin/internal/PluginIdTest.groovy
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.internal
+
+import spock.lang.Specification
+
+import static org.gradle.plugin.internal.PluginId.validate
+
+class PluginIdTest extends Specification {
+
+    def "test validation matcher"() {
+        expect:
+        PluginId.INVALID_PLUGIN_ID_CHAR_MATCHER.indexIn(input) == index
+
+        where:
+        input     | index
+        "foo"     | -1
+        "f o"     | 1
+        "foo.bür" | 5
+        "123"     | -1
+        "FOO.bar" | -1
+    }
+
+    def "validate valid"() {
+        when:
+        validate("foo")
+        validate("Foo")
+        validate("foo.bar")
+        validate("foo.Bar")
+        validate("1")
+        validate("1.1")
+        validate("_._")
+        validate("-.-")
+        validate("-")
+
+        then:
+        noExceptionThrown()
+    }
+
+    def "is qualified"() {
+        expect:
+        !new PluginId("foo").qualified
+        new PluginId("foo.bar").qualified
+    }
+
+    def "qualify if unqualified"() {
+        expect:
+        new PluginId("foo").maybeQualify("bar").toString() == "bar.foo"
+        new PluginId("foo.bar").maybeQualify("bar").toString() == "foo.bar"
+    }
+
+    def "equality"() {
+        expect:
+        new PluginId("foo") == new PluginId("foo")
+        new PluginId("foo.bar") == new PluginId("foo.bar")
+        new PluginId("foo").maybeQualify("some.org") == new PluginId("some.org.foo")
+    }
+
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/process/internal/DefaultExecHandleSpec.groovy b/subprojects/core/src/test/groovy/org/gradle/process/internal/DefaultExecHandleSpec.groovy
index 93f947031033..4963ca9cd8e5 100644
--- a/subprojects/core/src/test/groovy/org/gradle/process/internal/DefaultExecHandleSpec.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/process/internal/DefaultExecHandleSpec.groovy
@@ -16,11 +16,11 @@
 
 package org.gradle.process.internal
 
+import org.gradle.internal.jvm.Jvm
 import org.gradle.process.ExecResult
 import org.gradle.process.internal.streams.StreamsHandler
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.GUtil
-import org.gradle.util.Jvm
 import org.junit.Rule
 import spock.lang.Ignore
 import spock.lang.Specification
@@ -308,13 +308,6 @@ class DefaultExecHandleSpec extends Specification {
         GUtil.flattenElements("-cp", System.getProperty("java.class.path"), mainClass.getName(), args);
     }
 
-    public static class TestApp {
-        public static void main(String[] args) {
-            System.out.print("output args: " + Arrays.asList(args));
-            System.err.print("error args: " + Arrays.asList(args));
-        }
-    }
-
     public static class BrokenApp {
         public static void main(String[] args) {
             System.exit(72);
diff --git a/subprojects/core/src/test/groovy/org/gradle/process/internal/TestApp.java b/subprojects/core/src/test/groovy/org/gradle/process/internal/TestApp.java
new file mode 100644
index 000000000000..74c425a551a0
--- /dev/null
+++ b/subprojects/core/src/test/groovy/org/gradle/process/internal/TestApp.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.process.internal;
+
+import java.util.Arrays;
+
+public class TestApp {
+    public static void main(String[] args) {
+        System.out.print("output args: " + Arrays.asList(args));
+        System.err.print("error args: " + Arrays.asList(args));
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/util/SingleMessageLoggerTest.groovy b/subprojects/core/src/test/groovy/org/gradle/util/SingleMessageLoggerTest.groovy
index 81da2f9afcd5..a4e4a5fce650 100644
--- a/subprojects/core/src/test/groovy/org/gradle/util/SingleMessageLoggerTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/util/SingleMessageLoggerTest.groovy
@@ -60,7 +60,7 @@ class SingleMessageLoggerTest extends ConcurrentSpec {
             SingleMessageLogger.nagUserWith("nag")
             return "result"
         }
-        0 * _._
+        0 * _
 
         and:
         appender.toString().length() == 0
@@ -74,7 +74,7 @@ class SingleMessageLoggerTest extends ConcurrentSpec {
 
         then:
         1 * action.run()
-        0 * _._
+        0 * _
 
         and:
         appender.toString().length() == 0
diff --git a/subprojects/core/src/test/groovy/org/gradle/util/VersionNumberTest.groovy b/subprojects/core/src/test/groovy/org/gradle/util/VersionNumberTest.groovy
index d3f4b3fbb2c9..3abaf7376241 100644
--- a/subprojects/core/src/test/groovy/org/gradle/util/VersionNumberTest.groovy
+++ b/subprojects/core/src/test/groovy/org/gradle/util/VersionNumberTest.groovy
@@ -16,9 +16,14 @@
 
 package org.gradle.util
 
-import spock.lang.*
+import spock.lang.Specification
 
 class VersionNumberTest extends Specification {
+    def "construction"() {
+        expect:
+        VersionNumber.version(5) == new VersionNumber(5, 0, 0, null)
+    }
+
     def "parsing"() {
         expect:
         VersionNumber.parse("1") == new VersionNumber(1, 0, 0, null)
@@ -36,53 +41,107 @@ class VersionNumberTest extends Specification {
         VersionNumber.parse("1.2.rc1-SNAPSHOT") == new VersionNumber(1, 2, 0, "rc1-SNAPSHOT")
         VersionNumber.parse("1.2.3.rc1-SNAPSHOT") == new VersionNumber(1, 2, 3, "rc1-SNAPSHOT")
 
-        VersionNumber.parse("11.22.33.44") == new VersionNumber(11, 22, 33, "44")
-        VersionNumber.parse("11.44") == new VersionNumber(11, 44, 0, null)
+        VersionNumber.parse("11.22") == new VersionNumber(11, 22, 0, null)
+        VersionNumber.parse("11.22.33") == new VersionNumber(11, 22, 33, null)
+        VersionNumber.parse("11.22.33-eap") == new VersionNumber(11, 22, 33, "eap")
+
         VersionNumber.parse("11.fortyfour") == new VersionNumber(11, 0, 0, "fortyfour")
+
+        VersionNumber.parse("1.0.0.0") == new VersionNumber(1, 0, 0, "0")
+        VersionNumber.parse("1.0.0.0.0.0.0") == new VersionNumber(1, 0, 0, "0.0.0.0")
+        VersionNumber.parse("1.2.3.4-rc1-SNAPSHOT") == new VersionNumber(1, 2, 3, "4-rc1-SNAPSHOT")
+        VersionNumber.parse("1.2.3.4.rc1-SNAPSHOT") == new VersionNumber(1, 2, 3, "4.rc1-SNAPSHOT")
     }
 
-    def "unparseable version number is represented as UNKNOWN (0.0.0)"() {
+    def "parsing with patch number"() {
+        expect:
+        def defaultScheme = VersionNumber.scheme()
+        defaultScheme.parse("1") == new VersionNumber(1, 0, 0, null)
+        defaultScheme.parse("1.2") == new VersionNumber(1, 2, 0, null)
+        defaultScheme.parse("1.2.3") == new VersionNumber(1, 2, 3, null)
+        defaultScheme.parse("1.2.3-qualifier") == new VersionNumber(1, 2, 3, "qualifier")
+        defaultScheme.parse("1.2.3.4") == new VersionNumber(1, 2, 3, "4")
+
+        def patchScheme = VersionNumber.withPatchNumber()
+        patchScheme.parse("1") == new VersionNumber(1, 0, 0, null)
+        patchScheme.parse("1.2") == new VersionNumber(1, 2, 0, null)
+        patchScheme.parse("1.2.3") == new VersionNumber(1, 2, 3, null)
+        patchScheme.parse("1.2.3.4") == new VersionNumber(1, 2, 3, 4, null)
+        patchScheme.parse("1.2.3_4") == new VersionNumber(1, 2, 3, 4, null)
+        patchScheme.parse("1.2.3.4-qualifier") == new VersionNumber(1, 2, 3, 4, "qualifier")
+        patchScheme.parse("1.2.3.4.qualifier") == new VersionNumber(1, 2, 3, 4, "qualifier")
+        patchScheme.parse("1.2.3.4.5.6") == new VersionNumber(1, 2, 3, 4, "5.6")
+    }
+
+    def "unparseable version number is represented as UNKNOWN (0.0.0.0)"() {
         expect:
         VersionNumber.parse(null) == VersionNumber.UNKNOWN
         VersionNumber.parse("") == VersionNumber.UNKNOWN
         VersionNumber.parse("foo") == VersionNumber.UNKNOWN
         VersionNumber.parse("1.") == VersionNumber.UNKNOWN
         VersionNumber.parse("1.2.3-") == VersionNumber.UNKNOWN
+        VersionNumber.parse(".") == VersionNumber.UNKNOWN
+        VersionNumber.parse("_") == VersionNumber.UNKNOWN
+        VersionNumber.parse("-") == VersionNumber.UNKNOWN
+        VersionNumber.parse(".1") == VersionNumber.UNKNOWN
+        VersionNumber.parse("a.1") == VersionNumber.UNKNOWN
+        VersionNumber.parse("1_2") == VersionNumber.UNKNOWN
+        VersionNumber.parse("1_2_2") == VersionNumber.UNKNOWN
+        VersionNumber.parse("1.2.3_4") == VersionNumber.UNKNOWN
     }
 
     def "accessors"() {
         when:
-        def version = new VersionNumber(1, 2, 3, "foo")
+        def version = new VersionNumber(1, 2, 3, 4, "foo")
 
         then:
         version.major == 1
         version.minor == 2
         version.micro == 3
+        version.patch == 4
         version.qualifier == "foo"
     }
 
     def "string representation"() {
         expect:
-        new VersionNumber(1, 0, 0, null).toString() == "1.0.0"
-        new VersionNumber(1, 2, 3, "foo").toString() == "1.2.3-foo"
+        VersionNumber.parse("1.0").toString() == "1.0.0"
+        VersionNumber.parse("1.2.3").toString() == "1.2.3"
+        VersionNumber.parse("1.2.3.4").toString() == "1.2.3-4"
+        VersionNumber.parse("1-rc-1").toString() == "1.0.0-rc-1"
+        VersionNumber.parse("1.2.3-rc-1").toString() == "1.2.3-rc-1"
+
+        def patchScheme = VersionNumber.withPatchNumber()
+        patchScheme.parse("1").toString() == "1.0.0.0"
+        patchScheme.parse("1.2").toString() == "1.2.0.0"
+        patchScheme.parse("1.2.3").toString() == "1.2.3.0"
+        patchScheme.parse("1.2.3.4").toString() == "1.2.3.4"
+        patchScheme.parse("1.2-rc-1").toString() == "1.2.0.0-rc-1"
     }
 
     def "equality"() {
+        def version = new VersionNumber(1, 1, 1, 1, null)
+        def qualified = new VersionNumber(1, 1, 1, 1, "beta-2")
+
         expect:
-        new VersionNumber(1, 1, 1, null) == new VersionNumber(1, 1, 1, null)
-        new VersionNumber(2, 1, 1, null) != new VersionNumber(1, 1, 1, null)
-        new VersionNumber(1, 2, 1, null) != new VersionNumber(1, 1, 1, null)
-        new VersionNumber(1, 1, 2, null) != new VersionNumber(1, 1, 1, null)
-        new VersionNumber(1, 1, 1, "rc") != new VersionNumber(1, 1, 1, null)
+        new VersionNumber(1, 1, 1, 1, null) Matchers.strictlyEqual(version)
+        new VersionNumber(2, 1, 1, 1, null) != version
+        new VersionNumber(1, 2, 1, 1, null) != version
+        new VersionNumber(1, 1, 2, 1, null) != version
+        new VersionNumber(1, 1, 1, 2, null) != version
+        new VersionNumber(1, 1, 1, 1, "rc") != version
+        new VersionNumber(1, 1, 1, 1, "beta-2") Matchers.strictlyEqual(qualified)
+        new VersionNumber(1, 1, 1, 1, "beta-3") != qualified
     }
 
     def "comparison"() {
         expect:
         (new VersionNumber(1, 1, 1, null) <=> new VersionNumber(1, 1, 1, null)) == 0
+        (new VersionNumber(1, 1, 1, null) <=> new VersionNumber(1, 1, 1, 0, null)) == 0
 
         new VersionNumber(2, 1, 1, null) > new VersionNumber(1, 1, 1, null)
         new VersionNumber(1, 2, 1, null) > new VersionNumber(1, 1, 1, null)
         new VersionNumber(1, 1, 2, null) > new VersionNumber(1, 1, 1, null)
+        new VersionNumber(1, 1, 1, 2, null) > new VersionNumber(1, 1, 1, null)
         new VersionNumber(1, 1, 1, "rc") < new VersionNumber(1, 1, 1, null)
         new VersionNumber(1, 1, 1, "beta") > new VersionNumber(1, 1, 1, "alpha")
         new VersionNumber(1, 1, 1, "RELEASE") > new VersionNumber(1, 1, 1, "beta")
diff --git a/subprojects/core/src/test/groovy/org/gradle/logging/ConfigureLogging.groovy b/subprojects/core/src/testFixtures/groovy/org/gradle/logging/ConfigureLogging.groovy
similarity index 100%
rename from subprojects/core/src/test/groovy/org/gradle/logging/ConfigureLogging.groovy
rename to subprojects/core/src/testFixtures/groovy/org/gradle/logging/ConfigureLogging.groovy
diff --git a/subprojects/core/src/test/groovy/org/gradle/logging/TestAppender.groovy b/subprojects/core/src/testFixtures/groovy/org/gradle/logging/TestAppender.groovy
similarity index 100%
rename from subprojects/core/src/test/groovy/org/gradle/logging/TestAppender.groovy
rename to subprojects/core/src/testFixtures/groovy/org/gradle/logging/TestAppender.groovy
diff --git a/subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/ConcurrentTestUtil.groovy b/subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/ConcurrentTestUtil.groovy
index d16ee8ddd6ca..9e384e05c9c8 100644
--- a/subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/ConcurrentTestUtil.groovy
+++ b/subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/ConcurrentTestUtil.groovy
@@ -166,7 +166,7 @@ class ConcurrentTestUtil extends ExternalResource {
         }
     }
 
-    private void onFailure(Throwable t) {
+    private void failed(Throwable t) {
         lock.lock()
         try {
             if (failureHandler != null) {
@@ -189,7 +189,7 @@ class ConcurrentTestUtil extends ExternalResource {
             LOG.info("Waiting for test threads to complete.")
             while (!threads.isEmpty()) {
                 if (!threadsChanged.awaitUntil(timeout)) {
-                    onFailure(new IllegalStateException("Timeout waiting for test threads to complete."))
+                    failed(new IllegalStateException("Timeout waiting for test threads to complete."))
                     break;
                 }
             }
@@ -235,7 +235,7 @@ class ConcurrentTestUtil extends ExternalResource {
         try {
             threads.remove(thread)
             if (failure) {
-                onFailure(failure)
+                failed(failure)
             }
             threadsChanged.signalAll()
         } finally {
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalBuildIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalBuildIntegrationTest.groovy
index e506efb1034b..abae870f75af 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalBuildIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalBuildIntegrationTest.groovy
@@ -263,6 +263,7 @@ abstract class AbstractLanguageIncrementalBuildIntegrationTest extends AbstractI
             }
 """
 
+        maybeWait()
         run "installMainExecutable"
 
         then:
@@ -503,7 +504,7 @@ abstract class AbstractLanguageIncrementalBuildIntegrationTest extends AbstractI
         }
     }
 
-    private static boolean rename(TestFile sourceFile) {
+    static boolean rename(TestFile sourceFile) {
         final newFile = new File(sourceFile.getParentFile(), "changed_${sourceFile.name}")
         newFile << sourceFile.text
         sourceFile.delete()
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalCompileIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalCompileIntegrationTest.groovy
index 8c8f9d21a204..4e098827c310 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalCompileIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AbstractLanguageIncrementalCompileIntegrationTest.groovy
@@ -17,8 +17,7 @@
 package org.gradle.nativebinaries.language.cpp
 
 import groovy.io.FileType
-import org.apache.commons.io.FilenameUtils
-import org.gradle.internal.hash.HashUtil
+import org.gradle.integtests.fixtures.CompilationOutputsFixture
 import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChainIntegrationSpec
 import org.gradle.nativebinaries.language.cpp.fixtures.app.IncrementalHelloWorldApp
 import org.gradle.test.fixtures.file.TestFile
@@ -33,6 +32,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
     TestFile otherHeaderFile
     List<TestFile> otherSourceFiles = []
     TestFile objectFileDir
+    CompilationOutputsFixture outputs
 
     abstract IncrementalHelloWorldApp getHelloWorldApp();
 
@@ -62,11 +62,12 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
             // Dummy header file
 """
         objectFileDir = file("build/objectFiles/mainExecutable")
+        outputs = new CompilationOutputsFixture(objectFileDir)
     }
 
     def "recompiles changed source file only"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         sourceFile << """
@@ -79,12 +80,12 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
     }
 
     def "recompiles all source files that include changed header file"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         sharedHeaderFile << """
@@ -97,7 +98,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled allSources
+        outputs.recompiledFiles allSources
     }
 
     def "recompiles only source file that includes changed header file"() {
@@ -106,7 +107,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
             #include "${otherHeaderFile.name}"
 """
         and:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         otherHeaderFile << """
@@ -119,7 +120,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
     }
 
     def "source is always recompiled if it includes header via macro"() {
@@ -130,7 +131,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
 """
 
         and:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         otherHeaderFile << """
@@ -143,9 +144,8 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
 
-        // TODO:DAZ Remove this behaviour
         when: "Header that is NOT included is changed"
         file("src/main/headers/notIncluded.h") << """
             // Dummy header file
@@ -157,7 +157,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
     }
 
     def "recompiles source file when transitively included header file is changed"() {
@@ -173,7 +173,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
 """
 
         and:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         transitiveHeaderFile << """
@@ -186,12 +186,12 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
     }
 
     def "recompiles source file when an included header file is renamed"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         and:
         final newFile = file("src/main/headers/changed.h")
@@ -208,7 +208,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
 
     def "does not recompile any sources when unused header file is changed"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         otherHeaderFile << """
@@ -219,13 +219,13 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
 
         then:
         skipped compileTask
-        noneRecompiled()
+        outputs.noneRecompiled()
     }
 
     @Unroll
     def "does not recompile when include path has #testCase"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         file("src/additional-headers/other.h") << """
     // extra header file that is not included in source
@@ -247,7 +247,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
 
         then:
         skipped compileTask
-        noneRecompiled()
+        outputs.noneRecompiled()
 
         where:
         testCase                       | headerDirs
@@ -258,7 +258,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
 
     def "recompiles when include path is changed so that replacement header file occurs before previous header"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         file("src/replacement-headers/${sharedHeaderFile.name}") << sharedHeaderFile.text
 
@@ -277,7 +277,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled allSources
+        outputs.recompiledFiles allSources
     }
 
     def "recompiles when replacement header file is added before previous header to existing include path"() {
@@ -289,7 +289,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
                 }
             }
 """
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         file("src/replacement-headers/${sharedHeaderFile.name}") << sharedHeaderFile.text
@@ -301,12 +301,12 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled allSources
+        outputs.recompiledFiles allSources
     }
 
     def "recompiles when replacement header file is added to source directory"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         sourceFile.parentFile.file(sharedHeaderFile.name) << sharedHeaderFile.text
@@ -318,7 +318,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled allSources
+        outputs.recompiledFiles allSources
     }
 
     def "recompiles all source files and removes stale outputs when compiler arg changes"() {
@@ -326,9 +326,9 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         def extraSource = file("src/main/${app.sourceType}/extra.${app.sourceExtension}")
         extraSource << sourceFile.text.replaceAll("main", "main2")
 
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
-        outputFile(extraSource).assertExists()
+        objectFileFor(extraSource).assertExists()
 
         when:
         sourceFile << """
@@ -352,13 +352,13 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled allSources
-        outputFile(extraSource).assertDoesNotExist()
+        outputs.recompiledFiles allSources
+        objectFileFor(extraSource).assertDoesNotExist()
     }
 
     def "recompiles all source files when generated object files are removed"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         objectFileDir.deleteDir()
@@ -369,12 +369,12 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled allSources
+        outputs.recompiledFiles allSources
     }
 
     def "removes output file when source file is renamed"() {
         given:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         final newFile = file("src/main/${app.sourceType}/changed.${app.sourceExtension}")
@@ -385,8 +385,8 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         run "mainExecutable"
 
         then:
-        recompiled newFile
-        outputFile(sourceFile).assertDoesNotExist()
+        outputs.recompiledFile newFile
+        objectFileFor(sourceFile).assertDoesNotExist()
     }
 
     def "removes output file when source file is removed"() {
@@ -394,10 +394,10 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         def extraSource = file("src/main/${app.sourceType}/extra.${app.sourceExtension}")
         extraSource << sourceFile.text.replaceAll("main", "main2")
 
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         and:
-        outputFile(extraSource).assertExists()
+        objectFileFor(extraSource).assertExists()
 
         when:
         extraSource.delete()
@@ -406,13 +406,13 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         run "mainExecutable"
 
         then:
-        outputFile(extraSource).assertDoesNotExist()
-        noneRecompiled()
+        objectFileFor(extraSource).assertDoesNotExist()
+        outputs.noneRecompiled()
     }
 
     def "removes output files when all source files are removed"() {
         given:
-        initialCompile()
+        run "mainExecutable"
 
         def executable = executable("build/binaries/mainExecutable/main")
         executable.assertExists()
@@ -445,12 +445,12 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
 
         then:
         executable.exec().out == "hello"
-        outputFile(newSource).assertExists()
+        objectFileFor(newSource).assertExists()
 
         and: "Previous object files are removed"
-        outputFile(sourceFile).assertDoesNotExist()
+        objectFileFor(sourceFile).assertDoesNotExist()
         otherSourceFiles.each {
-            outputFile(it).assertDoesNotExist()
+            objectFileFor(it).assertDoesNotExist()
         }
     }
 
@@ -464,7 +464,7 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         app.writeSources(file("src/other"))
 
         and:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         and:
         // Completely independent compile task (state should be independent)
@@ -481,49 +481,10 @@ abstract class AbstractLanguageIncrementalCompileIntegrationTest extends Abstrac
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
-    }
-
-
-    def initialCompile() {
-        run "mainExecutable"
-
-        // Set the last modified timestamp to zero for all object files
-        objectFileDir.eachFileRecurse(FileType.FILES) { it.lastModified = 0 }
-    }
-
-    def getRecompiledFiles() {
-        // Get all of the object files that do not have a zero last modified timestamp
-        def recompiled = []
-        objectFileDir.eachFileRecurse(FileType.FILES) {
-            if (it.lastModified() > 0) {
-                recompiled << FilenameUtils.removeExtension(it.name)
-            }
-        }
-        return recompiled as Set
+        outputs.recompiledFile sourceFile
     }
 
-    def getAllSources() {
+    List getAllSources() {
         return [sourceFile] + otherSourceFiles
     }
-
-    def noneRecompiled() {
-        recompiled([])
-    }
-
-    def recompiled(TestFile file) {
-        recompiled([file])
-    }
-
-    def recompiled(List<TestFile> files) {
-        def expectedNames = files.collect({ FilenameUtils.removeExtension(it.name) }) as Set
-        assert getRecompiledFiles() == expectedNames
-        return true
-    }
-
-    def outputFile(TestFile sourceFile) {
-        final baseName = FilenameUtils.removeExtension(sourceFile.name)
-        String compactMD5 = HashUtil.createCompactMD5(sourceFile.getAbsolutePath());
-        return objectFile("build/objectFiles/mainExecutable/main${sourceType}/$compactMD5/${baseName}")
-    }
 }
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AssemblyLanguageIncrementalBuildIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AssemblyLanguageIncrementalBuildIntegrationTest.groovy
index cf0c21e8d0d9..0271d4504f81 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AssemblyLanguageIncrementalBuildIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/AssemblyLanguageIncrementalBuildIntegrationTest.groovy
@@ -107,8 +107,8 @@ class AssemblyLanguageIncrementalBuildIntegrationTest extends AbstractInstalledT
     }
 
     def "cleans up stale object files when source file renamed"() {
-        def oldObjFile = objectFile("build/objectFiles/helloSharedLibrary/helloAsm/${hashFor(asmSourceFile)}/sum")
-        def newObjFile = objectFile("build/objectFiles/helloSharedLibrary/helloAsm/${hashFor(file('src/hello/asm/changed_sum.s'))}/changed_sum")
+        def oldObjFile = objectFileFor(asmSourceFile, "build/objectFiles/helloSharedLibrary/helloAsm")
+        def newObjFile = objectFileFor(file('src/hello/asm/changed_sum.s'), "build/objectFiles/helloSharedLibrary/helloAsm")
         assert oldObjFile.file
         assert !newObjFile.file
 
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryPlatformIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryPlatformIntegrationTest.groovy
index f3c8189faee1..78caa089ad8c 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryPlatformIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/BinaryPlatformIntegrationTest.groovy
@@ -79,16 +79,11 @@ class BinaryPlatformIntegrationTest extends AbstractInstalledToolChainIntegratio
                     }
                 }
             }
-            task buildExecutables {
-                dependsOn binaries.withType(ExecutableBinary).matching {
-                    it.buildable
-                }
-            }
             executables.main.targetPlatforms "x86"
 """
 
         and:
-        succeeds "buildExecutables"
+        succeeds "assemble"
 
         then:
         // Platform dimension is flattened since there is only one possible value
@@ -152,15 +147,10 @@ class BinaryPlatformIntegrationTest extends AbstractInstalledToolChainIntegratio
                     }
                 }
             }
-            task buildExecutables {
-                dependsOn binaries.withType(ExecutableBinary).matching {
-                    it.buildable
-                }
-            }
 """
 
         and:
-        succeeds "buildExecutables"
+        succeeds "assemble"
 
         then:
         executable("build/binaries/mainExecutable/x86/main").binaryInfo.arch.name == "x86"
@@ -213,15 +203,10 @@ class BinaryPlatformIntegrationTest extends AbstractInstalledToolChainIntegratio
             binaries.matching({ it.targetPlatform.operatingSystem.windows }).all {
                 cppCompiler.define "FRENCH"
             }
-            task buildExecutables {
-                dependsOn binaries.withType(ExecutableBinary).matching {
-                    it.buildable
-                }
-            }
         """
 
         and:
-        succeeds "buildExecutables"
+        succeeds "assemble"
 
         then:
         if (os.windows) {
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest.groovy
index dfd0eec290c5..d12bdb1f2c27 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CUnitIntegrationTest.groovy
@@ -60,7 +60,7 @@ class CUnitIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
             libraries {
                 hello {}
             }
-            binaries.withType(TestSuiteExecutableBinary) {
+            binaries.withType(NativeTestSuiteBinary) {
                 lib library: "cunit", linkage: "static"
             }
 """
@@ -156,7 +156,7 @@ class CUnitIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
 
         when:
         buildFile << """
-            binaries.withType(TestSuiteExecutableBinary) {
+            binaries.withType(NativeTestSuiteBinary) {
                 cCompiler.define "ONE_TEST"
             }
 """
@@ -228,7 +228,7 @@ class CUnitIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
                     }
                 }
             }
-            binaries.withType(LibraryBinary) {
+            binaries.withType(NativeLibraryBinary) {
                 source sources.variant
             }
 """
@@ -254,7 +254,7 @@ class CUnitIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
                     }
                 }
             }
-            binaries.withType(TestSuiteExecutableBinary) {
+            binaries.withType(NativeTestSuiteBinary) {
                 source sources.variantTest.cunit
             }
 """
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppBinariesIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppBinariesIntegrationTest.groovy
index ee5994343360..1a50dbc75388 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppBinariesIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/CppBinariesIntegrationTest.groovy
@@ -223,7 +223,7 @@ class CppBinariesIntegrationTest extends AbstractInstalledToolChainIntegrationSp
                 main {}
             }
 
-            binaries.withType(ExecutableBinary) { binary ->
+            binaries.withType(NativeExecutableBinary) { binary ->
                 def preLink = task("\${binary.name}PreLink") {
                     dependsOn binary.tasks.withType(CppCompile)
 
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/DuplicateBaseNamesIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/DuplicateBaseNamesIntegrationTest.groovy
index 00cdbd71ff07..bc7258382629 100644
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/DuplicateBaseNamesIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/DuplicateBaseNamesIntegrationTest.groovy
@@ -25,6 +25,7 @@ import org.gradle.nativebinaries.language.cpp.fixtures.app.DuplicateMixedSameBas
 import org.gradle.nativebinaries.language.cpp.fixtures.app.DuplicateObjectiveCBaseNamesTestApp
 import org.gradle.nativebinaries.language.cpp.fixtures.app.DuplicateObjectiveCppBaseNamesTestApp
 import org.gradle.nativebinaries.language.cpp.fixtures.app.DuplicateWindowsResourcesBaseNamesTestApp
+import org.gradle.nativebinaries.language.cpp.fixtures.app.SourceFile
 import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
 
@@ -70,6 +71,67 @@ class DuplicateBaseNamesIntegrationTest extends AbstractInstalledToolChainIntegr
         new DuplicateMixedSameBaseNamesTestApp(toolChain)    |    "fooFromC\nfooFromCpp\nfooFromAsm\n"
     }
 
+    /**
+     * TODO: need filter declaration to get this passed. Remove filter once
+     * story-language-source-sets-filter-source-files-by-file-extension
+     * is implemented
+     * */
+    def "can have sourcefiles with same base name in same directory"() {
+        setup:
+        def testApp = new DuplicateMixedSameBaseNamesTestApp(toolChain)
+
+
+        testApp.getSourceFiles().each {  SourceFile sourceFile ->
+            file("src/main/all/${sourceFile.name}") << sourceFile.content
+        }
+
+        testApp.headerFiles.each { SourceFile sourceFile ->
+            file("src/main/headers/${sourceFile.name}") << sourceFile.content
+        }
+
+        buildFile.text = ""
+        testApp.plugins.each { plugin ->
+            buildFile << "apply plugin: '$plugin'\n"
+        }
+
+        testApp.functionalSourceSets.each { name, filterPattern ->
+                buildFile << """
+                sources {
+                        main {
+                            $name {
+                                source {
+                                    include '$filterPattern'
+                                    srcDirs "src/main/all"
+                                }
+                            }
+                        }
+                }
+                """
+        }
+
+        buildFile << """
+
+        binaries.all{
+            linker.args "-v"
+        }
+
+        model {
+            platforms {
+                x86 {
+                    architecture "i386"
+                }
+            }
+        }
+        executables {
+            main {}
+        }
+
+        """
+        expect:
+        succeeds "mainExecutable"
+        executable("build/binaries/mainExecutable/main").exec().out == "fooFromC\nfooFromCpp\nfooFromAsm\n"
+    }
+
     //TODO Rene: inline with testcase above once we got coverage for objective-c and objective-cpp on windows
     @Requires(TestPrecondition.NOT_WINDOWS)
     def "can have objectiveC and objectiveCpp source files with same name in different directories"(){
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainCustomisationIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainCustomisationIntegrationTest.groovy
index 2e2bbe9fc78d..7a166ed45be4 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainCustomisationIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainCustomisationIntegrationTest.groovy
@@ -56,13 +56,22 @@ class GccToolChainCustomisationIntegrationTest extends AbstractInstalledToolChai
         helloWorldApp.library.writeSources(file("src/hello"))
     }
 
-    def "can add binary configuration to target a platform"() {
+    def "can configure platform specific args"() {
         when:
         buildFile << """
             model {
                 toolChains {
                     ${toolChain.id} {
-                        addPlatformConfiguration(new ArmArchitecture())
+                        target("arm"){
+                            cCompiler.withArguments { args ->
+                                args << "-m32"
+                                args << "-DFRENCH"
+                            }
+                            linker.withArguments { args ->
+                                args << "-m32"
+                            }
+                        }
+                        target("sparc")
                     }
                 }
                 platforms {
@@ -72,46 +81,15 @@ class GccToolChainCustomisationIntegrationTest extends AbstractInstalledToolChai
                     i386 {
                         architecture "i386"
                     }
-                }
-            }
-
-            class ArmArchitecture implements TargetPlatformConfiguration {
-                boolean supportsPlatform(Platform element) {
-                    return element.getArchitecture().name == "arm"
-                }
-
-                List<String> getCppCompilerArgs() {
-                    []
-                }
-
-                List<String> getCCompilerArgs() {
-                    ["-m32", "-DFRENCH"]
-                }
-
-                List<String> getObjectiveCCompilerArgs() {
-                    []
-                }
-
-                List<String> getObjectiveCppCompilerArgs() {
-                    []
-                }
-
-                List<String> getAssemblerArgs() {
-                    []
-                }
-
-                List<String> getLinkerArgs() {
-                    ["-m32"]
-                }
-
-                List<String> getStaticLibraryArchiverArgs() {
-                    []
+                    sparc {
+                        architecture "sparc"
+                    }
                 }
             }
 """
 
         and:
-        succeeds "armMainExecutable", "i386MainExecutable"
+        succeeds "armMainExecutable", "i386MainExecutable", "sparcMainExecutable"
 
         then:
         executable("build/binaries/mainExecutable/arm/main").binaryInfo.arch.name == "x86"
@@ -119,6 +97,8 @@ class GccToolChainCustomisationIntegrationTest extends AbstractInstalledToolChai
 
         executable("build/binaries/mainExecutable/i386/main").binaryInfo.arch.name == "x86"
         executable("build/binaries/mainExecutable/i386/main").exec().out == helloWorldApp.englishOutput
+
+        executable("build/binaries/mainExecutable/sparc/main").exec().out == helloWorldApp.englishOutput
     }
 
     def "can add action to tool chain that modifies tool arguments prior to execution"() {
@@ -180,6 +160,49 @@ class GccToolChainCustomisationIntegrationTest extends AbstractInstalledToolChai
         executable("build/binaries/mainExecutable/main").exec().out == helloWorldApp.frenchOutput
     }
 
+    @Requires(TestPrecondition.NOT_WINDOWS)
+    def "can configure platform specific executables"() {
+        def binDir = testDirectory.createDir("bin")
+        wrapperTool(binDir, "c-compiler", toolChain.CCompiler, "-DFRENCH")
+        wrapperTool(binDir, "static-lib", toolChain.staticLibArchiver)
+        wrapperTool(binDir, "linker", toolChain.linker)
+
+        when:
+        buildFile << """
+            model {
+                toolChains {
+                    ${toolChain.id} {
+                        target("arm"){
+                            cCompiler.executable = '${binDir.absolutePath}/c-compiler'
+                            staticLibArchiver.executable = '${binDir.absolutePath}/static-lib'
+                            linker.executable = '${binDir.absolutePath}/linker'
+                        }
+
+                        target("i386"){
+                            if(cCompiler.executable.equals('gcc')){
+                                cCompiler.executable = 'g++'
+                            }
+                        }
+                    }
+                }
+
+                platforms {
+                    arm {
+                        architecture "arm"
+                    }
+                    i386 {
+                        architecture "i386"
+                    }
+                }
+            }
+"""
+        succeeds "armMainExecutable", "i386MainExecutable"
+
+        then:
+        executable("build/binaries/mainExecutable/arm/main").exec().out == helloWorldApp.frenchOutput
+        executable("build/binaries/mainExecutable/i386/main").exec().out == helloWorldApp.englishOutput
+    }
+
     def wrapperTool(TestFile binDir, String wrapperName, String executable, String... additionalArgs) {
         def script = binDir.file(OperatingSystem.current().getExecutableName(wrapperName))
         if (OperatingSystem.current().windows) {
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainDiscoveryIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainDiscoveryIntegrationTest.groovy
index 7354288689df..757f13933956 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainDiscoveryIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/GccToolChainDiscoveryIntegrationTest.groovy
@@ -76,7 +76,9 @@ class GccToolChainDiscoveryIntegrationTest extends AbstractInstalledToolChainInt
             model {
                 toolChains {
                     ${toolChain.id} {
-                        cCompiler.executable = 'does-not-exist'
+                        all {
+                            executable = 'does-not-exist'
+                        }
                     }
                 }
             }
@@ -86,7 +88,28 @@ class GccToolChainDiscoveryIntegrationTest extends AbstractInstalledToolChainInt
         succeeds "help"
     }
 
-    def "fails when required language tool is not available"() {
+    def "tool chain is not available when no tools are available"() {
+        when:
+        buildFile << """
+            model {
+                toolChains {
+                    ${toolChain.id} {
+                        all {
+                            executable = 'does-not-exist'
+                        }
+                    }
+                }
+            }
+"""
+        fails "mainExecutable"
+
+        then:
+        failure.assertHasDescription("Execution failed for task ':compileMainExecutableMainC'.")
+        failure.assertThatCause(Matchers.startsWith("No tool chain is available to build for platform 'current'"))
+        failure.assertThatCause(Matchers.containsString("- ${toolChain.instanceDisplayName}: Could not find C compiler 'does-not-exist'"))
+    }
+
+    def "fails when required language tool is not available but other language tools are available"() {
         when:
         buildFile << """
             model {
@@ -104,7 +127,7 @@ class GccToolChainDiscoveryIntegrationTest extends AbstractInstalledToolChainInt
         failure.assertThatCause(Matchers.startsWith("Could not find C compiler 'does-not-exist'"))
     }
 
-    def "fails when required linker tool is not available"() {
+    def "fails when required linker tool is not available but language tool is available"() {
         when:
         buildFile << """
             model {
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryApiDependenciesIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryApiDependenciesIntegrationTest.groovy
index e06055162c54..25c48d81c321 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryApiDependenciesIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryApiDependenciesIntegrationTest.groovy
@@ -220,7 +220,7 @@ class LibraryApiDependenciesIntegrationTest extends AbstractInstalledToolChainIn
         and:
         buildFile << """
             executables {
-                main {}
+                main
             }
             libraries {
                 hello {}
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryDependenciesIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryDependenciesIntegrationTest.groovy
index 740b7a916319..e3e7d6d98438 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryDependenciesIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/LibraryDependenciesIntegrationTest.groovy
@@ -75,9 +75,9 @@ class LibraryDependenciesIntegrationTest extends AbstractInstalledToolChainInteg
 
         where:
         label                                  | dependencyNotation                      | description                                                | cause
-        "does not exist"                       | "library: 'unknown'"                    | "Could not locate library 'unknown'."                      | "Library with name 'unknown' not found."
+        "does not exist"                       | "library: 'unknown'"                    | "Could not locate library 'unknown'."                      | "NativeLibrary with name 'unknown' not found."
         "project that does not exist"          | "project: ':unknown', library: 'hello'" | "Could not locate library 'hello' for project ':unknown'." | "Project with path ':unknown' could not be found in project ':exe'."
-        "does not exist in referenced project" | "project: ':other', library: 'unknown'" | "Could not locate library 'unknown' for project ':other'." | "Library with name 'unknown' not found."
+        "does not exist in referenced project" | "project: ':other', library: 'unknown'" | "Could not locate library 'unknown' for project ':other'." | "NativeLibrary with name 'unknown' not found."
     }
 
     @Unroll
@@ -342,7 +342,6 @@ project.afterEvaluate {
         sharedLibrary("build/binaries/greetingsSharedLibrary/greetings").assertExists()
         staticLibrary("build/binaries/greetingsStaticLibrary/greetings").assertExists()
 
-        // TODO:DAZ Investigate this output and parse to ensure that greetings is dynamically linked into mainExe but not helloShared
         and:
         println executable("build/binaries/mainExecutable/main").binaryInfo.listLinkedLibraries()
         println sharedLibrary("build/binaries/helloSharedLibrary/hello").binaryInfo.listLinkedLibraries()
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/MultipleToolChainIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/MultipleToolChainIntegrationTest.groovy
index b0abeb952298..de46b524171e 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/MultipleToolChainIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/MultipleToolChainIntegrationTest.groovy
@@ -15,15 +15,15 @@
  */
 
 package org.gradle.nativebinaries.language.cpp
+
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.nativebinaries.language.cpp.fixtures.AvailableToolChains
 import org.gradle.nativebinaries.language.cpp.fixtures.RequiresInstalledToolChain
+import org.gradle.nativebinaries.language.cpp.fixtures.ToolChainRequirement
 import org.gradle.nativebinaries.language.cpp.fixtures.app.CppCompilerDetectingTestApp
 import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
-import org.gradle.util.TextUtil
-import spock.lang.Ignore
 
 @RequiresInstalledToolChain
 class MultipleToolChainIntegrationTest extends AbstractIntegrationSpec {
@@ -36,74 +36,49 @@ class MultipleToolChainIntegrationTest extends AbstractIntegrationSpec {
             executables {
                 main {}
             }
-            libraries {
-                hello {}
-            }
-            sources.main.cpp.lib libraries.hello
         """
 
-        helloWorld.executable.writeSources(file("src/main"))
-        helloWorld.library.writeSources(file("src/hello"))
+        helloWorld.writeSources(file("src/main"))
     }
 
-    // TODO:DAZ Test building for 2 platforms that require different tool chains
-    @Ignore
     @Requires(TestPrecondition.CAN_INSTALL_EXECUTABLE)
-    def "can build with all multiple tool chains"() {
-        List<AvailableToolChains.InstalledToolChain> installedToolChains = []
-        for (AvailableToolChains.ToolChainCandidate toolChainCandidate : AvailableToolChains.getToolChains()) {
-            if (toolChainCandidate.isAvailable()) {
-                installedToolChains << toolChainCandidate
-            }
-        }
-
-        def toolChainConfig = installedToolChains.collect({it.buildScriptConfig}).join("\n")
+    @RequiresInstalledToolChain(ToolChainRequirement.Gcc)
+    def "can build with multiple tool chains"() {
+        AvailableToolChains.InstalledToolChain x86ToolChain = OperatingSystem.current().isWindows() ?
+                AvailableToolChains.getToolChain(ToolChainRequirement.VisualCpp) :
+                AvailableToolChains.getToolChain(ToolChainRequirement.Clang)
+        AvailableToolChains.InstalledToolChain sparcToolChain = AvailableToolChains.getToolChain(ToolChainRequirement.Gcc)
 
         when:
         buildFile << """
             model {
-                toolChains {
-                    ${toolChainConfig}
-                    unavailable(Gcc) {
-                        linker.executable = "does_not_exist"
+                platforms {
+                    i386 {
+                        architecture "i386"
+                    }
+                    sparc {
+                        architecture "sparc"
                     }
                 }
-            }
-
-"""
-
-        then:
-        def tasks = installedToolChains.collect { "install${it.id.capitalize()}MainExecutable" }
-        succeeds tasks as String[]
-
-        and:
-        installedToolChains.each { toolChain ->
-            checkInstall("build/install/mainExecutable/${toolChain.id}/main", toolChain)
-        }
-    }
-
-    def "exception when building with unavailable tool chain"() {
-        when:
-        buildFile << """
-            model {
                 toolChains {
-                    bad(Gcc) {
-                        cCompiler.executable = "does_not_exist"
-                        cppCompiler.executable = "does_not_exist"
+                    ${x86ToolChain.buildScriptConfig}
+                    ${sparcToolChain.buildScriptConfig}
+                    ${sparcToolChain.id} {
+                        target("sparc")
                     }
                 }
             }
-"""
 
-        helloWorld.writeSources(file("src/main"))
+"""
 
         then:
-        fails "mainExecutable"
+        succeeds 'i386MainExecutable', 'sparcMainExecutable'
 
         and:
-        failure.assertHasDescription("Execution failed for task ':compileMainExecutableMainCpp'.")
-        failure.assertHasCause(TextUtil.toPlatformLineSeparators("""No tool chain is available to build for platform 'current':
-  - Tool chain 'bad' (GNU GCC): """))
+        def i386Exe = x86ToolChain.executable(file("build/binaries/mainExecutable/i386/main"))
+        assert i386Exe.exec().out == helloWorld.expectedOutput(x86ToolChain)
+        def sparcExe = sparcToolChain.executable(file("build/binaries/mainExecutable/sparc/main"))
+        assert sparcExe.exec().out == helloWorld.expectedOutput(sparcToolChain)
     }
 
     def checkInstall(String path, AvailableToolChains.InstalledToolChain toolChain) {
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeBinariesPluginIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeBinariesIntegrationTest.groovy
similarity index 65%
rename from subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeBinariesPluginIntegrationTest.groovy
rename to subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeBinariesIntegrationTest.groovy
index 76da4f6cf0cb..4bf702c3ea8a 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeBinariesPluginIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeBinariesIntegrationTest.groovy
@@ -16,9 +16,12 @@
 package org.gradle.nativebinaries.language.cpp
 
 import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChainIntegrationSpec
+import org.gradle.nativebinaries.language.cpp.fixtures.app.CHelloWorldApp
 import org.gradle.nativebinaries.language.cpp.fixtures.app.CppCallingCHelloWorldApp
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
 
-class NativeBinariesPluginIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
+class NativeBinariesIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
     def helloWorldApp = new CppCallingCHelloWorldApp()
 
     def "setup"() {
@@ -41,6 +44,110 @@ class NativeBinariesPluginIntegrationTest extends AbstractInstalledToolChainInte
         executable("build/binaries/mainExecutable/main").assertDoesNotExist()
     }
 
+    def "assemble task constructs all buildable binaries"() {
+        given:
+        new CHelloWorldApp().writeSources(file("src/main"))
+
+        and:
+        buildFile << """
+    apply plugin: 'c'
+
+    model {
+        buildTypes {
+            debug
+            optimised
+            release
+        }
+    }
+    executables {
+        main
+    }
+    binaries.all { binary ->
+        if (binary.buildType == buildTypes.optimised) {
+            binary.buildable = false
+        }
+    }
+"""
+        when:
+        succeeds "assemble"
+
+        then:
+        executedAndNotSkipped ":debugMainExecutable", ":releaseMainExecutable"
+        notExecuted ":optimisedMainExecutable"
+
+        and:
+        executable("build/binaries/mainExecutable/debug/main").assertExists()
+        executable("build/binaries/mainExecutable/optimised/main").assertDoesNotExist()
+        executable("build/binaries/mainExecutable/release/main").assertExists()
+    }
+
+    // TODO:DAZ Once use of the extension has been rolled into the rest of the integration tests, this test won't be necessary
+    @Requires(TestPrecondition.CAN_INSTALL_EXECUTABLE)
+    def "can define native binaries using nativeCode extension"() {
+        given:
+        helloWorldApp.library.writeSources(file("src/hello"))
+        helloWorldApp.executable.writeSources(file("src/main"))
+
+        and:
+        buildFile << """
+    apply plugin: 'cpp'
+    apply plugin: 'c'
+
+    nativeCode {
+        executables {
+            main
+        }
+        libraries {
+            hello
+        }
+        sources.main.cpp.lib libraries.hello
+    }
+"""
+        when:
+        succeeds "installMainExecutable"
+
+        then:
+        installation("build/install/mainExecutable").exec().out == helloWorldApp.englishOutput
+    }
+
+    // Test for temporary backward-compatibility layer for native binaries. Plan is to deprecate in 2.1 and remove in 2.2.
+    @Requires(TestPrecondition.CAN_INSTALL_EXECUTABLE)
+    def "can define native binaries using 1.12 compatible api"() {
+        given:
+        helloWorldApp.library.writeSources(file("src/hello"))
+        helloWorldApp.executable.writeSources(file("src/main"))
+
+        and:
+        buildFile << """
+    apply plugin: 'cpp'
+    apply plugin: 'c'
+
+    executables {
+        main
+    }
+    libraries {
+        hello
+    }
+    sources.main.cpp.lib libraries.hello
+    task buildAllExecutables {
+        dependsOn binaries.withType(ExecutableBinary).matching {
+            it.buildable
+        }
+    }
+"""
+        when:
+        succeeds "buildAllExecutables"
+
+        then:
+        executable("build/binaries/mainExecutable/main").assertExists()
+
+        when:
+        succeeds "installMainExecutable"
+
+        then:
+        installation("build/install/mainExecutable").exec().out == helloWorldApp.englishOutput
+    }
+
     def "assemble executable from component with multiple language source sets"() {
         given:
         useMixedSources()
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeSamplesIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeSamplesIntegrationTest.groovy
old mode 100755
new mode 100644
index a716e3e24deb..0f805188f365
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeSamplesIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/NativeSamplesIntegrationTest.groovy
@@ -22,31 +22,40 @@ import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChai
 import org.gradle.nativebinaries.language.cpp.fixtures.AvailableToolChains
 import org.gradle.nativebinaries.language.cpp.fixtures.RequiresInstalledToolChain
 import org.gradle.nativebinaries.test.cunit.CUnitTestResults
+import org.gradle.test.fixtures.file.TestDirectoryProvider
+import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
 import org.junit.Rule
 
+import static org.gradle.nativebinaries.language.cpp.fixtures.ToolChainRequirement.GccCompatible
 import static org.gradle.nativebinaries.language.cpp.fixtures.ToolChainRequirement.VisualCpp
 
 @Requires(TestPrecondition.CAN_INSTALL_EXECUTABLE)
 class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
-    @Rule public final Sample c = new Sample(temporaryFolder, 'native-binaries/c')
-    @Rule public final Sample assembler = new Sample(temporaryFolder, 'native-binaries/assembler')
-    @Rule public final Sample cpp = new Sample(temporaryFolder, 'native-binaries/cpp')
-    @Rule public final Sample cppLib = new Sample(temporaryFolder, 'native-binaries/cpp-lib')
-    @Rule public final Sample cppExe = new Sample(temporaryFolder, 'native-binaries/cpp-exe')
-    @Rule public final Sample objectiveC = new Sample(temporaryFolder, 'native-binaries/objective-c')
-    @Rule public final Sample objectiveCpp = new Sample(temporaryFolder, 'native-binaries/objective-cpp')
-    @Rule public final Sample customLayout = new Sample(temporaryFolder, 'native-binaries/custom-layout')
-    @Rule public final Sample multiProject = new Sample(temporaryFolder, 'native-binaries/multi-project')
-    @Rule public final Sample flavors = new Sample(temporaryFolder, 'native-binaries/flavors')
-    @Rule public final Sample variants = new Sample(temporaryFolder, 'native-binaries/variants')
-    @Rule public final Sample toolChains = new Sample(temporaryFolder, 'native-binaries/tool-chains')
-    @Rule public final Sample windowsResources = new Sample(temporaryFolder, 'native-binaries/windows-resources')
-    @Rule public final Sample visualStudio = new Sample(temporaryFolder, 'native-binaries/visual-studio')
-    @Rule public final Sample prebuilt = new Sample(temporaryFolder, 'native-binaries/prebuilt')
-    @Rule public final Sample idl = new Sample(temporaryFolder, 'native-binaries/idl')
-    @Rule public final Sample cunit = new Sample(temporaryFolder, 'native-binaries/cunit')
+    @Rule final TestNameTestDirectoryProvider testDirProvider = new TestNameTestDirectoryProvider()
+    @Rule public final Sample c = sample(testDirProvider, 'c')
+    @Rule public final Sample assembler = sample(testDirProvider, 'assembler')
+    @Rule public final Sample cpp = sample(testDirProvider, 'cpp')
+    @Rule public final Sample cppLib = sample(testDirProvider, 'cpp-lib')
+    @Rule public final Sample cppExe = sample(testDirProvider, 'cpp-exe')
+    @Rule public final Sample objectiveC = sample(testDirProvider, 'objective-c')
+    @Rule public final Sample objectiveCpp = sample(testDirProvider, 'objective-cpp')
+    @Rule public final Sample customLayout = sample(testDirProvider, 'custom-layout')
+    @Rule public final Sample multiProject = sample(testDirProvider, 'multi-project')
+    @Rule public final Sample flavors = sample(testDirProvider, 'flavors')
+    @Rule public final Sample variants = sample(testDirProvider, 'variants')
+    @Rule public final Sample toolChains = sample(testDirProvider, 'tool-chains')
+    @Rule public final Sample windowsResources = sample(testDirProvider, 'windows-resources')
+    @Rule public final Sample visualStudio = sample(testDirProvider, 'visual-studio')
+    @Rule public final Sample prebuilt = sample(testDirProvider, 'prebuilt')
+    @Rule public final Sample idl = sample(testDirProvider, 'idl')
+    @Rule public final Sample cunit = sample(testDirProvider, 'cunit')
+    @Rule public final Sample targetPlatforms = sample(testDirProvider, 'target-platforms')
+
+    private static Sample sample(TestDirectoryProvider testDirectoryProvider, String name) {
+        return new Sample(testDirectoryProvider, "native-binaries/${name}", name)
+    }
 
     def "assembler"() {
         given:
@@ -60,7 +69,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         executedAndNotSkipped ":compileMainExecutableMainC", ":linkMainExecutable", ":mainExecutable"
 
         and:
-        installation("native-binaries/assembler/build/install/mainExecutable").exec().out == "5 + 7 = 12\n"
+        installation(assembler.dir.file("build/install/mainExecutable")).exec().out == "5 + 7 = 12\n"
     }
 
     def "c"() {
@@ -75,7 +84,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
                               ":compileMainExecutableMainC", ":linkMainExecutable", ":mainExecutable"
 
         and:
-        installation("native-binaries/c/build/install/mainExecutable").exec().out == "Hello world!"
+        installation(c.dir.file("build/install/mainExecutable")).exec().out == "Hello world!"
     }
 
     def "cpp"() {
@@ -90,7 +99,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
                               ":compileMainExecutableMainCpp", ":linkMainExecutable", ":mainExecutable"
 
         and:
-        installation("native-binaries/cpp/build/install/mainExecutable").exec().out == "Hello world!\n"
+        installation(cpp.dir.file("build/install/mainExecutable")).exec().out == "Hello world!\n"
     }
 
     @Requires(TestPrecondition.NOT_WINDOWS)
@@ -105,7 +114,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         executedAndNotSkipped ":compileMainExecutableMainObjc", ":linkMainExecutable", ":mainExecutable"
 
         and:
-        executable("native-binaries/objective-c/build/binaries/mainExecutable/main").exec().out == "Hello world!\n"
+        executable(objectiveC.dir.file("build/binaries/mainExecutable/main")).exec().out == "Hello world!\n"
     }
 
     @Requires(TestPrecondition.NOT_WINDOWS)
@@ -120,7 +129,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         executedAndNotSkipped ":compileMainExecutableMainObjcpp", ":linkMainExecutable", ":mainExecutable"
 
         and:
-        executable("native-binaries/objective-cpp/build/binaries/mainExecutable/main").exec().out == "Hello world!\n"
+        executable(objectiveCpp.dir.file("build/binaries/mainExecutable/main")).exec().out == "Hello world!\n"
     }
 
     def "exe"() {
@@ -138,8 +147,8 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         executedAndNotSkipped ":compileMainExecutableMainCpp", ":linkMainExecutable", ":stripMainExecutable", ":mainExecutable"
 
         and:
-        executable("native-binaries/cpp-exe/build/binaries/mainExecutable/main").exec().out == "Hello, World!\n"
-        installation("native-binaries/cpp-exe/build/install/mainExecutable").exec().out == "Hello, World!\n"
+        executable(cppExe.dir.file("build/binaries/mainExecutable/main")).exec().out == "Hello, World!\n"
+        installation(cppExe.dir.file("build/install/mainExecutable")).exec().out == "Hello, World!\n"
 
         cleanup:
         toolChain.resetEnvironment()
@@ -156,7 +165,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         executedAndNotSkipped ":compileMainSharedLibraryMainCpp", ":linkMainSharedLibrary", ":mainSharedLibrary"
 
         and:
-        sharedLibrary("native-binaries/cpp-lib/build/binaries/mainSharedLibrary/main").assertExists()
+        sharedLibrary(cppLib.dir.file("build/binaries/mainSharedLibrary/main")).assertExists()
 
         when:
         sample cppLib
@@ -166,7 +175,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         executedAndNotSkipped ":compileMainStaticLibraryMainCpp", ":createMainStaticLibrary", ":mainStaticLibrary"
 
         and:
-        staticLibrary("native-binaries/cpp-lib/build/binaries/mainStaticLibrary/main").assertExists()
+        staticLibrary(cppLib.dir.file("build/binaries/mainStaticLibrary/main")).assertExists()
     }
 
 
@@ -184,14 +193,14 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
                               ":compileMainExecutableMainCpp", ":linkMainExecutable", ":mainExecutable"
 
         and:
-        installation("native-binaries/windows-resources/build/install/mainExecutable").exec().out == "Hello world!\n"
+        installation(windowsResources.dir.file("build/install/mainExecutable")).exec().out == "Hello world!\n"
 
         when:
         executer.usingBuildScript(windowsResources.dir.file('build-resource-only-dll.gradle'))
         run "helloResSharedLibrary"
 
         then:
-        file("native-binaries/windows-resources/build/binaries/helloResSharedLibrary/helloRes.dll").assertExists()
+        file(windowsResources.dir.file("build/binaries/helloResSharedLibrary/helloRes.dll")).assertExists()
     }
 
     def "custom layout"() {
@@ -206,7 +215,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
                               ":compileMainExecutableMainCpp", ":linkMainExecutable", ":mainExecutable"
 
         and:
-        installation("native-binaries/custom-layout/build/install/mainExecutable").exec().out == "Hello world!"
+        installation(customLayout.dir.file("build/install/mainExecutable")).exec().out == "Hello world!"
     }
 
     def flavors() {
@@ -219,11 +228,11 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         executedAndNotSkipped ":compileEnglishMainExecutableExeCpp", ":linkEnglishMainExecutable", ":englishMainExecutable"
 
         and:
-        executable("native-binaries/flavors/build/binaries/mainExecutable/english/main").assertExists()
-        sharedLibrary("native-binaries/flavors/build/binaries/helloSharedLibrary/english/hello").assertExists()
+        executable(flavors.dir.file("build/binaries/mainExecutable/english/main")).assertExists()
+        sharedLibrary(flavors.dir.file("build/binaries/helloSharedLibrary/english/hello")).assertExists()
 
         and:
-        installation("native-binaries/flavors/build/install/mainExecutable/english").exec().out == "Hello world!\n"
+        installation(flavors.dir.file("build/install/mainExecutable/english")).exec().out == "Hello world!\n"
 
         when:
         sample flavors
@@ -234,25 +243,25 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         executedAndNotSkipped ":compileFrenchMainExecutableExeCpp", ":linkFrenchMainExecutable", ":frenchMainExecutable"
 
         and:
-        executable("native-binaries/flavors/build/binaries/mainExecutable/french/main").assertExists()
-        sharedLibrary("native-binaries/flavors/build/binaries/helloSharedLibrary/french/hello").assertExists()
+        executable(flavors.dir.file("build/binaries/mainExecutable/french/main")).assertExists()
+        sharedLibrary(flavors.dir.file("build/binaries/helloSharedLibrary/french/hello")).assertExists()
 
         and:
-        installation("native-binaries/flavors/build/install/mainExecutable/french").exec().out == "Bonjour monde!\n"
+        installation(flavors.dir.file("build/install/mainExecutable/french")).exec().out == "Bonjour monde!\n"
     }
 
     def variants() {
         when:
         sample variants
-        run "buildExecutables"
+        run "assemble"
 
         then:
-        final debugX86 = executable("native-binaries/variants/build/binaries/mainExecutable/x86Debug/main")
-        final releaseX86 = executable("native-binaries/variants/build/binaries/mainExecutable/x86Release/main")
-        final debugX64 = executable("native-binaries/variants/build/binaries/mainExecutable/x64Debug/main")
-        final releaseX64 = executable("native-binaries/variants/build/binaries/mainExecutable/x64Release/main")
-        final debugIA64 = executable("native-binaries/variants/build/binaries/mainExecutable/itaniumDebug/main")
-        final releaseIA64 = executable("native-binaries/variants/build/binaries/mainExecutable/itaniumRelease/main")
+        final debugX86 = executable(variants.dir.file("build/binaries/mainExecutable/x86Debug/main"))
+        final releaseX86 = executable(variants.dir.file("build/binaries/mainExecutable/x86Release/main"))
+        final debugX64 = executable(variants.dir.file("build/binaries/mainExecutable/x64Debug/main"))
+        final releaseX64 = executable(variants.dir.file("build/binaries/mainExecutable/x64Release/main"))
+        final debugIA64 = executable(variants.dir.file("build/binaries/mainExecutable/itaniumDebug/main"))
+        final releaseIA64 = executable(variants.dir.file("build/binaries/mainExecutable/itaniumRelease/main"))
 
         debugX86.binaryInfo.arch.name == "x86"
         debugX86.assertDebugFileExists()
@@ -276,6 +285,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         releaseIA64.assertDoesNotExist()
     }
 
+
     def "tool chains"() {
         given:
         sample toolChains
@@ -284,7 +294,7 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         run "installMainExecutable"
 
         then:
-        executable("native-binaries/tool-chains/build/binaries/mainExecutable/main").exec().out == "Hello from ${toolChain.typeDisplayName}!\n"
+        executable(toolChains.dir.file("build/binaries/mainExecutable/main")).exec().out == "Hello from ${toolChain.typeDisplayName}!\n"
     }
 
     def multiProject() {
@@ -298,9 +308,24 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
         ":exe:mainExecutable" in executedTasks
 
         and:
-        sharedLibrary("native-binaries/multi-project/lib/build/binaries/mainSharedLibrary/main").assertExists()
-        executable("native-binaries/multi-project/exe/build/binaries/mainExecutable/main").assertExists()
-        installation("native-binaries/multi-project/exe/build/install/mainExecutable").exec().out == "Hello, World!\n"
+        sharedLibrary(multiProject.dir.file("lib/build/binaries/mainSharedLibrary/main")).assertExists()
+        executable(multiProject.dir.file("exe/build/binaries/mainExecutable/main")).assertExists()
+        installation(multiProject.dir.file("exe/build/install/mainExecutable")).exec().out == "Hello, World!\n"
+    }
+
+    @RequiresInstalledToolChain(GccCompatible)
+    def "target platforms"() {
+        given:
+        sample targetPlatforms
+
+        when:
+        run "installArmMainExecutable", "installSparcMainExecutable"
+
+        then:
+        executable(targetPlatforms.dir.file("build/binaries/mainExecutable/arm/main")).exec().out == "Hello from ${toolChain.typeDisplayName}!\n"
+        executable(targetPlatforms.dir.file("build/binaries/mainExecutable/arm/main")).binaryInfo.arch.isI386()
+
+        executable(targetPlatforms.dir.file("build/binaries/mainExecutable/sparc/main")).exec().out == "Hello from ${toolChain.typeDisplayName}!\n"
     }
 
     def "visual studio"() {
@@ -323,13 +348,13 @@ class NativeSamplesIntegrationTest extends AbstractInstalledToolChainIntegration
     def prebuilt() {
         given:
         inDirectory(prebuilt.dir.file("3rd-party-lib/util"))
-        run "buildLibraries"
+        run "assemble"
 
         and:
         sample prebuilt
 
         when:
-        succeeds "buildExecutables"
+        succeeds "assemble"
 
         then:
 
@@ -355,7 +380,7 @@ Util build type: RELEASE
                               ":linkMainExecutable", ":mainExecutable"
 
         and:
-        installation("native-binaries/idl/build/install/mainExecutable").exec().out == "Hello from generated source!!\n"
+        installation(idl.dir.file("build/install/mainExecutable")).exec().out == "Hello from generated source!!\n"
     }
 
     def "cunit"() {
@@ -376,7 +401,7 @@ Util build type: RELEASE
                               ":installPassingOperatorsTestCUnitExe", ":runPassingOperatorsTestCUnitExe"
 
         and:
-        def passingResults = new CUnitTestResults(file("native-binaries/cunit/build/test-results/operatorsTestCUnitExe/passing/CUnitAutomated-Results.xml"))
+        def passingResults = new CUnitTestResults(cunit.dir.file("build/test-results/operatorsTestCUnitExe/passing/CUnitAutomated-Results.xml"))
         passingResults.suiteNames == ['operator tests']
         passingResults.suites['operator tests'].passingTests == ['test_plus', 'test_minus']
         passingResults.suites['operator tests'].failingTests == []
@@ -394,7 +419,7 @@ Util build type: RELEASE
                               ":installFailingOperatorsTestCUnitExe", ":runFailingOperatorsTestCUnitExe"
 
         and:
-        def failingResults = new CUnitTestResults(file("native-binaries/cunit/build/test-results/operatorsTestCUnitExe/failing/CUnitAutomated-Results.xml"))
+        def failingResults = new CUnitTestResults(cunit.dir.file("build/test-results/operatorsTestCUnitExe/failing/CUnitAutomated-Results.xml"))
         failingResults.suiteNames == ['operator tests']
         failingResults.suites['operator tests'].passingTests == ['test_minus']
         failingResults.suites['operator tests'].failingTests == ['test_plus']
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/PrebuiltLibrariesIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/PrebuiltLibrariesIntegrationTest.groovy
index 11a3075efe00..85f754989faf 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/PrebuiltLibrariesIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/PrebuiltLibrariesIntegrationTest.groovy
@@ -45,17 +45,12 @@ class PrebuiltLibrariesIntegrationTest extends AbstractInstalledToolChainIntegra
                     }
                 }
             }
-            task buildAll {
-                dependsOn binaries.matching {
-                    it.buildable
-                }
-            }
 """
     }
 
     private void preBuildLibrary() {
         executer.inDirectory(file("libs"))
-        run "buildAll"
+        run "assemble"
     }
 
     def "can link to a prebuilt header-only library with api linkage"() {
@@ -299,7 +294,7 @@ class PrebuiltLibrariesIntegrationTest extends AbstractInstalledToolChainIntegra
 
         then:
         failure.assertHasDescription("Could not locate library 'other'.")
-        failure.assertHasCause("Library with name 'other' not found.")
+        failure.assertHasCause("NativeLibrary with name 'other' not found.")
         failure.assertHasCause("Prebuilt library with name 'other' not found in repositories '[libs, libs2]'.")
     }
 
@@ -343,7 +338,7 @@ class PrebuiltLibrariesIntegrationTest extends AbstractInstalledToolChainIntegra
 
         then:
         failure.assertHasDescription("Could not locate library 'hello' for project ':projectB'.")
-        failure.assertHasCause("Library with name 'hello' not found.")
+        failure.assertHasCause("NativeLibrary with name 'hello' not found.")
         failure.assertHasCause("Prebuilt library with name 'hello' not found in repositories '[libs, libs2]'.")
     }
 }
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SourceSetCompileDependenciesIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SourceSetCompileDependenciesIntegrationTest.groovy
new file mode 100755
index 000000000000..1d85267de28b
--- /dev/null
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SourceSetCompileDependenciesIntegrationTest.groovy
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.language.cpp
+
+import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChainIntegrationSpec
+
+class SourceSetCompileDependenciesIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
+    def "setup"() {
+        settingsFile << "rootProject.name = 'test'"
+
+        file("src/main/headers/funcs.h") << """
+            int func1();
+            int func2();
+"""
+        file("src/main/cpp/main.cpp") << """
+            #include <iostream>
+            #include "funcs.h"
+            int main () {
+                std::cout << func1() << func2() << std::endl;
+                return 0;
+            }
+"""
+        file("src/main/cpp/func1.cpp") << """
+            #include "lib.h"
+
+            int func1() {
+                return LIB_ID;
+            }
+"""
+        file("src/other/cpp/func2.cpp") << """
+            #include "lib.h"
+
+            int func2() {
+                return LIB_ID;
+            }
+"""
+        file("src/lib1/headers/lib.h") << """
+            #define LIB_ID 1
+"""
+        file("src/lib2/headers/lib.h") << """
+            #define LIB_ID 2
+"""
+
+        and:
+        buildFile << """
+            apply plugin: "cpp"
+            libraries {
+                lib1
+                lib2
+            }
+            sources {
+                main {
+                    cpp(CppSourceSet)
+                }
+                other {
+                    cpp(CppSourceSet)
+                }
+            }
+            executables {
+                main {
+                    source sources.main
+                }
+            }
+"""
+    }
+
+    def "dependencies of 2 language source sets are not shared when compiling"() {
+        given:
+        buildFile << """
+            executables {
+                main {
+                    source sources.other
+                }
+            }
+            sources.main.cpp.lib library: 'lib1', linkage: 'api'
+            sources.other.cpp.lib library: 'lib2', linkage: 'api'
+"""
+
+        when:
+        succeeds "mainExecutable"
+
+        then:
+        executable("build/binaries/mainExecutable/main").exec().out == "12\n"
+    }
+
+    def "dependencies of language source set added to binary are not shared when compiling"() {
+        given:
+        buildFile << """
+            executables {
+                main {
+                    binaries.all {
+                        source sources.other
+                    }
+                }
+            }
+            sources.main.cpp.lib library: 'lib1', linkage: 'api'
+            sources.other.cpp.lib library: 'lib2', linkage: 'api'
+"""
+
+        when:
+        succeeds "mainExecutable"
+
+        then:
+        executable("build/binaries/mainExecutable/main").exec().out == "12\n"
+    }
+
+    def "dependencies of binary are shared with all source sets when compiling"() {
+        given:
+        buildFile << """
+            executables {
+                main {
+                    source sources.other
+                    binaries.all {
+                        lib library: 'lib1', linkage: 'api'
+                    }
+                }
+            }
+"""
+
+        when:
+        succeeds "mainExecutable"
+
+        then:
+        executable("build/binaries/mainExecutable/main").exec().out == "11\n"
+    }
+}
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SourceSetLinkDependenciesIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SourceSetLinkDependenciesIntegrationTest.groovy
new file mode 100755
index 000000000000..bdcb9843e070
--- /dev/null
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/SourceSetLinkDependenciesIntegrationTest.groovy
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+
+package org.gradle.nativebinaries.language.cpp
+import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChainIntegrationSpec
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
+
+@Requires(TestPrecondition.CAN_INSTALL_EXECUTABLE)
+class SourceSetLinkDependenciesIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
+    def "setup"() {
+        settingsFile << "rootProject.name = 'test'"
+
+        file("src/main/headers/funcs.h") << """
+            int func1();
+            int func2();
+"""
+        file("src/main/cpp/main.cpp") << """
+            #include <iostream>
+            #include "funcs.h"
+            int main () {
+                std::cout << func1() << func2() << std::endl;
+                return 0;
+            }
+"""
+        file("src/main/cpp1/func1.cpp") << """
+            int getOne();
+
+            int func1() {
+                return getOne();
+            }
+"""
+        file("src/other/cpp/func2.cpp") << """
+            int getTwo();
+
+            int func2() {
+                return getTwo();
+            }
+"""
+        file("src/lib1/cpp/getters.cpp") << """
+            int getOne() {
+                return 1;
+            }
+            int getTwo() {
+                return 2;
+            }
+"""
+
+        and:
+        buildFile << """
+            apply plugin: "cpp"
+            libraries {
+                lib1
+            }
+            sources {
+                main {
+                    cpp(CppSourceSet)
+                    cpp1(CppSourceSet)
+                }
+                other {
+                    cpp(CppSourceSet)
+                }
+            }
+            executables {
+                main {
+                    source sources.main
+                }
+            }
+"""
+    }
+
+    def "library dependency of binary is available when linking all source sets"() {
+        given:
+        buildFile << """
+            executables {
+                main {
+                    source sources.other
+                    binaries.all {
+                        lib library: 'lib1', linkage: 'static'
+                    }
+                }
+            }
+
+"""
+        when:
+        succeeds "installMainExecutable"
+
+        then:
+        installation("build/install/mainExecutable").exec().out == "12\n"
+    }
+
+    def "library dependency of 1 language source set is available to another when linking"() {
+        given:
+        buildFile << """
+            executables {
+                main {
+                    source sources.other
+                }
+            }
+            sources.other.cpp.lib library: 'lib1', linkage: 'static'
+"""
+
+        when:
+        succeeds "installMainExecutable"
+
+        then:
+        installation("build/install/mainExecutable").exec().out == "12\n"
+    }
+
+    def "dependencies of language source set added to binary are available when linking"() {
+        given:
+        buildFile << """
+            executables {
+                main {
+                    binaries.all {
+                        source sources.other
+                    }
+                }
+            }
+            sources.other.cpp.lib library: 'lib1', linkage: 'static'
+"""
+
+        when:
+        succeeds "installMainExecutable"
+
+        then:
+        installation("build/install/mainExecutable").exec().out == "12\n"
+    }
+}
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/ToolChainDiscoveryIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/ToolChainDiscoveryIntegrationTest.groovy
index 91bbf69d726f..94ce2cd740a3 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/ToolChainDiscoveryIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/ToolChainDiscoveryIntegrationTest.groovy
@@ -34,10 +34,13 @@ class ToolChainDiscoveryIntegrationTest extends AbstractInstalledToolChainIntegr
         toolChain.initialiseEnvironment();
 
         and:
-        // We explicitly apply a single tool chain plugin here, to avoid using an alternative tool chain
         buildFile << """
-            apply plugin: CppNativeBinariesPlugin
-            apply plugin: ${toolChain.pluginClass}
+            apply plugin: 'cpp'
+            model {
+                toolChains {
+                    tc(${toolChain.implementationClass})
+                }
+            }
             executables {
                 main {}
             }
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/VisualCppToolChainDiscoveryIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/VisualCppToolChainDiscoveryIntegrationTest.groovy
new file mode 100755
index 000000000000..268a47e492e5
--- /dev/null
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/VisualCppToolChainDiscoveryIntegrationTest.groovy
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.language.cpp
+
+import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChainIntegrationSpec
+import org.gradle.nativebinaries.language.cpp.fixtures.RequiresInstalledToolChain
+import org.gradle.nativebinaries.language.cpp.fixtures.app.CHelloWorldApp
+import org.hamcrest.Matchers
+
+import static org.gradle.nativebinaries.language.cpp.fixtures.ToolChainRequirement.VisualCpp
+
+@RequiresInstalledToolChain(VisualCpp)
+class VisualCppToolChainDiscoveryIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
+    def helloWorldApp = new CHelloWorldApp()
+
+    def setup() {
+        buildFile << """
+            apply plugin: 'c'
+
+            model {
+                toolChains {
+                    ${toolChain.buildScriptConfig}
+                }
+            }
+
+            executables {
+                main {
+                }
+            }
+"""
+
+        helloWorldApp.executable.writeSources(file("src/main"))
+        helloWorldApp.library.writeSources(file("src/main"))
+    }
+
+    def "tool chain is not available when visual studio install is not available"() {
+        when:
+        buildFile << """
+            model {
+                toolChains {
+                    ${toolChain.id} {
+                        installDir "does-not-exist"
+                    }
+                }
+            }
+"""
+        fails "mainExecutable"
+
+        then:
+        failure.assertHasDescription("Execution failed for task ':compileMainExecutableMainC'.")
+        failure.assertThatCause(Matchers.startsWith("No tool chain is available to build for platform 'current'"))
+        failure.assertThatCause(Matchers.containsString("- ${toolChain.instanceDisplayName}: The specified installation directory '${file('does-not-exist')}' does not appear to contain a Visual Studio installation."))
+    }
+
+    def "tool chain is not available when SDK install is not available"() {
+        when:
+        buildFile << """
+            model {
+                toolChains {
+                    ${toolChain.id} {
+                        windowsSdkDir "does-not-exist"
+                    }
+                }
+            }
+"""
+        fails "mainExecutable"
+
+        then:
+        failure.assertHasDescription("Execution failed for task ':compileMainExecutableMainC'.")
+        failure.assertThatCause(Matchers.startsWith("No tool chain is available to build for platform 'current'"))
+        failure.assertThatCause(Matchers.containsString("- ${toolChain.instanceDisplayName}: The specified installation directory '${file('does-not-exist')}' does not appear to contain a Windows SDK installation."))
+    }
+}
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesIncrementalBuildIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesIncrementalBuildIntegrationTest.groovy
index 09f6e0d97927..b52b77e5647f 100644
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesIncrementalBuildIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesIncrementalBuildIntegrationTest.groovy
@@ -15,6 +15,7 @@
  */
 package org.gradle.nativebinaries.language.cpp
 
+import org.gradle.nativebinaries.internal.CompilerOutputFileNamingScheme
 import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChainIntegrationSpec
 import org.gradle.nativebinaries.language.cpp.fixtures.ExecutableFixture
 import org.gradle.nativebinaries.language.cpp.fixtures.RequiresInstalledToolChain
@@ -114,9 +115,12 @@ STRINGTABLE
     }
 
     def "stale .res files are removed when a resource source file is renamed"() {
-        given:
-        def oldResFile = file("build/objectFiles/mainExecutable/mainRc/${hashFor(mainResourceFile)}/resources.res")
-        def newResFile = file("build/objectFiles/mainExecutable/mainRc/${hashFor(file('src/main/rc/changed_resources.rc'))}/changed_resources.res")
+        setup:
+        def outputFileNameScheme = new CompilerOutputFileNamingScheme()
+                .withOutputBaseFolder(file("build/objectFiles/mainExecutable/mainRc"))
+                .withObjectFileNameSuffix(".res")
+        def oldResFile = outputFileNameScheme.map(mainResourceFile)
+        def newResFile = outputFileNameScheme.map(file('src/main/rc/changed_resources.rc'))
         assert oldResFile.file
         assert !newResFile.file
 
@@ -133,8 +137,13 @@ STRINGTABLE
     }
 
     def "recompiles resource when included header is changed"() {
+
         given: "set the generated res file timestamp to zero"
-        def resourceFile = file("build/objectFiles/mainExecutable/mainRc/${hashFor(mainResourceFile)}/resources.res")
+        def outputFileNameScheme = new CompilerOutputFileNamingScheme()
+                .withOutputBaseFolder(file("build/objectFiles/mainExecutable/mainRc"))
+                .withObjectFileNameSuffix(".res")
+        def resourceFile = outputFileNameScheme.map(mainResourceFile)
+
         resourceFile.lastModified = 0
         when: "Unused header is changed"
         unusedHeaderFile << """
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesUnsupportedIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesUnsupportedIntegrationTest.groovy
index 616daa785ee7..6153d0422b6b 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesUnsupportedIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/WindowsResourcesUnsupportedIntegrationTest.groovy
@@ -16,16 +16,18 @@
 package org.gradle.nativebinaries.language.cpp
 
 import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChainIntegrationSpec
+import org.gradle.nativebinaries.language.cpp.fixtures.RequiresInstalledToolChain
+import org.gradle.nativebinaries.language.cpp.fixtures.ToolChainRequirement
 import org.gradle.nativebinaries.language.cpp.fixtures.app.CppHelloWorldApp
 import org.gradle.nativebinaries.language.cpp.fixtures.app.HelloWorldApp
 import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
 
-@Requires(TestPrecondition.NOT_WINDOWS)
 class WindowsResourcesUnsupportedIntegrationTest extends AbstractInstalledToolChainIntegrationSpec {
 
     HelloWorldApp helloWorldApp = new CppHelloWorldApp()
 
+    @Requires(TestPrecondition.NOT_WINDOWS)
     def "resource files are ignored on unsupported platforms"() {
         given:
         buildFile << """
@@ -51,5 +53,34 @@ class WindowsResourcesUnsupportedIntegrationTest extends AbstractInstalledToolCh
         then:
         !executedTasks.contains(":compileMainExecutableMainRc")
     }
+
+    @Requires(TestPrecondition.WINDOWS)
+    @RequiresInstalledToolChain(ToolChainRequirement.GccCompatible)
+    def "reasonable error message when attempting to compile resource files with unsupported tool chain"() {
+        given:
+        buildFile << """
+            apply plugin: 'cpp'
+            apply plugin: 'windows-resources'
+
+            executables {
+                main {}
+            }
+         """
+
+        and:
+        helloWorldApp.writeSources(file("src/main"))
+        file("src/main/rc/broken.rc") << """
+        #include <stdio.h>
+
+        NOT A VALID RESOURCE
+"""
+
+        when:
+        fails "mainExecutable"
+
+        then:
+        failure.assertHasDescription("Execution failed for task ':compileMainExecutableMainRc'.")
+        failure.assertHasCause("Windows resource compiler is not available")
+    }
 }
 
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AbstractInstalledToolChainIntegrationSpec.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AbstractInstalledToolChainIntegrationSpec.groovy
index 34a1d33dc49e..16e30757134c 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AbstractInstalledToolChainIntegrationSpec.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AbstractInstalledToolChainIntegrationSpec.groovy
@@ -16,9 +16,10 @@
 
 package org.gradle.nativebinaries.language.cpp.fixtures
 
-import org.apache.commons.io.FilenameUtils
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.internal.hash.HashUtil
+import org.gradle.internal.os.OperatingSystem
+import org.gradle.nativebinaries.internal.CompilerOutputFileNamingScheme
 import org.gradle.test.fixtures.file.TestFile
 import org.junit.runner.RunWith
 /**
@@ -70,9 +71,11 @@ allprojects {
     }
 
     def objectFileFor(TestFile sourceFile, String rootObjectFilesDir = "build/objectFiles/mainExecutable/main${sourceType}") {
-        final baseName = FilenameUtils.removeExtension(sourceFile.name)
-        String compactMD5 = HashUtil.createCompactMD5(sourceFile.getAbsolutePath());
-        return objectFile("$rootObjectFilesDir/$compactMD5/${baseName}")
+        File objectFile = new CompilerOutputFileNamingScheme()
+                        .withObjectFileNameSuffix(OperatingSystem.current().isWindows() ? ".obj" : ".o")
+                        .withOutputBaseFolder(file(rootObjectFilesDir))
+                        .map(sourceFile)
+        return file(getTestDirectory().toURI().relativize(objectFile.toURI()));
     }
 
     String hashFor(File inputFile){
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/SingleToolChainTestRunner.java b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/SingleToolChainTestRunner.java
index dd626d409399..dd35d85a3906 100755
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/SingleToolChainTestRunner.java
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/cpp/fixtures/SingleToolChainTestRunner.java
@@ -31,11 +31,23 @@ public SingleToolChainTestRunner(Class<? extends AbstractInstalledToolChainInteg
     protected void createExecutions() {
         boolean enableAllToolChains = "all".equals(System.getProperty(TOOLCHAINS_SYSPROP_NAME, "default"));
         List<AvailableToolChains.ToolChainCandidate> toolChains = AvailableToolChains.getToolChains();
-        boolean someToolChainAvailable = false;
-        for (AvailableToolChains.ToolChainCandidate toolChain : toolChains) {
-            boolean enabled = enableAllToolChains || (toolChain.isAvailable() && !someToolChainAvailable);
-            someToolChainAvailable |= enabled;
-            add(new ToolChainExecution(toolChain, enabled));
+        if (enableAllToolChains) {
+            for (AvailableToolChains.ToolChainCandidate toolChain : toolChains) {
+                if (!toolChain.isAvailable()) {
+                    throw new RuntimeException(String.format("Tool chain %s is not available.", toolChain.getDisplayName()));
+                }
+                add(new ToolChainExecution(toolChain, true));
+            }
+        } else {
+            boolean hasEnabled = false;
+            for (AvailableToolChains.ToolChainCandidate toolChain : toolChains) {
+                if (!hasEnabled && toolChain.isAvailable()) {
+                    add(new ToolChainExecution(toolChain, true));
+                    hasEnabled = true;
+                } else {
+                    add(new ToolChainExecution(toolChain, false));
+                }
+            }
         }
     }
 
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIncrementalCompileIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIncrementalCompileIntegrationTest.groovy
index cea1480ce0cc..53e6b782a53f 100644
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIncrementalCompileIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/language/objectivec/ObjectiveCLanguageIncrementalCompileIntegrationTest.groovy
@@ -35,7 +35,7 @@ class ObjectiveCLanguageIncrementalCompileIntegrationTest extends AbstractLangua
             #import "${otherHeaderFile.name}"
 """
         and:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         otherHeaderFile << """
@@ -48,7 +48,7 @@ class ObjectiveCLanguageIncrementalCompileIntegrationTest extends AbstractLangua
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
     }
 
     def "source is always recompiled if it imported header via macro"() {
@@ -59,7 +59,7 @@ class ObjectiveCLanguageIncrementalCompileIntegrationTest extends AbstractLangua
 """
 
         and:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         otherHeaderFile << """
@@ -72,9 +72,8 @@ class ObjectiveCLanguageIncrementalCompileIntegrationTest extends AbstractLangua
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
 
-        // TODO:DAZ Remove this behaviour
         when: "Header that is NOT included is changed"
         file("src/main/headers/notIncluded.h") << """
             // Dummy header file
@@ -86,7 +85,7 @@ class ObjectiveCLanguageIncrementalCompileIntegrationTest extends AbstractLangua
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
     }
 
     def "recompiles source file when transitively imported header file is changed"() {
@@ -102,7 +101,7 @@ class ObjectiveCLanguageIncrementalCompileIntegrationTest extends AbstractLangua
 """
 
         and:
-        initialCompile()
+        outputs.snapshot { run "mainExecutable" }
 
         when:
         transitiveHeaderFile << """
@@ -115,6 +114,6 @@ class ObjectiveCLanguageIncrementalCompileIntegrationTest extends AbstractLangua
         executedAndNotSkipped compileTask
 
         and:
-        recompiled sourceFile
+        outputs.recompiledFile sourceFile
     }
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginIntegrationTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/plugins/NativeComponentPluginIntegrationTest.groovy
similarity index 88%
rename from subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginIntegrationTest.groovy
rename to subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/plugins/NativeComponentPluginIntegrationTest.groovy
index 58fd5997c9dc..9cee38bdce6d 100644
--- a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginIntegrationTest.groovy
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/plugins/NativeComponentPluginIntegrationTest.groovy
@@ -18,9 +18,9 @@ package org.gradle.nativebinaries.plugins
 
 import org.gradle.integtests.fixtures.WellBehavedPluginTest
 
-class NativeBinariesPluginIntegrationTest extends WellBehavedPluginTest {
+class NativeComponentPluginIntegrationTest extends WellBehavedPluginTest {
     @Override
     String getPluginId() {
-        "native-binaries"
+        "native-component"
     }
 }
diff --git a/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/toolchain/CommonToolchainCustomizationIntegTest.groovy b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/toolchain/CommonToolchainCustomizationIntegTest.groovy
new file mode 100644
index 000000000000..a8c8d11cbf3c
--- /dev/null
+++ b/subprojects/cpp/src/integTest/groovy/org/gradle/nativebinaries/toolchain/CommonToolchainCustomizationIntegTest.groovy
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries.toolchain;
+
+import org.gradle.nativebinaries.language.cpp.fixtures.AbstractInstalledToolChainIntegrationSpec
+import org.gradle.nativebinaries.language.cpp.fixtures.app.CppHelloWorldApp
+
+public class CommonToolchainCustomizationIntegTest extends AbstractInstalledToolChainIntegrationSpec {
+
+    def helloWorldApp = new CppHelloWorldApp()
+
+    def setup() {
+        buildFile << """
+        apply plugin: 'cpp'
+
+        executables {
+            main {}
+        }
+        """
+
+        helloWorldApp.executable.writeSources(file("src/main"))
+    }
+
+    def "can customize tool arguments"() {
+        when:
+        helloWorldApp.writeSources(file("src/main"))
+        buildFile << """
+        apply plugin: 'cpp'
+        model {
+            toolChains {
+                ${toolChain.id} {
+                    cppCompiler.withArguments { args ->
+                            args << "-DFRENCH"
+                    }
+                }
+            }
+        }
+        """
+        and:
+        succeeds "mainExecutable"
+        then:
+        executable("build/binaries/mainExecutable/main").exec().out == helloWorldApp.frenchOutput
+    }
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy
index cccb6abe810e..d37edf7a54dd 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/CdtIdePlugin.groovy
@@ -32,7 +32,7 @@ import org.gradle.ide.cdt.tasks.GenerateMetadataFileTask
 class CdtIdePlugin implements Plugin<Project> {
 
     void apply(Project project) {
-        project.apply(plugin: "native-binaries")
+        project.apply(plugin: "native-component")
         def metadataFileTasks = [addCreateProjectDescriptor(project), addCreateCprojectDescriptor(project)]
 
         project.task("cleanCdt", type: Delete) {
@@ -54,7 +54,7 @@ class CdtIdePlugin implements Plugin<Project> {
     private addCreateCprojectDescriptor(Project project) {
         project.task("cdtCproject", type: GenerateMetadataFileTask) { task ->
             
-            [project.executables, project.libraries]*.all { binary ->
+            [project.nativeCode.executables, project.nativeCode.libraries]*.all { binary ->
                 if (binary.name == "main") {
                     task.settings = new CprojectSettings(binary, project)
                 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/CprojectSettings.groovy b/subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/CprojectSettings.groovy
index 625a2fcb2b78..241e09706ab7 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/CprojectSettings.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/cdt/model/CprojectSettings.groovy
@@ -26,7 +26,6 @@ import org.gradle.nativebinaries.*
  * Exposes a more logical view of the actual .cproject descriptor file
  */
 @Incubating
-// TODO:DAZ I'm sure this is now broken
 class CprojectSettings {
 
     ProjectNativeComponent binary
@@ -78,9 +77,9 @@ class CprojectSettings {
 
         def extension = ""
         def type 
-        if (binary instanceof Library) {
+        if (binary instanceof NativeLibrary) {
             type = "org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
-        } else if (binary instanceof Executable) {
+        } else if (binary instanceof NativeExecutable) {
             type = "org.eclipse.cdt.build.core.buildArtefactType.exe"
         } else {
             throw new IllegalStateException("The binary $binary is of a type that we don't know about")
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioProject.java b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioProject.java
index 22c17260ee57..bd9c545cf528 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioProject.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioProject.java
@@ -18,7 +18,7 @@
 
 import org.gradle.api.Incubating;
 import org.gradle.api.Named;
-import org.gradle.language.base.BuildableModelElement;
+import org.gradle.runtime.base.BuildableModelElement;
 import org.gradle.nativebinaries.ProjectNativeComponent;
 
 /**
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioSolution.java b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioSolution.java
index 9c62135ae6d6..6b5d6f0a6f84 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioSolution.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/VisualStudioSolution.java
@@ -18,7 +18,7 @@
 
 import org.gradle.api.Incubating;
 import org.gradle.api.Named;
-import org.gradle.language.base.BuildableModelElement;
+import org.gradle.runtime.base.BuildableModelElement;
 import org.gradle.nativebinaries.ProjectNativeComponent;
 
 import java.util.Set;
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProject.groovy b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProject.groovy
index 929e2569269c..239dc9893d59 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProject.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioProject.groovy
@@ -23,7 +23,7 @@ import org.gradle.ide.visualstudio.XmlConfigFile
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.language.HeaderExportingSourceSet
 import org.gradle.language.base.LanguageSourceSet
-import org.gradle.language.base.internal.AbstractBuildableModelElement
+import org.gradle.runtime.base.internal.AbstractBuildableModelElement
 import org.gradle.language.rc.WindowsResourceSet
 import org.gradle.nativebinaries.NativeBinary
 import org.gradle.nativebinaries.ProjectNativeBinary
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioSolution.groovy b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioSolution.groovy
index 634c49709765..62f4f59f681a 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioSolution.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/DefaultVisualStudioSolution.groovy
@@ -22,8 +22,8 @@ import org.gradle.ide.visualstudio.TextProvider
 import org.gradle.ide.visualstudio.VisualStudioProject
 import org.gradle.ide.visualstudio.VisualStudioSolution
 import org.gradle.internal.reflect.Instantiator
-import org.gradle.language.base.internal.AbstractBuildableModelElement
-import org.gradle.nativebinaries.LibraryBinary
+import org.gradle.runtime.base.internal.AbstractBuildableModelElement
+import org.gradle.nativebinaries.NativeLibraryBinary
 import org.gradle.nativebinaries.ProjectNativeComponent
 import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
 
@@ -75,7 +75,7 @@ class DefaultVisualStudioSolution extends AbstractBuildableModelElement implemen
     }
 
     private void addDependentConfigurations(Set configurations, VisualStudioProjectConfiguration configuration) {
-        for (LibraryBinary library : configuration.binary.dependentBinaries) {
+        for (NativeLibraryBinary library : configuration.binary.dependentBinaries) {
             if (library instanceof ProjectNativeBinaryInternal) {
                 VisualStudioProjectConfiguration libraryConfiguration = vsProjectResolver.lookupProjectConfiguration(library);
                 if (configurations.add(libraryConfiguration)) {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/ExecutableVisualStudioProjectConfiguration.groovy b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/ExecutableVisualStudioProjectConfiguration.groovy
index 570a69ca4605..a1d8a9b39660 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/ExecutableVisualStudioProjectConfiguration.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/ExecutableVisualStudioProjectConfiguration.groovy
@@ -41,6 +41,7 @@ class ExecutableVisualStudioProjectConfiguration extends VisualStudioProjectConf
     }
 
     private InstallExecutable getInstallTask() {
-        return binary.tasks.withType(InstallExecutable).iterator().next()
+        final installTasks = binary.tasks.withType(InstallExecutable)
+        return installTasks.empty ? null : installTasks.iterator().next()
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfiguration.groovy b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfiguration.groovy
index 7cab44c54b77..3f5377d9b030 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfiguration.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfiguration.groovy
@@ -50,14 +50,13 @@ class VisualStudioProjectConfiguration {
     }
 
     String getBuildTask() {
-        return taskPath(binary.name)
+        return binary.tasks.build.path
     }
 
     String getCleanTask() {
         return taskPath("clean")
     }
 
-    // TODO:DAZ Make it easier to find the lifecycle task and clean task for a binary and use task.path.
     private String taskPath(String taskName) {
         String projectPath = binary.component.projectPath
         if (projectPath == ":") {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapper.java b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapper.java
index 6cdd7e5bf097..96f606456c3f 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapper.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapper.java
@@ -17,8 +17,8 @@
 package org.gradle.ide.visualstudio.internal;
 
 import org.apache.commons.lang.StringUtils;
-import org.gradle.nativebinaries.ExecutableBinary;
-import org.gradle.nativebinaries.LibraryBinary;
+import org.gradle.nativebinaries.NativeExecutableBinary;
+import org.gradle.nativebinaries.NativeLibraryBinary;
 import org.gradle.nativebinaries.ProjectNativeBinary;
 import org.gradle.nativebinaries.SharedLibraryBinary;
 import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal;
@@ -57,8 +57,8 @@ private String componentName(ProjectNativeBinary nativeBinary) {
 
     private String projectSuffix(ProjectNativeBinary nativeBinary) {
         return nativeBinary instanceof SharedLibraryBinary ? "Dll"
-                : nativeBinary instanceof LibraryBinary ? "Lib"
-                : nativeBinary instanceof ExecutableBinary ? "Exe"
+                : nativeBinary instanceof NativeLibraryBinary ? "Lib"
+                : nativeBinary instanceof NativeExecutableBinary ? "Exe"
                 : "";
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistry.java b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistry.java
index 192fedf797db..f09bbcdfaa96 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistry.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistry.java
@@ -46,7 +46,7 @@ public VisualStudioProjectConfiguration addProjectConfiguration(ProjectNativeBin
 
     private VisualStudioProjectConfiguration createVisualStudioProjectConfiguration(ProjectNativeBinary nativeBinary, DefaultVisualStudioProject project, String configuration, String platform) {
         Class<? extends VisualStudioProjectConfiguration> type =
-                nativeBinary instanceof ExecutableBinary ? ExecutableVisualStudioProjectConfiguration.class : VisualStudioProjectConfiguration.class;
+                nativeBinary instanceof NativeExecutableBinary ? ExecutableVisualStudioProjectConfiguration.class : VisualStudioProjectConfiguration.class;
         return getInstantiator().newInstance(type, project, configuration, platform, nativeBinary);
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioModel.java b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioModel.java
index 0a1fdfa85e4d..506553d4b4b8 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioModel.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioModel.java
@@ -18,7 +18,7 @@
 import org.gradle.ide.visualstudio.internal.DefaultVisualStudioExtension;
 import org.gradle.ide.visualstudio.internal.DefaultVisualStudioProject;
 import org.gradle.ide.visualstudio.internal.VisualStudioProjectConfiguration;
-import org.gradle.language.base.BinaryContainer;
+import org.gradle.runtime.base.BinaryContainer;
 import org.gradle.model.ModelRule;
 import org.gradle.nativebinaries.ProjectNativeBinary;
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioTasks.java b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioTasks.java
index 2614100a6346..74280f6e4fe3 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioTasks.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/internal/rules/CreateVisualStudioTasks.java
@@ -39,7 +39,7 @@ public void createTasksForVisualStudio(TaskContainer tasks, VisualStudioExtensio
         for (VisualStudioSolution vsSolution : visualStudioExtension.getSolutions()) {
             Task solutionTask = tasks.create(vsSolution.getName() + "VisualStudio");
             solutionTask.setDescription(String.format("Generates the '%s' Visual Studio solution file.", vsSolution.getName()));
-            vsSolution.setLifecycleTask(solutionTask);
+            vsSolution.setBuildTask(solutionTask);
             vsSolution.builtBy(createSolutionTask(tasks, vsSolution));
 
             // Lifecycle task for component
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPlugin.groovy
index 5535b2abac61..1ecc4af7c4fa 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/ide/visualstudio/plugins/VisualStudioPlugin.groovy
@@ -27,7 +27,7 @@ import org.gradle.ide.visualstudio.internal.rules.CreateVisualStudioTasks
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.model.ModelRules
 import org.gradle.nativebinaries.internal.resolve.ProjectLocator
-import org.gradle.nativebinaries.plugins.NativeBinariesModelPlugin
+import org.gradle.nativebinaries.plugins.NativeComponentModelPlugin
 
 import javax.inject.Inject
 
@@ -47,7 +47,7 @@ class VisualStudioPlugin implements Plugin<ProjectInternal> {
     }
 
     void apply(ProjectInternal project) {
-        project.plugins.apply(NativeBinariesModelPlugin)
+        project.plugins.apply(NativeComponentModelPlugin)
 
         modelRules.register("visualStudio", instantiator.newInstance(DefaultVisualStudioExtension, instantiator, projectLocator, fileResolver))
         modelRules.config("visualStudio", new IncludeBuildFileInProject(project))
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/language/DependentSourceSet.java b/subprojects/cpp/src/main/groovy/org/gradle/language/DependentSourceSet.java
index 168b2b1bf52a..9e7a6b642b3f 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/language/DependentSourceSet.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/language/DependentSourceSet.java
@@ -35,7 +35,7 @@ public interface DependentSourceSet extends LanguageSourceSet {
      * Adds a library that this source set requires. This method accepts the following types:
      *
      * <ul>
-     *     <li>A {@link org.gradle.nativebinaries.Library}</li>
+     *     <li>A {@link org.gradle.nativebinaries.NativeLibrary}</li>
      *     <li>A {@link org.gradle.nativebinaries.NativeDependencySet}</li>
      *     <li>A {@link java.util.Map} containing the library selector.</li>
      * </ul>
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/language/HeaderExportingSourceSet.java b/subprojects/cpp/src/main/groovy/org/gradle/language/HeaderExportingSourceSet.java
index e27d234df1b8..fadc8b5758cd 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/language/HeaderExportingSourceSet.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/language/HeaderExportingSourceSet.java
@@ -38,8 +38,6 @@ public interface HeaderExportingSourceSet extends LanguageSourceSet {
 
     /**
      * The headers that are private to this source set and implicitly available. These are not explicitly made available for compilation.
-     *
-     * TODO:DAZ This is temporary to get 'implicit' headers working in Visual Studio. The plan is to model these better soon.
      */
     SourceDirectorySet getImplicitHeaders();
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableBinary.java
index 875f5946ce9e..a257a6b1e340 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableBinary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,10 @@
 
 import org.gradle.api.Incubating;
 
-import java.io.File;
-
 /**
- * A binary artifact that is built from of a {@link Executable}, targeted at a particular platform with specific configuration.
+ * A binary artifact that is built from of a {@link org.gradle.nativebinaries.NativeExecutable}, targeted at a particular platform with specific configuration.
+ * // TODO:DAZ Deprecate in 2.1
  */
 @Incubating
-public interface ExecutableBinary extends NativeBinary {
-    /**
-     * The executable file.
-     */
-    File getExecutableFile();
-
-    /**
-     * The executable file.
-     */
-    void setExecutableFile(File executableFile);
+public interface ExecutableBinary extends NativeExecutableBinary {
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableContainer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableContainer.java
index 34bed7bea006..18491e0d32ca 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableContainer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ExecutableContainer.java
@@ -23,5 +23,5 @@
  * A container of native executables.
  */
 @Incubating
-public interface ExecutableContainer extends NamedDomainObjectSet<Executable> {
+public interface ExecutableContainer extends NamedDomainObjectSet<NativeExecutable> {
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinary.java
index 0c99b57fe53f..8f499e7ec02c 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinary.java
@@ -17,7 +17,7 @@
 package org.gradle.nativebinaries;
 
 import org.gradle.api.Incubating;
-import org.gradle.language.base.Binary;
+import org.gradle.runtime.base.Binary;
 import org.gradle.nativebinaries.platform.Platform;
 
 /**
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinaryTasks.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinaryTasks.java
index d66bb958f2ee..0d7da99e3ebb 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinaryTasks.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeBinaryTasks.java
@@ -19,13 +19,18 @@
 import org.gradle.api.DomainObjectSet;
 import org.gradle.api.Incubating;
 import org.gradle.api.Task;
-import org.gradle.nativebinaries.tasks.BuildBinaryTask;
+import org.gradle.nativebinaries.tasks.ObjectFilesToBinary;
 
 /**
  * Provides access to key tasks used for building the binary.
  */
 @Incubating
 public interface NativeBinaryTasks extends DomainObjectSet<Task> {
+    /**
+     * The 'lifecycle' task, that can be used to construct this native binary.
+     */
+    Task getBuild();
+
     /**
      * The link task, if one is present. Null otherwise.
      */
@@ -39,5 +44,5 @@ public interface NativeBinaryTasks extends DomainObjectSet<Task> {
     /**
      * The task that builds the binary out of object files: either the link task or create static library task as appropriate.
      */
-    BuildBinaryTask getBuilder();
+    ObjectFilesToBinary getCreateOrLink();
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeComponentExtension.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeComponentExtension.java
new file mode 100644
index 000000000000..18c7ceb299c9
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeComponentExtension.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries;
+
+import org.gradle.api.Action;
+import org.gradle.api.Incubating;
+import org.gradle.api.NamedDomainObjectContainer;
+
+// TODO:DAZ Improve javadoc
+/**
+ * The configuration for native components generated by this build.
+ */
+@Incubating
+public interface NativeComponentExtension {
+    /**
+     * The {@link NativeExecutable} components produced by the build.
+     */
+    NamedDomainObjectContainer<NativeExecutable> getExecutables();
+
+    /**
+     * Configure the {@link NativeExecutable} components produced by the build.
+     */
+    void executables(Action<? super NamedDomainObjectContainer<? super NativeExecutable>> action);
+
+    /**
+     * The {@link NativeLibrary} components produced by the build.
+     */
+    NamedDomainObjectContainer<NativeLibrary> getLibraries();
+
+    /**
+     * Configure the {@link NativeLibrary} components produced by the build.
+     */
+    void libraries(Action<? super NamedDomainObjectContainer<? super NativeLibrary>> action);
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Executable.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeExecutable.java
similarity index 83%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Executable.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeExecutable.java
index 6bda7a27ed09..38872ea658b6 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Executable.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeExecutable.java
@@ -16,11 +16,12 @@
 package org.gradle.nativebinaries;
 
 import org.gradle.api.Incubating;
+import org.gradle.runtime.base.Application;
 
 /**
  * An executable native component that is built by Gradle.
  */
 @Incubating
-public interface Executable extends ProjectNativeComponent, TargetedNativeComponent {
+public interface NativeExecutable extends Application, ProjectNativeComponent, TargetedNativeComponent {
     
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeExecutableBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeExecutableBinary.java
new file mode 100644
index 000000000000..8ce5b0980ab3
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeExecutableBinary.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries;
+
+import org.gradle.api.Incubating;
+
+import java.io.File;
+
+/**
+ * A binary artifact that is built from of a {@link NativeExecutable}, targeted at a particular platform with specific configuration.
+ */
+@Incubating
+public interface NativeExecutableBinary extends NativeBinary {
+    /**
+     * The executable file.
+     */
+    File getExecutableFile();
+
+    /**
+     * The executable file.
+     */
+    void setExecutableFile(File executableFile);
+}
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Library.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibrary.java
similarity index 90%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Library.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibrary.java
index a933b8ffe319..888534da5eac 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Library.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibrary.java
@@ -16,12 +16,13 @@
 package org.gradle.nativebinaries;
 
 import org.gradle.api.Incubating;
+import org.gradle.runtime.base.Library;
 
 /**
  * A library component that is built by a gradle project.
  */
 @Incubating
-public interface Library extends ProjectNativeComponent, TargetedNativeComponent {
+public interface NativeLibrary extends Library, ProjectNativeComponent, TargetedNativeComponent {
     /**
      * Converts this library to a native library requirement that uses the shared library variant. This is the default.
      */
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryBinary.java
similarity index 84%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryBinary.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryBinary.java
index 2072ade57775..5d0a4d9c7739 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryBinary.java
@@ -19,8 +19,8 @@
 import org.gradle.api.Incubating;
 
 /**
- * A physical representation of a {@link Library} component.
+ * A physical representation of a {@link NativeLibrary} component.
  */
 @Incubating
-public interface LibraryBinary extends NativeBinary {
+public interface NativeLibraryBinary extends NativeBinary {
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryRequirement.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryRequirement.java
index 2493b9af549f..24c01ac5bda3 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryRequirement.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/NativeLibraryRequirement.java
@@ -18,7 +18,7 @@
 import org.gradle.api.Incubating;
 
 /**
- * A dependency on a native-binaries library within the build.
+ * A dependency on a native library within the build.
  */
 @Incubating
 public interface NativeLibraryRequirement {
@@ -35,6 +35,5 @@ public interface NativeLibraryRequirement {
     /**
      * The required linkage.
      */
-    // TODO:DAZ Type this
     String getLinkage();
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeBinary.java
index 332e29b6897f..27d9af7a7858 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeBinary.java
@@ -21,6 +21,7 @@
 import org.gradle.internal.HasInternalProtocol;
 import org.gradle.language.base.LanguageSourceSet;
 import org.gradle.nativebinaries.toolchain.ToolChain;
+import org.gradle.runtime.base.ProjectBinary;
 
 import java.util.Collection;
 
@@ -28,17 +29,12 @@
  * Represents a particular binary artifact that is the result of building a native component.
  */
 @Incubating @HasInternalProtocol
-public interface ProjectNativeBinary extends NativeBinary {
+public interface ProjectNativeBinary extends ProjectBinary, NativeBinary {
     /**
      * The component that this binary was built from.
      */
     ProjectNativeComponent getComponent();
 
-    /**
-     * Can this binary be built in the current environment?
-     */
-    boolean isBuildable();
-
     /**
      * The source sets used to compile this binary.
      */
@@ -68,7 +64,7 @@ public interface ProjectNativeBinary extends NativeBinary {
      * This method accepts the following types:
      *
      * <ul>
-     *     <li>A {@link Library}</li>
+     *     <li>A {@link NativeLibrary}</li>
      *     <li>A {@link NativeDependencySet}</li>
      *     <li>A {@link java.util.Map} containing the library selector.</li>
      * </ul>
@@ -88,7 +84,6 @@ public interface ProjectNativeBinary extends NativeBinary {
      */
     ToolChain getToolChain();
 
-    // TODO:DAZ Add these tools as extensions: linker for ExecutableBinary and SharedLibraryBinary, staticLibArchiver for StaticLibraryBinary
     /**
      * The settings used for linking this binary.
      */
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeComponent.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeComponent.java
index 94774f4a6ebb..ec48c44fa6bf 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeComponent.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/ProjectNativeComponent.java
@@ -20,12 +20,13 @@
 import org.gradle.api.Named;
 import org.gradle.internal.HasInternalProtocol;
 import org.gradle.language.base.LanguageSourceSet;
+import org.gradle.runtime.base.ProjectComponent;
 
 /**
  * Represents a logical software component, which may be built in a number of variant binaries.
  */
 @Incubating @HasInternalProtocol
-public interface ProjectNativeComponent extends Named {
+public interface ProjectNativeComponent extends ProjectComponent, Named {
     /**
      * Returns a human-consumable display name for this component.
      */
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/SharedLibraryBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/SharedLibraryBinary.java
index 21e80f222c65..18fadb3b0896 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/SharedLibraryBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/SharedLibraryBinary.java
@@ -20,10 +20,10 @@
 import java.io.File;
 
 /**
- * A {@link Library} that has been compiled and linked as a shared library.
+ * A {@link NativeLibrary} that has been compiled and linked as a shared library.
  */
 @Incubating
-public interface SharedLibraryBinary extends LibraryBinary {
+public interface SharedLibraryBinary extends NativeLibraryBinary {
 
     /**
      * The shared library file.
@@ -41,7 +41,7 @@ public interface SharedLibraryBinary extends LibraryBinary {
     void setSharedLibraryFile(File sharedLibraryFile);
 
     /**
-     * The shared library file.
+     * The shared library link file.
      */
     void setSharedLibraryLinkFile(File sharedLibraryLinkFile);
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/StaticLibraryBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/StaticLibraryBinary.java
index d0306d9141cf..9cc077bf9b69 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/StaticLibraryBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/StaticLibraryBinary.java
@@ -22,11 +22,11 @@
 import java.io.File;
 
 /**
- * A {@link Library} that has been compiled and archived into a static library.
+ * A {@link NativeLibrary} that has been compiled and archived into a static library.
  */
 @Incubating
 @HasInternalProtocol
-public interface StaticLibraryBinary extends LibraryBinary {
+public interface StaticLibraryBinary extends NativeLibraryBinary {
 
     /**
      * The static library file.
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Tool.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Tool.java
index a4d88108612b..bc2aa54562b7 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Tool.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/Tool.java
@@ -19,9 +19,6 @@
 
 import java.util.List;
 
-// TODO:DAZ Possibly merge with org.gradle.nativecode.toolchain.GccTool
-// Need to work out if it makes sense to set the args when configuring a tool chain, or set the tool exe for a binary.
-// Seems like merging the 2 might work.
 /**
  * Configuration of the arguments of a ToolChain executable.
  */
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeBinary.java
index 0f0cc9a6c0b3..86b25ada1e92 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeBinary.java
@@ -22,8 +22,8 @@
 import org.gradle.internal.typeconversion.NotationParser;
 import org.gradle.language.DependentSourceSet;
 import org.gradle.language.base.LanguageSourceSet;
-import org.gradle.language.base.internal.AbstractBuildableModelElement;
-import org.gradle.language.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.internal.AbstractBuildableModelElement;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 import org.gradle.nativebinaries.*;
 import org.gradle.nativebinaries.internal.resolve.NativeBinaryResolveResult;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
@@ -42,7 +42,7 @@ public abstract class AbstractProjectNativeBinary extends AbstractBuildableModel
     private final DomainObjectSet<LanguageSourceSet> source = new DefaultDomainObjectSet<LanguageSourceSet>(LanguageSourceSet.class);
     private final DefaultTool linker = new DefaultTool();
     private final DefaultTool staticLibArchiver = new DefaultTool();
-    private final NativeBinaryTasks tasks = new DefaultNativeBinaryTasks();
+    private final NativeBinaryTasks tasks = new DefaultNativeBinaryTasks(this);
     private final BinaryNamingScheme namingScheme;
     private final Flavor flavor;
     private final ToolChainInternal toolChain;
@@ -137,7 +137,7 @@ public void lib(Object notation) {
         libs.add(notation);
     }
 
-    public Collection<LibraryBinary> getDependentBinaries() {
+    public Collection<NativeLibraryBinary> getDependentBinaries() {
         return resolve(source.withType(DependentSourceSet.class)).getAllLibraryBinaries();
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeComponent.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeComponent.java
index 140b9802df92..8ca4e48a2ea6 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeComponent.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeComponent.java
@@ -26,13 +26,13 @@
 
 public abstract class AbstractProjectNativeComponent implements ProjectNativeComponentInternal {
     private final NotationParser<Object, Set<LanguageSourceSet>> sourcesNotationParser = SourceSetNotationParser.parser();
-    private final NativeProjectComponentIdentifier id;
+    private final ProjectNativeComponentIdentifier id;
     private final DomainObjectSet<LanguageSourceSet> sourceSets;
     private final DefaultDomainObjectSet<NativeBinary> binaries;
 
     private String baseName;
 
-    public AbstractProjectNativeComponent(NativeProjectComponentIdentifier id) {
+    public AbstractProjectNativeComponent(ProjectNativeComponentIdentifier id) {
         this.id = id;
         this.sourceSets = new DefaultDomainObjectSet<LanguageSourceSet>(LanguageSourceSet.class);
         binaries = new DefaultDomainObjectSet<NativeBinary>(NativeBinary.class);
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectLibraryBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeLibraryBinary.java
similarity index 83%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectLibraryBinary.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeLibraryBinary.java
index ca293742204e..493e8f23db60 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectLibraryBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractProjectNativeLibraryBinary.java
@@ -21,10 +21,10 @@
 import org.gradle.api.tasks.TaskDependency;
 import org.gradle.language.HeaderExportingSourceSet;
 import org.gradle.language.base.LanguageSourceSet;
-import org.gradle.language.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 import org.gradle.nativebinaries.BuildType;
 import org.gradle.nativebinaries.Flavor;
-import org.gradle.nativebinaries.Library;
+import org.gradle.nativebinaries.NativeLibrary;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
 import org.gradle.nativebinaries.platform.Platform;
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal;
@@ -34,10 +34,10 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-public abstract class AbstractProjectLibraryBinary extends AbstractProjectNativeBinary implements LibraryBinaryInternal {
+public abstract class AbstractProjectNativeLibraryBinary extends AbstractProjectNativeBinary implements NativeLibraryBinaryInternal {
 
-    protected AbstractProjectLibraryBinary(Library library, Flavor flavor, ToolChainInternal toolChain, Platform targetPlatform, BuildType buildType,
-                                           BinaryNamingScheme namingScheme, NativeDependencyResolver resolver) {
+    protected AbstractProjectNativeLibraryBinary(NativeLibrary library, Flavor flavor, ToolChainInternal toolChain, Platform targetPlatform, BuildType buildType,
+                                                 BinaryNamingScheme namingScheme, NativeDependencyResolver resolver) {
         super(library, flavor, toolChain, targetPlatform, buildType, namingScheme, resolver);
     }
 
@@ -87,12 +87,12 @@ public final Set<File> getFiles() {
         }
 
         public final String getDisplayName() {
-            return AbstractProjectLibraryBinary.this.toString();
+            return AbstractProjectNativeLibraryBinary.this.toString();
         }
 
         public final TaskDependency getBuildDependencies() {
             if (hasOutputs()) {
-                return AbstractProjectLibraryBinary.this.getBuildDependencies();
+                return AbstractProjectNativeLibraryBinary.this.getBuildDependencies();
             }
             return new DefaultTaskDependency();
         }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractTargetedProjectNativeComponent.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractTargetedProjectNativeComponent.java
index 333db6f3f621..e63b2cc93203 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractTargetedProjectNativeComponent.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/AbstractTargetedProjectNativeComponent.java
@@ -32,7 +32,7 @@ public abstract class AbstractTargetedProjectNativeComponent extends AbstractPro
     private final Set<String> buildTypes = new HashSet<String>();
     private final Set<String> flavors = new HashSet<String>();
 
-    public AbstractTargetedProjectNativeComponent(NativeProjectComponentIdentifier id) {
+    public AbstractTargetedProjectNativeComponent(ProjectNativeComponentIdentifier id) {
         super(id);
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/CompilerOutputFileNamingScheme.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/CompilerOutputFileNamingScheme.java
new file mode 100644
index 000000000000..cb741f82810b
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/CompilerOutputFileNamingScheme.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries.internal;
+
+import org.apache.commons.io.FilenameUtils;
+import org.gradle.internal.hash.HashUtil;
+
+import java.io.File;
+
+public class CompilerOutputFileNamingScheme {
+    private String objectFileNameSuffix;
+    private File outputBaseFolder;
+
+    public CompilerOutputFileNamingScheme withOutputBaseFolder(File outputBaseFolder) {
+        this.outputBaseFolder = outputBaseFolder;
+        return this;
+    }
+
+    public CompilerOutputFileNamingScheme withObjectFileNameSuffix(String suffix){
+        this.objectFileNameSuffix = suffix;
+        return this;
+    }
+
+    public File map(File sourceFile) {
+        final String baseName = FilenameUtils.removeExtension(sourceFile.getName());
+        String compactMD5 = HashUtil.createCompactMD5(sourceFile.getAbsolutePath());
+        File hashDirectory = new File(outputBaseFolder, compactMD5);
+        return new File(hashDirectory, String.format("%s%s", baseName, objectFileNameSuffix));
+    }
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasks.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasks.java
index 8783210d0055..0ef16e9f4d51 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasks.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasks.java
@@ -22,12 +22,19 @@
 import org.gradle.api.internal.DefaultDomainObjectSet;
 import org.gradle.nativebinaries.NativeBinaryTasks;
 import org.gradle.nativebinaries.tasks.AbstractLinkTask;
-import org.gradle.nativebinaries.tasks.BuildBinaryTask;
+import org.gradle.nativebinaries.tasks.ObjectFilesToBinary;
 import org.gradle.nativebinaries.tasks.CreateStaticLibrary;
 
 public class DefaultNativeBinaryTasks extends DefaultDomainObjectSet<Task> implements NativeBinaryTasks {
-    public DefaultNativeBinaryTasks() {
+    private final ProjectNativeBinaryInternal binary;
+
+    public DefaultNativeBinaryTasks(ProjectNativeBinaryInternal binary) {
         super(Task.class);
+        this.binary = binary;
+    }
+
+    public Task getBuild() {
+        return binary.getBuildTask();
     }
 
     public AbstractLinkTask getLink() {
@@ -38,8 +45,8 @@ public CreateStaticLibrary getCreateStaticLib() {
         return findOnlyWithType(CreateStaticLibrary.class);
     }
 
-    public BuildBinaryTask getBuilder() {
-        BuildBinaryTask link = getLink();
+    public ObjectFilesToBinary getCreateOrLink() {
+        ObjectFilesToBinary link = getLink();
         return link == null ? getCreateStaticLib() : link;
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutable.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutable.java
similarity index 76%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutable.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutable.java
index 928fa14696e8..836e71adb085 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutable.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutable.java
@@ -15,10 +15,10 @@
  */
 package org.gradle.nativebinaries.internal;
 
-import org.gradle.nativebinaries.Executable;
+import org.gradle.nativebinaries.NativeExecutable;
 
-public class DefaultExecutable extends AbstractTargetedProjectNativeComponent implements Executable {
-    public DefaultExecutable(NativeProjectComponentIdentifier id) {
+public class DefaultNativeExecutable extends AbstractTargetedProjectNativeComponent implements NativeExecutable {
+    public DefaultNativeExecutable(ProjectNativeComponentIdentifier id) {
         super(id);
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibrary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeLibrary.java
similarity index 85%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibrary.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeLibrary.java
index 2ee1fb3afc9b..1df07f92235e 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibrary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultNativeLibrary.java
@@ -16,11 +16,11 @@
 
 package org.gradle.nativebinaries.internal;
 
-import org.gradle.nativebinaries.Library;
+import org.gradle.nativebinaries.NativeLibrary;
 import org.gradle.nativebinaries.NativeLibraryRequirement;
 
-public class DefaultLibrary extends AbstractTargetedProjectNativeComponent implements Library {
-    public DefaultLibrary(NativeProjectComponentIdentifier id) {
+public class DefaultNativeLibrary extends AbstractTargetedProjectNativeComponent implements NativeLibrary {
+    public DefaultNativeLibrary(ProjectNativeComponentIdentifier id) {
         super(id);
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LinkerSpec.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LinkerSpec.java
index 202800caa44f..078a0e6f02ec 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LinkerSpec.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LinkerSpec.java
@@ -32,7 +32,6 @@ public interface LinkerSpec extends BinaryToolSpec {
 
     void libraries(Iterable<File> libraries);
 
-    // TODO:DAZ Work out how to test this
     List<File> getLibraryPath();
 
     void libraryPath(File... libraryPath);
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeBinaryServices.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeBinaryServices.java
index 66150f55344b..a8ce29fd0951 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeBinaryServices.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeBinaryServices.java
@@ -19,6 +19,7 @@
 import org.gradle.internal.service.ServiceRegistration;
 import org.gradle.internal.service.scopes.PluginServiceRegistry;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolverServices;
+import org.gradle.nativebinaries.language.c.internal.incremental.IncrementalCompilerBuilder;
 import org.gradle.nativebinaries.toolchain.internal.msvcpp.DefaultVisualStudioLocator;
 import org.gradle.nativebinaries.toolchain.internal.msvcpp.DefaultWindowsSdkLocator;
 
@@ -33,5 +34,6 @@ public void registerBuildServices(ServiceRegistration registration) {
 
     public void registerProjectServices(ServiceRegistration registration) {
         registration.addProvider(new NativeDependencyResolverServices());
+        registration.add(IncrementalCompilerBuilder.class);
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutableContainer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeExecutableFactory.java
similarity index 54%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutableContainer.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeExecutableFactory.java
index 4adb2c45cb2d..153cfba97952 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultExecutableContainer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeExecutableFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,22 @@
 
 package org.gradle.nativebinaries.internal;
 
+import org.gradle.api.NamedDomainObjectFactory;
 import org.gradle.api.Project;
-import org.gradle.api.internal.AbstractNamedDomainObjectContainer;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.nativebinaries.Executable;
-import org.gradle.nativebinaries.ExecutableContainer;
+import org.gradle.nativebinaries.NativeExecutable;
 
-public class DefaultExecutableContainer extends AbstractNamedDomainObjectContainer<Executable> implements ExecutableContainer {
+public class NativeExecutableFactory implements NamedDomainObjectFactory<NativeExecutable> {
+    private final Instantiator instantiator;
     private final Project project;
 
-    public DefaultExecutableContainer(Instantiator instantiator, Project project) {
-        super(Executable.class, instantiator);
+    public NativeExecutableFactory(Instantiator instantiator, Project project) {
+        this.instantiator = instantiator;
         this.project = project;
     }
 
-    @Override
-    protected Executable doCreate(String name) {
-        NativeProjectComponentIdentifier id = new NativeProjectComponentIdentifier(project.getPath(), name);
-        return getInstantiator().newInstance(DefaultExecutable.class, id);
+    public NativeExecutable create(String name) {
+        ProjectNativeComponentIdentifier id = new ProjectNativeComponentIdentifier(project.getPath(), name);
+        return instantiator.newInstance(DefaultNativeExecutable.class, id);
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LibraryBinaryInternal.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeLibraryBinaryInternal.java
similarity index 86%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LibraryBinaryInternal.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeLibraryBinaryInternal.java
index 6f1f59c4888b..01ebdce3898c 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/LibraryBinaryInternal.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeLibraryBinaryInternal.java
@@ -17,9 +17,9 @@
 package org.gradle.nativebinaries.internal;
 
 import org.gradle.api.file.FileCollection;
-import org.gradle.nativebinaries.LibraryBinary;
+import org.gradle.nativebinaries.NativeLibraryBinary;
 
-public interface LibraryBinaryInternal extends LibraryBinary {
+public interface NativeLibraryBinaryInternal extends NativeLibraryBinary {
 
     FileCollection getHeaderDirs();
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibraryContainer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeLibraryFactory.java
similarity index 59%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibraryContainer.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeLibraryFactory.java
index 90c573ab597b..3ac40ddc9379 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/DefaultLibraryContainer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeLibraryFactory.java
@@ -16,23 +16,22 @@
 
 package org.gradle.nativebinaries.internal;
 
+import org.gradle.api.NamedDomainObjectFactory;
 import org.gradle.api.Project;
-import org.gradle.api.internal.AbstractNamedDomainObjectContainer;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.nativebinaries.Library;
-import org.gradle.nativebinaries.LibraryContainer;
+import org.gradle.nativebinaries.NativeLibrary;
 
-public class DefaultLibraryContainer extends AbstractNamedDomainObjectContainer<Library> implements LibraryContainer {
+public class NativeLibraryFactory implements NamedDomainObjectFactory<NativeLibrary> {
+    private final Instantiator instantiator;
     private final Project project;
 
-    public DefaultLibraryContainer(Instantiator instantiator, Project project) {
-        super(Library.class, instantiator);
+    public NativeLibraryFactory(Instantiator instantiator, Project project) {
+        this.instantiator = instantiator;
         this.project = project;
     }
 
-    @Override
-    protected Library doCreate(String name) {
-        NativeProjectComponentIdentifier id = new NativeProjectComponentIdentifier(project.getPath(), name);
-        return getInstantiator().newInstance(DefaultLibrary.class, id);
+    public NativeLibrary create(String name) {
+        ProjectNativeComponentIdentifier id = new ProjectNativeComponentIdentifier(project.getPath(), name);
+        return instantiator.newInstance(DefaultNativeLibrary.class, id);
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryInternal.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryInternal.java
index a9c976d10d47..ff68ff857849 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryInternal.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryInternal.java
@@ -17,8 +17,8 @@
 package org.gradle.nativebinaries.internal;
 
 import org.gradle.language.DependentSourceSet;
-import org.gradle.language.base.internal.BinaryInternal;
-import org.gradle.nativebinaries.LibraryBinary;
+import org.gradle.runtime.base.internal.BinaryInternal;
+import org.gradle.nativebinaries.NativeLibraryBinary;
 import org.gradle.nativebinaries.NativeDependencySet;
 import org.gradle.nativebinaries.ProjectNativeBinary;
 
@@ -32,5 +32,5 @@ public interface ProjectNativeBinaryInternal extends ProjectNativeBinary, Binary
 
     void setBuildable(boolean buildable);
 
-    Collection<LibraryBinary> getDependentBinaries();
+    Collection<NativeLibraryBinary> getDependentBinaries();
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeProjectComponentIdentifier.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentIdentifier.java
similarity index 75%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeProjectComponentIdentifier.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentIdentifier.java
index 5d9c2946e2dc..92baecb5a23a 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/NativeProjectComponentIdentifier.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentIdentifier.java
@@ -15,16 +15,14 @@
  */
 package org.gradle.nativebinaries.internal;
 
-import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
-
 /**
  * An identifier for a native component that is built as part of the current build.
  */
-public class NativeProjectComponentIdentifier implements ProjectComponentIdentifier {
+public class ProjectNativeComponentIdentifier {
     private final String projectPath;
     private final String name;
 
-    public NativeProjectComponentIdentifier(String projectPath, String name) {
+    public ProjectNativeComponentIdentifier(String projectPath, String name) {
         this.projectPath = projectPath;
         this.name = name;
     }
@@ -37,20 +35,16 @@ public String getProjectPath() {
         return projectPath;
     }
 
-    public String getDisplayName() {
-        return String.format("Project native component: %s.%s", projectPath, name);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof NativeProjectComponentIdentifier)) {
+        if (!(o instanceof ProjectNativeComponentIdentifier)) {
             return false;
         }
 
-        NativeProjectComponentIdentifier that = (NativeProjectComponentIdentifier) o;
+        ProjectNativeComponentIdentifier that = (ProjectNativeComponentIdentifier) o;
         return name.equals(that.name) && projectPath.equals(that.projectPath);
 
     }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentInternal.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentInternal.java
index 833e311711f9..ee40d4332e4b 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentInternal.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeComponentInternal.java
@@ -19,6 +19,5 @@
 
 public interface ProjectNativeComponentInternal extends ProjectNativeComponent {
 
-    // TODO:DAZ Use BuildComponentIdentifier
     String getProjectPath();
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectExecutableBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeExecutableBinary.java
similarity index 68%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectExecutableBinary.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeExecutableBinary.java
index 185697bcc4ff..b1ad69c70679 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectExecutableBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectNativeExecutableBinary.java
@@ -16,22 +16,19 @@
 
 package org.gradle.nativebinaries.internal;
 
-import org.gradle.language.base.internal.BinaryNamingScheme;
-import org.gradle.nativebinaries.BuildType;
-import org.gradle.nativebinaries.Executable;
-import org.gradle.nativebinaries.ExecutableBinary;
-import org.gradle.nativebinaries.Flavor;
+import org.gradle.nativebinaries.*;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
 import org.gradle.nativebinaries.platform.Platform;
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal;
 
 import java.io.File;
 
-public class ProjectExecutableBinary extends AbstractProjectNativeBinary implements ExecutableBinary {
+public class ProjectNativeExecutableBinary extends AbstractProjectNativeBinary implements NativeExecutableBinary, ExecutableBinary {
     private File executableFile;
 
-    public ProjectExecutableBinary(Executable executable, Flavor flavor, ToolChainInternal toolChain, Platform platform, BuildType buildType,
-                                   BinaryNamingScheme namingScheme, NativeDependencyResolver resolver) {
+    public ProjectNativeExecutableBinary(NativeExecutable executable, Flavor flavor, ToolChainInternal toolChain, Platform platform, BuildType buildType,
+                                         BinaryNamingScheme namingScheme, NativeDependencyResolver resolver) {
         super(executable, flavor, toolChain, platform, buildType, namingScheme, resolver);
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinary.java
index 53b65b42c381..5e8092d54c48 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinary.java
@@ -18,11 +18,11 @@
 
 import org.gradle.api.file.FileCollection;
 import org.gradle.language.base.LanguageSourceSet;
-import org.gradle.language.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 import org.gradle.language.rc.WindowsResourceSet;
 import org.gradle.nativebinaries.BuildType;
 import org.gradle.nativebinaries.Flavor;
-import org.gradle.nativebinaries.Library;
+import org.gradle.nativebinaries.NativeLibrary;
 import org.gradle.nativebinaries.SharedLibraryBinary;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
 import org.gradle.nativebinaries.platform.Platform;
@@ -32,11 +32,11 @@
 import java.util.Collections;
 import java.util.Set;
 
-public class ProjectSharedLibraryBinary extends AbstractProjectLibraryBinary implements SharedLibraryBinary {
+public class ProjectSharedLibraryBinary extends AbstractProjectNativeLibraryBinary implements SharedLibraryBinary {
     private File sharedLibraryFile;
     private File sharedLibraryLinkFile;
 
-    public ProjectSharedLibraryBinary(Library library, Flavor flavor, ToolChainInternal toolChain, Platform platform, BuildType buildType,
+    public ProjectSharedLibraryBinary(NativeLibrary library, Flavor flavor, ToolChainInternal toolChain, Platform platform, BuildType buildType,
                                       BinaryNamingScheme namingScheme, NativeDependencyResolver resolver) {
         super(library, flavor, toolChain, platform, buildType, namingScheme, resolver);
     }
@@ -94,7 +94,6 @@ private boolean hasResources() {
         }
 
         private boolean hasExportedSymbols() {
-            // TODO:DAZ This is a very rough approximation: actually inspect the binary to determine if there are exported symbols
             for (LanguageSourceSet languageSourceSet : getSource()) {
                 if (!(languageSourceSet instanceof WindowsResourceSet)) {
                     if (!languageSourceSet.getSource().isEmpty()) {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinary.java
index 9a08bc7aff55..fcda3488f873 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinary.java
@@ -18,10 +18,10 @@
 
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.file.collections.SimpleFileCollection;
-import org.gradle.language.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 import org.gradle.nativebinaries.BuildType;
 import org.gradle.nativebinaries.Flavor;
-import org.gradle.nativebinaries.Library;
+import org.gradle.nativebinaries.NativeLibrary;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
 import org.gradle.nativebinaries.platform.Platform;
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal;
@@ -32,11 +32,11 @@
 import java.util.List;
 import java.util.Set;
 
-public class ProjectStaticLibraryBinary extends AbstractProjectLibraryBinary implements StaticLibraryBinaryInternal {
+public class ProjectStaticLibraryBinary extends AbstractProjectNativeLibraryBinary implements StaticLibraryBinaryInternal {
     private final List<FileCollection> additionalLinkFiles = new ArrayList<FileCollection>();
     private File staticLibraryFile;
 
-    public ProjectStaticLibraryBinary(Library library, Flavor flavor, ToolChainInternal toolChain, Platform platform, BuildType buildType,
+    public ProjectStaticLibraryBinary(NativeLibrary library, Flavor flavor, ToolChainInternal toolChain, Platform platform, BuildType buildType,
                                       BinaryNamingScheme namingScheme, NativeDependencyResolver resolver) {
         super(library, flavor, toolChain, platform, buildType, namingScheme, resolver);
     }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ConfigureGeneratedSourceSets.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ConfigureGeneratedSourceSets.java
index 7bfa909fb17c..542d7d0e1d3e 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ConfigureGeneratedSourceSets.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ConfigureGeneratedSourceSets.java
@@ -45,7 +45,6 @@ public void execute(ProjectInternal project) {
     }
 
     private void maybeSetSourceDir(SourceDirectorySet sourceSet, Task task, String propertyName) {
-        // TODO:DAZ Handle multiple output directories
         Object value = task.property(propertyName);
         if (value != null) {
             sourceSet.srcDir(value);
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateNativeBinaries.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateNativeBinaries.java
index 14b6379bd1f7..b01ef5f6b85b 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateNativeBinaries.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/CreateNativeBinaries.java
@@ -19,18 +19,18 @@
 import org.gradle.api.Action;
 import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.BinaryContainer;
-import org.gradle.language.base.internal.BinaryNamingSchemeBuilder;
-import org.gradle.language.base.internal.DefaultBinaryNamingSchemeBuilder;
 import org.gradle.model.ModelRule;
-import org.gradle.nativebinaries.*;
+import org.gradle.nativebinaries.BuildTypeContainer;
+import org.gradle.nativebinaries.FlavorContainer;
+import org.gradle.nativebinaries.ProjectNativeBinary;
+import org.gradle.nativebinaries.ProjectNativeComponent;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
 import org.gradle.nativebinaries.platform.PlatformContainer;
 import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import org.gradle.runtime.base.BinaryContainer;
+import org.gradle.runtime.base.ProjectComponentContainer;
+import org.gradle.runtime.base.internal.BinaryNamingSchemeBuilder;
+import org.gradle.runtime.base.internal.DefaultBinaryNamingSchemeBuilder;
 
 public class CreateNativeBinaries extends ModelRule {
     private final Instantiator instantiator;
@@ -45,7 +45,6 @@ public CreateNativeBinaries(Instantiator instantiator, ProjectInternal project,
 
     public void create(BinaryContainer binaries, ToolChainRegistryInternal toolChains,
                        PlatformContainer platforms, BuildTypeContainer buildTypes, FlavorContainer flavors) {
-        // TODO:DAZ Work out the right way to make these containers available to binaries.all
         project.getExtensions().add("platforms", platforms);
         project.getExtensions().add("buildTypes", buildTypes);
         project.getExtensions().add("flavors", flavors);
@@ -56,24 +55,10 @@ public void create(BinaryContainer binaries, ToolChainRegistryInternal toolChain
         Action<ProjectNativeComponent> createBinariesAction =
                 new ProjectNativeComponentInitializer(factory, namingSchemeBuilder, toolChains, platforms, buildTypes, flavors);
 
-        for (ProjectNativeComponent component : allComponents()) {
+        ProjectComponentContainer softwareComponents = project.getExtensions().getByType(ProjectComponentContainer.class);
+        for (ProjectNativeComponent component : softwareComponents.withType(ProjectNativeComponent.class)) {
             createBinariesAction.execute(component);
             binaries.addAll(component.getBinaries());
         }
     }
-
-    private Collection<ProjectNativeComponent> allComponents() {
-        ExecutableContainer executables = project.getExtensions().getByType(ExecutableContainer.class);
-        LibraryContainer libraries = project.getExtensions().getByType(LibraryContainer.class);
-
-        List<ProjectNativeComponent> components = new ArrayList<ProjectNativeComponent>();
-        for (Library library : libraries) {
-            components.add(library);
-        }
-        for (Executable executable : executables) {
-            components.add(executable);
-        }
-        return components;
-    }
-
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactory.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactory.java
index 7d3282b16808..ed0e6d3dd7aa 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactory.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactory.java
@@ -17,10 +17,10 @@
 
 import org.gradle.api.Action;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.internal.BinaryNamingScheme;
-import org.gradle.language.base.internal.BinaryNamingSchemeBuilder;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.internal.BinaryNamingSchemeBuilder;
 import org.gradle.nativebinaries.*;
-import org.gradle.nativebinaries.internal.ProjectExecutableBinary;
+import org.gradle.nativebinaries.internal.ProjectNativeExecutableBinary;
 import org.gradle.nativebinaries.internal.ProjectSharedLibraryBinary;
 import org.gradle.nativebinaries.internal.ProjectStaticLibraryBinary;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
@@ -39,11 +39,11 @@ class DefaultNativeBinariesFactory implements NativeBinariesFactory {
     }
 
     public void createNativeBinaries(ProjectNativeComponent component, BinaryNamingSchemeBuilder namingScheme, ToolChain toolChain, Platform platform, BuildType buildType, Flavor flavor) {
-        if (component instanceof Library) {
+        if (component instanceof NativeLibrary) {
             createNativeBinary(ProjectSharedLibraryBinary.class, component, namingScheme.withTypeString("SharedLibrary").build(), toolChain, platform, buildType, flavor);
             createNativeBinary(ProjectStaticLibraryBinary.class, component, namingScheme.withTypeString("StaticLibrary").build(), toolChain, platform, buildType, flavor);
         } else {
-            createNativeBinary(ProjectExecutableBinary.class, component, namingScheme.withTypeString("Executable").build(), toolChain, platform, buildType, flavor);
+            createNativeBinary(ProjectNativeExecutableBinary.class, component, namingScheme.withTypeString("Executable").build(), toolChain, platform, buildType, flavor);
         }
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeComponentExtension.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeComponentExtension.java
new file mode 100644
index 000000000000..1c1566c37de4
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeComponentExtension.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries.internal.configure;
+
+import org.gradle.api.Action;
+import org.gradle.api.NamedDomainObjectContainer;
+import org.gradle.nativebinaries.NativeExecutable;
+import org.gradle.nativebinaries.NativeLibrary;
+import org.gradle.nativebinaries.NativeComponentExtension;
+
+public class DefaultNativeComponentExtension implements NativeComponentExtension {
+    private final NamedDomainObjectContainer<NativeExecutable> executables;
+    private final NamedDomainObjectContainer<NativeLibrary> libraries;
+
+    public DefaultNativeComponentExtension(NamedDomainObjectContainer<NativeExecutable> executables, NamedDomainObjectContainer<NativeLibrary> libraries) {
+        this.executables = executables;
+        this.libraries = libraries;
+    }
+
+    public NamedDomainObjectContainer<NativeExecutable> getExecutables() {
+        return executables;
+    }
+
+    public void executables(Action<? super NamedDomainObjectContainer<? super NativeExecutable>> action) {
+        action.execute(executables);
+    }
+
+    public NamedDomainObjectContainer<NativeLibrary> getLibraries() {
+        return libraries;
+    }
+
+    public void libraries(Action<? super NamedDomainObjectContainer<? super NativeLibrary>> action) {
+        action.execute(libraries);
+    }
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/NativeBinariesFactory.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/NativeBinariesFactory.java
index c90d65dda864..f7f8dc870f4f 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/NativeBinariesFactory.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/NativeBinariesFactory.java
@@ -15,7 +15,7 @@
  */
 package org.gradle.nativebinaries.internal.configure;
 
-import org.gradle.language.base.internal.BinaryNamingSchemeBuilder;
+import org.gradle.runtime.base.internal.BinaryNamingSchemeBuilder;
 import org.gradle.nativebinaries.BuildType;
 import org.gradle.nativebinaries.Flavor;
 import org.gradle.nativebinaries.ProjectNativeComponent;
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializer.java
index e0da6c276ec8..a415d90642e4 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializer.java
@@ -17,8 +17,8 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.Project;
-import org.gradle.language.base.internal.BinaryNamingScheme;
-import org.gradle.nativebinaries.ExecutableBinary;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
+import org.gradle.nativebinaries.NativeExecutableBinary;
 import org.gradle.nativebinaries.ProjectNativeBinary;
 import org.gradle.nativebinaries.SharedLibraryBinary;
 import org.gradle.nativebinaries.StaticLibraryBinary;
@@ -40,8 +40,8 @@ public void execute(ProjectNativeBinary nativeBinary) {
         File binaryOutputDir = new File(binariesOutputDir, namingScheme.getOutputDirectoryBase());
         String baseName = nativeBinary.getComponent().getBaseName();
 
-        if (nativeBinary instanceof ExecutableBinary) {
-            ((ExecutableBinary) nativeBinary).setExecutableFile(new File(binaryOutputDir, tc.getExecutableName(baseName)));
+        if (nativeBinary instanceof NativeExecutableBinary) {
+            ((NativeExecutableBinary) nativeBinary).setExecutableFile(new File(binaryOutputDir, tc.getExecutableName(baseName)));
         } else if (nativeBinary instanceof SharedLibraryBinary) {
             ((SharedLibraryBinary) nativeBinary).setSharedLibraryFile(new File(binaryOutputDir, tc.getSharedLibraryName(baseName)));
             ((SharedLibraryBinary) nativeBinary).setSharedLibraryLinkFile(new File(binaryOutputDir, tc.getSharedLibraryLinkFileName(baseName)));
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializer.java
index 92e1a177adff..13c849985edd 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializer.java
@@ -17,7 +17,7 @@
 package org.gradle.nativebinaries.internal.configure;
 
 import org.gradle.api.Action;
-import org.gradle.language.base.internal.BinaryNamingSchemeBuilder;
+import org.gradle.runtime.base.internal.BinaryNamingSchemeBuilder;
 import org.gradle.nativebinaries.BuildType;
 import org.gradle.nativebinaries.Flavor;
 import org.gradle.nativebinaries.ProjectNativeComponent;
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/AbstractPrebuiltLibraryBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/AbstractPrebuiltLibraryBinary.java
index 41725510aabc..dfe1530caeaa 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/AbstractPrebuiltLibraryBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/AbstractPrebuiltLibraryBinary.java
@@ -20,18 +20,18 @@
 import org.gradle.api.internal.file.collections.FileCollectionAdapter;
 import org.gradle.api.internal.file.collections.MinimalFileSet;
 import org.gradle.api.internal.file.collections.SimpleFileCollection;
-import org.gradle.language.base.internal.AbstractBuildableModelElement;
+import org.gradle.runtime.base.internal.AbstractBuildableModelElement;
 import org.gradle.nativebinaries.BuildType;
 import org.gradle.nativebinaries.Flavor;
 import org.gradle.nativebinaries.PrebuiltLibrary;
-import org.gradle.nativebinaries.internal.LibraryBinaryInternal;
+import org.gradle.nativebinaries.internal.NativeLibraryBinaryInternal;
 import org.gradle.nativebinaries.platform.Platform;
 
 import java.io.File;
 import java.util.Collections;
 import java.util.Set;
 
-public abstract class AbstractPrebuiltLibraryBinary extends AbstractBuildableModelElement implements LibraryBinaryInternal {
+public abstract class AbstractPrebuiltLibraryBinary extends AbstractBuildableModelElement implements NativeLibraryBinaryInternal {
     private final String name;
     private final PrebuiltLibrary library;
     private final BuildType buildType;
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryInitializer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryInitializer.java
index 3c4eeccff87e..741aa5f478ba 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryInitializer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/prebuilt/PrebuiltLibraryInitializer.java
@@ -18,11 +18,11 @@
 
 import org.gradle.api.Action;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.internal.BinaryNamingSchemeBuilder;
-import org.gradle.language.base.internal.DefaultBinaryNamingSchemeBuilder;
+import org.gradle.runtime.base.internal.BinaryNamingSchemeBuilder;
+import org.gradle.runtime.base.internal.DefaultBinaryNamingSchemeBuilder;
 import org.gradle.nativebinaries.BuildType;
 import org.gradle.nativebinaries.Flavor;
-import org.gradle.nativebinaries.LibraryBinary;
+import org.gradle.nativebinaries.NativeLibraryBinary;
 import org.gradle.nativebinaries.PrebuiltLibrary;
 import org.gradle.nativebinaries.platform.Platform;
 
@@ -59,13 +59,13 @@ public void createNativeBinaries(PrebuiltLibrary library, Platform platform, Bui
         createNativeBinary(DefaultPrebuiltStaticLibraryBinary.class, library, platform, buildType, flavor);
     }
 
-    public <T extends LibraryBinary> void createNativeBinary(Class<T> type, PrebuiltLibrary library, Platform platform, BuildType buildType, Flavor flavor) {
+    public <T extends NativeLibraryBinary> void createNativeBinary(Class<T> type, PrebuiltLibrary library, Platform platform, BuildType buildType, Flavor flavor) {
         String name = getName(type, library, platform, buildType, flavor);
         T nativeBinary = instantiator.newInstance(type, name, library, buildType, platform, flavor);
         library.getBinaries().add(nativeBinary);
     }
 
-    private <T extends LibraryBinary> String getName(Class<T> type, PrebuiltLibrary library, Platform platform, BuildType buildType, Flavor flavor) {
+    private <T extends NativeLibraryBinary> String getName(Class<T> type, PrebuiltLibrary library, Platform platform, BuildType buildType, Flavor flavor) {
         BinaryNamingSchemeBuilder namingScheme = new DefaultBinaryNamingSchemeBuilder()
                 .withComponentName(library.getName())
                 .withTypeString(type.getSimpleName())
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultLibraryResolver.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultLibraryResolver.java
index ee6446722230..f29cff9b7093 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultLibraryResolver.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultLibraryResolver.java
@@ -18,7 +18,7 @@
 import org.gradle.api.DomainObjectSet;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.nativebinaries.*;
-import org.gradle.nativebinaries.internal.LibraryBinaryInternal;
+import org.gradle.nativebinaries.internal.NativeLibraryBinaryInternal;
 import org.gradle.nativebinaries.platform.Platform;
 import org.gradle.util.GUtil;
 
@@ -35,7 +35,7 @@ public DefaultLibraryResolver(LibraryBinaryLocator libraryBinaryLocator, NativeL
         this.libraryBinaryLocator = libraryBinaryLocator;
     }
 
-    public LibraryBinaryInternal resolveLibraryBinary() {
+    public NativeLibraryBinaryInternal resolveLibraryBinary() {
         return new LibraryResolution()
                 .withFlavor(context.getFlavor())
                 .withPlatform(context.getTargetPlatform())
@@ -64,17 +64,17 @@ public LibraryResolution withBuildType(BuildType buildType) {
         }
 
         public NativeDependencySet resolve(DomainObjectSet<NativeBinary> allBinaries) {
-            LibraryBinaryInternal resolve = resolveLibrary(allBinaries);
+            NativeLibraryBinaryInternal resolve = resolveLibrary(allBinaries);
             return new DefaultNativeDependencySet(resolve);
         }
 
-        public LibraryBinaryInternal resolveLibrary(DomainObjectSet<NativeBinary> allBinaries) {
-            Class<? extends LibraryBinary> type = getTypeForLinkage(requirement.getLinkage());
-            DomainObjectSet<? extends LibraryBinary> candidateBinaries = allBinaries.withType(type);
+        public NativeLibraryBinaryInternal resolveLibrary(DomainObjectSet<NativeBinary> allBinaries) {
+            Class<? extends NativeLibraryBinary> type = getTypeForLinkage(requirement.getLinkage());
+            DomainObjectSet<? extends NativeLibraryBinary> candidateBinaries = allBinaries.withType(type);
             return resolve(candidateBinaries);
         }
 
-        private Class<? extends LibraryBinary> getTypeForLinkage(String linkage) {
+        private Class<? extends NativeLibraryBinary> getTypeForLinkage(String linkage) {
             if ("static".equals(linkage)) {
                 return StaticLibraryBinary.class;
             }
@@ -84,8 +84,8 @@ private Class<? extends LibraryBinary> getTypeForLinkage(String linkage) {
             throw new InvalidUserDataException("Not a valid linkage: " + linkage);
         }
 
-        private LibraryBinaryInternal resolve(Set<? extends LibraryBinary> candidates) {
-            for (LibraryBinary candidate : candidates) {
+        private NativeLibraryBinaryInternal resolve(Set<? extends NativeLibraryBinary> candidates) {
+            for (NativeLibraryBinary candidate : candidates) {
                 if (flavor != null && !flavor.getName().equals(candidate.getFlavor().getName())) {
                     continue;
                 }
@@ -96,7 +96,7 @@ private LibraryBinaryInternal resolve(Set<? extends LibraryBinary> candidates) {
                     continue;
                 }
 
-                return (LibraryBinaryInternal) candidate;
+                return (NativeLibraryBinaryInternal) candidate;
             }
 
             String typeName = GUtil.elvis(requirement.getLinkage(), "shared");
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultNativeDependencySet.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultNativeDependencySet.java
index 9005f6de9f9d..5ff2f951b186 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultNativeDependencySet.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultNativeDependencySet.java
@@ -18,12 +18,12 @@
 
 import org.gradle.api.file.FileCollection;
 import org.gradle.nativebinaries.NativeDependencySet;
-import org.gradle.nativebinaries.internal.LibraryBinaryInternal;
+import org.gradle.nativebinaries.internal.NativeLibraryBinaryInternal;
 
 public class DefaultNativeDependencySet implements NativeDependencySet {
-    private final LibraryBinaryInternal binary;
+    private final NativeLibraryBinaryInternal binary;
 
-    public DefaultNativeDependencySet(LibraryBinaryInternal binary) {
+    public DefaultNativeDependencySet(NativeLibraryBinaryInternal binary) {
         this.binary = binary;
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultProjectLocator.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultProjectLocator.java
index 1c47df95c8eb..da90ff3e3c1d 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultProjectLocator.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/DefaultProjectLocator.java
@@ -34,7 +34,7 @@ public ProjectInternal locateProject(String path) {
         }
 
         ProjectInternal referencedProject = delegate.getProject(path);
-        // TODO:DAZ This is a brain-dead way to ensure that the reference project's model is ready to access
+        // TODO This is a brain-dead way to ensure that the reference project's model is ready to access
         referencedProject.evaluate();
         return referencedProject;
     }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryNativeDependencyResolver.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryNativeDependencyResolver.java
index aac1ed50af7b..4aa1ccdea34b 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryNativeDependencyResolver.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/LibraryNativeDependencyResolver.java
@@ -16,7 +16,7 @@
 
 package org.gradle.nativebinaries.internal.resolve;
 
-import org.gradle.nativebinaries.internal.LibraryBinaryInternal;
+import org.gradle.nativebinaries.internal.NativeLibraryBinaryInternal;
 
 public class LibraryNativeDependencyResolver implements NativeDependencyResolver {
     private final LibraryBinaryLocator libraryBinaryLocator;
@@ -28,7 +28,7 @@ public LibraryNativeDependencyResolver(final LibraryBinaryLocator locator) {
     public void resolve(NativeBinaryResolveResult resolution) {
         for (NativeBinaryRequirementResolveResult requirementResolution : resolution.getPendingResolutions()) {
             DefaultLibraryResolver libraryResolver = new DefaultLibraryResolver(libraryBinaryLocator, requirementResolution.getRequirement(), resolution.getTarget());
-            LibraryBinaryInternal libraryBinary = libraryResolver.resolveLibraryBinary();
+            NativeLibraryBinaryInternal libraryBinary = libraryResolver.resolveLibraryBinary();
             requirementResolution.setLibraryBinary(libraryBinary);
             requirementResolution.setNativeDependencySet(new DefaultNativeDependencySet(libraryBinary));
         }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryRequirementResolveResult.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryRequirementResolveResult.java
index 9619178cb8ad..9f54b8b5f36d 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryRequirementResolveResult.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryRequirementResolveResult.java
@@ -16,15 +16,15 @@
 
 package org.gradle.nativebinaries.internal.resolve;
 
-import org.gradle.nativebinaries.LibraryBinary;
+import org.gradle.nativebinaries.NativeLibraryBinary;
 import org.gradle.nativebinaries.NativeDependencySet;
 import org.gradle.nativebinaries.NativeLibraryRequirement;
-import org.gradle.nativebinaries.internal.LibraryBinaryInternal;
+import org.gradle.nativebinaries.internal.NativeLibraryBinaryInternal;
 
 public class NativeBinaryRequirementResolveResult {
     private Object input;
     private NativeLibraryRequirement requirement;
-    private LibraryBinaryInternal libraryBinary;
+    private NativeLibraryBinaryInternal libraryBinary;
     private NativeDependencySet nativeDependencySet;
 
     public NativeBinaryRequirementResolveResult(Object input) {
@@ -43,11 +43,11 @@ public NativeLibraryRequirement getRequirement() {
         return requirement;
     }
 
-    public LibraryBinary getLibraryBinary() {
+    public NativeLibraryBinary getLibraryBinary() {
         return libraryBinary;
     }
 
-    public void setLibraryBinary(LibraryBinaryInternal libraryBinary) {
+    public void setLibraryBinary(NativeLibraryBinaryInternal libraryBinary) {
         this.libraryBinary = libraryBinary;
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryResolveResult.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryResolveResult.java
index df7a26869bc6..2c266a753b59 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryResolveResult.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeBinaryResolveResult.java
@@ -18,7 +18,7 @@
 
 import org.gradle.api.Transformer;
 import org.gradle.api.specs.Spec;
-import org.gradle.nativebinaries.LibraryBinary;
+import org.gradle.nativebinaries.NativeLibraryBinary;
 import org.gradle.nativebinaries.NativeDependencySet;
 import org.gradle.nativebinaries.ProjectNativeBinary;
 import org.gradle.util.CollectionUtils;
@@ -54,8 +54,8 @@ public NativeDependencySet transform(NativeBinaryRequirementResolveResult origin
         });
     }
 
-    public List<LibraryBinary> getAllLibraryBinaries() {
-        List<LibraryBinary> result = new ArrayList<LibraryBinary>();
+    public List<NativeLibraryBinary> getAllLibraryBinaries() {
+        List<NativeLibraryBinary> result = new ArrayList<NativeLibraryBinary>();
         for (NativeBinaryRequirementResolveResult resolution : getAllResolutions()) {
             if (resolution.getLibraryBinary() != null) {
                 result.add(resolution.getLibraryBinary());
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParser.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParser.java
index 16ae8b1c6309..24baa4713dd7 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParser.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParser.java
@@ -18,7 +18,7 @@
 
 import org.gradle.api.tasks.Optional;
 import org.gradle.internal.typeconversion.*;
-import org.gradle.nativebinaries.Library;
+import org.gradle.nativebinaries.NativeLibrary;
 import org.gradle.nativebinaries.NativeLibraryRequirement;
 import org.gradle.nativebinaries.internal.ProjectNativeLibraryRequirement;
 
@@ -33,13 +33,13 @@ public static NotationParser<Object, NativeLibraryRequirement> parser() {
                 .toComposite();
     }
 
-    private static class LibraryConverter extends TypedNotationParser<Library, NativeLibraryRequirement> {
+    private static class LibraryConverter extends TypedNotationParser<NativeLibrary, NativeLibraryRequirement> {
         private LibraryConverter() {
-            super(Library.class);
+            super(NativeLibrary.class);
         }
 
         @Override
-        protected NativeLibraryRequirement parseType(Library notation) {
+        protected NativeLibraryRequirement parseType(NativeLibrary notation) {
             return notation.getShared();
         }
     }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocator.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocator.java
index 57630050cb7d..cf65308d53a5 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocator.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocator.java
@@ -17,8 +17,9 @@
 
 import org.gradle.api.DomainObjectSet;
 import org.gradle.api.Project;
-import org.gradle.nativebinaries.LibraryContainer;
+import org.gradle.runtime.base.ProjectComponentContainer;
 import org.gradle.nativebinaries.NativeBinary;
+import org.gradle.nativebinaries.NativeLibrary;
 import org.gradle.nativebinaries.NativeLibraryRequirement;
 
 public class ProjectLibraryBinaryLocator implements LibraryBinaryLocator {
@@ -30,11 +31,11 @@ public ProjectLibraryBinaryLocator(ProjectLocator projectLocator) {
 
     public DomainObjectSet<NativeBinary> getBinaries(NativeLibraryRequirement requirement) {
         Project project = findProject(requirement);
-        LibraryContainer libraryContainer = (LibraryContainer) project.getExtensions().findByName("libraries");
-        if (libraryContainer == null) {
+        ProjectComponentContainer projectComponentContainer = project.getExtensions().findByType(ProjectComponentContainer.class);
+        if (projectComponentContainer == null) {
             throw new LibraryResolveException(String.format("Project does not have a libraries container: '%s'", project.getPath()));
         }
-        return libraryContainer.getByName(requirement.getLibraryName()).getBinaries();
+        return projectComponentContainer.withType(NativeLibrary.class).getByName(requirement.getLibraryName()).getBinaries();
     }
 
     private Project findProject(NativeLibraryRequirement requirement) {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPlugin.groovy
deleted file mode 100644
index 7822937fda8f..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPlugin.groovy
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.assembler.plugins
-
-import org.gradle.api.Incubating
-import org.gradle.api.Plugin
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.language.assembler.AssemblerSourceSet
-import org.gradle.language.assembler.plugins.AssemblerLangPlugin
-import org.gradle.nativebinaries.Executable
-import org.gradle.nativebinaries.Library
-import org.gradle.nativebinaries.ProjectNativeBinary
-import org.gradle.nativebinaries.ProjectNativeComponent
-import org.gradle.nativebinaries.internal.DefaultTool
-import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
-import org.gradle.nativebinaries.language.assembler.tasks.Assemble
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
-
-/**
- * A plugin for projects wishing to build native binary components from Assembly language sources.
- *
- * <p>Automatically includes the {@link AssemblerLangPlugin} for core Assembler support and the {@link NativeBinariesPlugin} for native binary support.</p>
- *
- * <li>Creates a {@link Assemble} task for each {@link AssemblerSourceSet} to assemble the sources.</li>
- */
-@Incubating
-class AssemblerNativeBinariesPlugin implements Plugin<ProjectInternal> {
-
-    void apply(ProjectInternal project) {
-        project.plugins.apply(NativeBinariesPlugin)
-        project.plugins.apply(AssemblerLangPlugin)
-
-        // TODO:DAZ Clean this up (see CppNativeBinariesPlugin)
-        project.executables.all { Executable executable ->
-            addLanguageExtensionsToComponent(executable)
-        }
-        project.libraries.all { Library library ->
-            addLanguageExtensionsToComponent(library)
-        }
-
-        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinaryInternal binary ->
-            binary.source.withType(AssemblerSourceSet).all { AssemblerSourceSet sourceSet ->
-                if (sourceSet.mayHaveSources) {
-                    def assembleTask = createAssembleTask(project, binary, sourceSet)
-                    assembleTask.dependsOn sourceSet
-                    binary.tasks.add assembleTask
-                    binary.tasks.builder.source assembleTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
-                }
-            }
-        }
-    }
-
-    private def addLanguageExtensionsToComponent(ProjectNativeComponent component) {
-        component.binaries.all { binary ->
-            binary.extensions.create("assembler", DefaultTool)
-        }
-    }
-
-    private def createAssembleTask(ProjectInternal project, ProjectNativeBinaryInternal binary, def sourceSet) {
-        def assembleTask = project.task(binary.namingScheme.getTaskName("assemble", sourceSet.fullName), type: Assemble) {
-            description = "Assembles the $sourceSet of $binary"
-        }
-
-        assembleTask.toolChain = binary.toolChain
-        assembleTask.targetPlatform = binary.targetPlatform
-
-        assembleTask.source sourceSet.source
-
-        assembleTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
-        assembleTask.assemblerArgs = binary.assembler.args
-
-        assembleTask
-    }
-
-}
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPlugin.groovy
index 9b38fd537f2d..1ef721223473 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPlugin.groovy
@@ -14,22 +14,105 @@
  * limitations under the License.
  */
 package org.gradle.nativebinaries.language.assembler.plugins
-
+import org.gradle.api.Action
 import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.nativebinaries.toolchain.internal.plugins.StandardToolChainsPlugin
+import org.gradle.language.assembler.AssemblerSourceSet
+import org.gradle.language.assembler.plugins.AssemblerLangPlugin
+import org.gradle.model.ModelRule
+import org.gradle.model.ModelRules
+import org.gradle.nativebinaries.ProjectNativeBinary
+import org.gradle.nativebinaries.ProjectNativeComponent
+import org.gradle.nativebinaries.internal.DefaultTool
+import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
+import org.gradle.nativebinaries.language.assembler.tasks.Assemble
+import org.gradle.nativebinaries.plugins.NativeComponentPlugin
+import org.gradle.nativebinaries.toolchain.Clang
+import org.gradle.nativebinaries.toolchain.Gcc
+import org.gradle.nativebinaries.toolchain.VisualCpp
+import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
+import org.gradle.nativebinaries.toolchain.internal.ToolType
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultCommandLineToolConfiguration
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultGccCommandLineToolConfiguration
 
+import javax.inject.Inject
 /**
  * A plugin for projects wishing to build native binary components from Assembly language sources.
  *
- * <p>Adds core tool chain support to the {@link AssemblerNativeBinariesPlugin}.</p>
+ * <p>Automatically includes the {@link AssemblerLangPlugin} for core Assembler support and the {@link NativeComponentPlugin} for native component support.</p>
+ *
+ * <li>Creates a {@link Assemble} task for each {@link AssemblerSourceSet} to assemble the sources.</li>
  */
 @Incubating
 class AssemblerPlugin implements Plugin<ProjectInternal> {
 
+    private ModelRules modelRules
+
+    @Inject
+    public AssemblerPlugin(ModelRules modelRules){
+        this.modelRules = modelRules
+    }
+
     void apply(ProjectInternal project) {
-        project.plugins.apply(StandardToolChainsPlugin)
-        project.plugins.apply(AssemblerNativeBinariesPlugin)
+        project.plugins.apply(NativeComponentPlugin)
+        project.plugins.apply(AssemblerLangPlugin)
+
+        modelRules.rule(new ModelRule() {
+            void addAssembler(ToolChainRegistryInternal toolChainRegistry) {
+                toolChainRegistry.withType(Clang).all(new Action<Clang>(){
+                    void execute(Clang toolchain) {
+                        toolchain.add(new DefaultGccCommandLineToolConfiguration("assembler", ToolType.ASSEMBLER, "as"));
+                    }
+                })
+
+                toolChainRegistry.withType(Gcc).all(new Action<Gcc>(){
+                    void execute(Gcc toolchain) {
+                        toolchain.add(new DefaultGccCommandLineToolConfiguration("assembler", ToolType.ASSEMBLER, "as"));
+                    }
+                })
+
+                toolChainRegistry.withType(VisualCpp).all(new Action<VisualCpp>(){
+                    void execute(VisualCpp toolchain) {
+                        toolchain.add(new DefaultCommandLineToolConfiguration("assembler"));
+
+                    }
+                })
+            }
+        });
+
+        project.nativeComponents.all { ProjectNativeComponent component ->
+            component.binaries.all { binary ->
+                binary.extensions.create("assembler", DefaultTool)
+            }
+        }
+
+        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinaryInternal binary ->
+            binary.source.withType(AssemblerSourceSet).all { AssemblerSourceSet sourceSet ->
+                if (sourceSet.mayHaveSources) {
+                    def assembleTask = createAssembleTask(project, binary, sourceSet)
+                    assembleTask.dependsOn sourceSet
+                    binary.tasks.add assembleTask
+                    binary.tasks.createOrLink.source assembleTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
+                }
+            }
+        }
+    }
+
+
+    private def createAssembleTask(ProjectInternal project, ProjectNativeBinaryInternal binary, def sourceSet) {
+        def assembleTask = project.task(binary.namingScheme.getTaskName("assemble", sourceSet.fullName), type: Assemble) {
+            description = "Assembles the $sourceSet of $binary"
+        }
+
+        assembleTask.toolChain = binary.toolChain
+        assembleTask.targetPlatform = binary.targetPlatform
+
+        assembleTask.source sourceSet.source
+
+        assembleTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
+        assembleTask.assemblerArgs = binary.assembler.args
+
+        assembleTask
     }
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/tasks/Assemble.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/tasks/Assemble.groovy
index 2984112d92eb..cf6d8f9ff4db 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/tasks/Assemble.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/assembler/tasks/Assemble.groovy
@@ -81,7 +81,7 @@ class Assemble extends DefaultTask {
         spec.source getSource()
         spec.args getAssemblerArgs()
 
-        def result = toolChain.target(targetPlatform).createAssembler().execute(spec)
+        def result = toolChain.select(targetPlatform).createAssembler().execute(spec)
         didWork = result.didWork
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/AbstractIncrementalNativeCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/AbstractIncrementalNativeCompiler.java
deleted file mode 100644
index cd4329136f9f..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/AbstractIncrementalNativeCompiler.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.c.internal.incremental;
-
-import org.gradle.api.internal.TaskInternal;
-import org.gradle.api.internal.changedetection.state.FileSnapshotter;
-import org.gradle.api.internal.changedetection.state.TaskArtifactStateCacheAccess;
-import org.gradle.api.internal.tasks.compile.Compiler;
-import org.gradle.api.tasks.WorkResult;
-import org.gradle.cache.PersistentIndexedCache;
-import org.gradle.cache.PersistentStateCache;
-import org.gradle.internal.Factory;
-import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec;
-import org.gradle.util.CollectionUtils;
-
-import java.io.File;
-
-abstract class AbstractIncrementalNativeCompiler implements Compiler<NativeCompileSpec> {
-    private final TaskInternal task;
-    private final SourceIncludesParser sourceIncludesParser;
-    private final TaskArtifactStateCacheAccess cacheAccess;
-    private final FileSnapshotter fileSnapshotter;
-    private Iterable<File> includes;
-
-    protected AbstractIncrementalNativeCompiler(TaskInternal task, SourceIncludesParser sourceIncludesParser, Iterable<File> includes,
-                                                TaskArtifactStateCacheAccess cacheAccess, FileSnapshotter fileSnapshotter) {
-        this.task = task;
-        this.includes = includes;
-        this.sourceIncludesParser = sourceIncludesParser;
-        this.cacheAccess = cacheAccess;
-        this.fileSnapshotter = fileSnapshotter;
-    }
-
-    public WorkResult execute(final NativeCompileSpec spec) {
-        return cacheAccess.useCache("incremental compile", new Factory<WorkResult>() {
-            public WorkResult create() {
-                IncrementalCompileProcessor processor = createProcessor(includes);
-                return doIncrementalCompile(processor, spec);
-            }
-        });
-    }
-
-    protected abstract WorkResult doIncrementalCompile(IncrementalCompileProcessor processor, NativeCompileSpec spec);
-
-    protected TaskInternal getTask() {
-        return task;
-    }
-
-    private IncrementalCompileProcessor createProcessor(Iterable<File> includes) {
-        PersistentStateCache<CompilationState> compileStateCache = createCompileStateCache(task.getPath());
-
-        DefaultSourceIncludesResolver dependencyParser = new DefaultSourceIncludesResolver(CollectionUtils.toList(includes));
-
-        return new IncrementalCompileProcessor(compileStateCache, dependencyParser, sourceIncludesParser, fileSnapshotter);
-    }
-
-    private PersistentStateCache<CompilationState> createCompileStateCache(final String taskPath) {
-        final PersistentIndexedCache<String, CompilationState> stateIndexedCache = cacheAccess.createCache("compilationState", String.class, new CompilationStateSerializer());
-        return new PersistentStateCache<CompilationState>() {
-            public CompilationState get() {
-                return stateIndexedCache.get(taskPath);
-            }
-
-            public void set(CompilationState newValue) {
-                stateIndexedCache.put(taskPath, newValue);
-            }
-
-            public void update(UpdateAction<CompilationState> updateAction) {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompiler.java
deleted file mode 100644
index 9eef6670f1cf..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompiler.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.c.internal.incremental;
-
-import org.gradle.api.internal.TaskInternal;
-import org.gradle.api.internal.changedetection.state.FileSnapshotter;
-import org.gradle.api.internal.changedetection.state.TaskArtifactStateCacheAccess;
-import org.gradle.api.internal.tasks.SimpleWorkResult;
-import org.gradle.api.internal.tasks.compile.Compiler;
-import org.gradle.api.tasks.WorkResult;
-import org.gradle.language.jvm.internal.SimpleStaleClassCleaner;
-import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec;
-
-import java.io.File;
-
-public class CleanCompilingNativeCompiler extends AbstractIncrementalNativeCompiler {
-    private final Compiler<NativeCompileSpec> delegateCompiler;
-
-    public CleanCompilingNativeCompiler(TaskInternal task, SourceIncludesParser sourceIncludesParser, Iterable<File> includes,
-                                        TaskArtifactStateCacheAccess cacheAccess, FileSnapshotter fileSnapshotter,
-                                        Compiler<NativeCompileSpec> delegateCompiler) {
-        super(task, sourceIncludesParser, includes, cacheAccess, fileSnapshotter);
-        this.delegateCompiler = delegateCompiler;
-    }
-
-    @Override
-    protected WorkResult doIncrementalCompile(IncrementalCompileProcessor processor, NativeCompileSpec spec) {
-        processor.processSourceFiles(spec.getSourceFiles());
-        boolean deleted = cleanPreviousOutputs(spec);
-        WorkResult compileResult = delegateCompiler.execute(spec);
-        if (deleted && !compileResult.getDidWork()) {
-            return new SimpleWorkResult(deleted);
-        }
-        return compileResult;
-    }
-
-    private boolean cleanPreviousOutputs(NativeCompileSpec spec) {
-        SimpleStaleClassCleaner cleaner = new SimpleStaleClassCleaner(getTask().getOutputs());
-        cleaner.setDestinationDir(spec.getObjectFileDir());
-        cleaner.execute();
-        return cleaner.getDidWork();
-    }
-
-}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesResolver.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesResolver.java
index 6c93b35332e4..2948b30677fe 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesResolver.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/DefaultSourceIncludesResolver.java
@@ -57,7 +57,6 @@ private void searchForDependencies(Set<ResolvedInclude> dependencies, List<File>
     private void searchForDependency(Set<ResolvedInclude> dependencies, List<File> searchPath, String include) {
         for (File searchDir : searchPath) {
             File candidate = new File(searchDir, include);
-            // TODO:DAZ This means that we'll never detect changed files if they are not on the defined include path
             if (candidate.isFile()) {
                 dependencies.add(new ResolvedInclude(include, GFileUtils.canonicalise(candidate)));
                 return;
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompileProcessor.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompileProcessor.java
index d65c60669afc..1d9aca7a88a1 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompileProcessor.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompileProcessor.java
@@ -88,7 +88,6 @@ public boolean checkChangedAndUpdateState(File file) {
             CompilationFileState previousState = previous.getState(file);
             CompilationFileState newState = new CompilationFileState(snapshotter.snapshot(file).getHash());
 
-            // TODO:DAZ Keep a separate, build-scoped cache of file -> parsed includes. This would prevent need for reparsing per-variant and per-component.
             if (!sameHash(previousState, newState)) {
                 changed = true;
                 newState.setSourceIncludes(sourceIncludesParser.parseIncludes(file));
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompilerBuilder.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompilerBuilder.java
index c08e45483d95..09c4a9d29d23 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompilerBuilder.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalCompilerBuilder.java
@@ -19,57 +19,18 @@
 import org.gradle.api.internal.changedetection.state.FileSnapshotter;
 import org.gradle.api.internal.changedetection.state.TaskArtifactStateCacheAccess;
 import org.gradle.api.internal.tasks.compile.Compiler;
-import org.gradle.nativebinaries.language.c.internal.incremental.sourceparser.CSourceParser;
-import org.gradle.nativebinaries.language.c.internal.incremental.sourceparser.RegexBackedCSourceParser;
-import org.gradle.nativebinaries.language.objectivec.tasks.ObjectiveCCompile;
-import org.gradle.nativebinaries.language.objectivecpp.tasks.ObjectiveCppCompile;
 import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec;
 
-import java.io.File;
-
 public class IncrementalCompilerBuilder {
-    private final TaskInternal task;
     private final TaskArtifactStateCacheAccess cacheAccess;
-    private final SourceIncludesParser sourceIncludesParser;
     private final FileSnapshotter fileSnapshotter;
-    private boolean cleanCompile;
-    private Iterable<File> includes;
 
-    public IncrementalCompilerBuilder(TaskArtifactStateCacheAccess cacheAccess, FileSnapshotter fileSnapshotter, TaskInternal task) {
-        this.task = task;
-        this.sourceIncludesParser = createIncludesParser(task);
+    public IncrementalCompilerBuilder(TaskArtifactStateCacheAccess cacheAccess, FileSnapshotter fileSnapshotter) {
         this.cacheAccess = cacheAccess;
         this.fileSnapshotter = fileSnapshotter;
     }
 
-    private static SourceIncludesParser createIncludesParser(TaskInternal task) {
-        CSourceParser sourceParser = new RegexBackedCSourceParser();
-        boolean importsAreIncludes = ObjectiveCCompile.class.isAssignableFrom(task.getClass()) || ObjectiveCppCompile.class.isAssignableFrom(task.getClass());
-        return new DefaultSourceIncludesParser(sourceParser, importsAreIncludes);
-    }
-
-    public IncrementalCompilerBuilder withCleanCompile() {
-        this.cleanCompile = true;
-        return this;
-    }
-
-    public IncrementalCompilerBuilder withIncludes(Iterable<File> includes) {
-        this.includes = includes;
-        return this;
-    }
-
-    public Compiler<NativeCompileSpec> createIncrementalCompiler(Compiler<NativeCompileSpec> compiler) {
-        if (cleanCompile) {
-            return createCleaningCompiler(compiler, task, includes);
-        }
-        return createIncrementalCompiler(compiler, task, includes);
-    }
-
-    private Compiler<NativeCompileSpec> createIncrementalCompiler(Compiler<NativeCompileSpec> compiler, TaskInternal task, Iterable<File> includes) {
-        return new IncrementalNativeCompiler(task, sourceIncludesParser, includes, cacheAccess, fileSnapshotter, compiler);
-    }
-
-    private Compiler<NativeCompileSpec> createCleaningCompiler(Compiler<NativeCompileSpec> compiler, TaskInternal task, Iterable<File> includes) {
-        return new CleanCompilingNativeCompiler(task, sourceIncludesParser, includes, cacheAccess, fileSnapshotter, compiler);
+    public Compiler<NativeCompileSpec> createIncrementalCompiler(TaskInternal task, Compiler<NativeCompileSpec> compiler) {
+        return new IncrementalNativeCompiler(task, cacheAccess, fileSnapshotter, compiler);
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompiler.java
index 1c8fa09cd464..c66fe93d1ea5 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompiler.java
@@ -18,28 +18,102 @@
 import org.gradle.api.internal.TaskInternal;
 import org.gradle.api.internal.changedetection.state.FileSnapshotter;
 import org.gradle.api.internal.changedetection.state.TaskArtifactStateCacheAccess;
+import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
+import org.gradle.cache.PersistentIndexedCache;
+import org.gradle.cache.PersistentStateCache;
+import org.gradle.internal.Factory;
+import org.gradle.language.jvm.internal.SimpleStaleClassCleaner;
+import org.gradle.nativebinaries.language.c.internal.incremental.sourceparser.CSourceParser;
+import org.gradle.nativebinaries.language.c.internal.incremental.sourceparser.RegexBackedCSourceParser;
+import org.gradle.nativebinaries.language.objectivec.internal.ObjectiveCCompileSpec;
+import org.gradle.nativebinaries.language.objectivecpp.internal.ObjectiveCppCompileSpec;
 import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec;
+import org.gradle.util.CollectionUtils;
 
 import java.io.File;
 
-public class IncrementalNativeCompiler extends AbstractIncrementalNativeCompiler {
+public class IncrementalNativeCompiler implements Compiler<NativeCompileSpec> {
     private final Compiler<NativeCompileSpec> delegateCompiler;
+    private final TaskInternal task;
+    private final TaskArtifactStateCacheAccess cacheAccess;
+    private final FileSnapshotter fileSnapshotter;
 
-    public IncrementalNativeCompiler(TaskInternal task, SourceIncludesParser sourceIncludesParser, Iterable<File> includes,
-                                     TaskArtifactStateCacheAccess cacheAccess, FileSnapshotter fileSnapshotter, Compiler<NativeCompileSpec> delegateCompiler) {
-        super(task, sourceIncludesParser, includes, cacheAccess, fileSnapshotter);
+    private final CSourceParser sourceParser = new RegexBackedCSourceParser();
+
+    public IncrementalNativeCompiler(TaskInternal task, TaskArtifactStateCacheAccess cacheAccess, FileSnapshotter fileSnapshotter, Compiler<NativeCompileSpec> delegateCompiler) {
+        this.task = task;
+        this.cacheAccess = cacheAccess;
+        this.fileSnapshotter = fileSnapshotter;
         this.delegateCompiler = delegateCompiler;
     }
 
-    @Override
-    protected WorkResult doIncrementalCompile(IncrementalCompileProcessor processor, NativeCompileSpec spec) {
-        IncrementalCompilation compilation = processor.processSourceFiles(spec.getSourceFiles());
+    public WorkResult execute(final NativeCompileSpec spec) {
+        IncrementalCompilation compilation = cacheAccess.useCache("process source files", new Factory<IncrementalCompilation>() {
+            public IncrementalCompilation create() {
+                boolean importsAreIncludes = ObjectiveCCompileSpec.class.isAssignableFrom(spec.getClass()) || ObjectiveCppCompileSpec.class.isAssignableFrom(spec.getClass());
+                DefaultSourceIncludesParser sourceIncludesParser = new DefaultSourceIncludesParser(sourceParser, importsAreIncludes);
+                IncrementalCompileProcessor processor = createProcessor(sourceIncludesParser, spec.getIncludeRoots());
+                // TODO - do not hold the lock while processing the source files - this prevents other tasks from executing concurrently
+                return processor.processSourceFiles(spec.getSourceFiles());
+            }
+        });
+        if (spec.isIncrementalCompile()) {
+            return doIncrementalCompile(compilation, spec);
+        }
+        return doCleanIncrementalCompile(spec);
+    }
 
+    protected WorkResult doIncrementalCompile(IncrementalCompilation compilation, NativeCompileSpec spec) {
         // Determine the actual sources to clean/compile
         spec.setSourceFiles(compilation.getRecompile());
         spec.setRemovedSourceFiles(compilation.getRemoved());
         return delegateCompiler.execute(spec);
     }
+
+    protected WorkResult doCleanIncrementalCompile(NativeCompileSpec spec) {
+        boolean deleted = cleanPreviousOutputs(spec);
+        WorkResult compileResult = delegateCompiler.execute(spec);
+        if (deleted && !compileResult.getDidWork()) {
+            return new SimpleWorkResult(deleted);
+        }
+        return compileResult;
+    }
+
+    private boolean cleanPreviousOutputs(NativeCompileSpec spec) {
+        SimpleStaleClassCleaner cleaner = new SimpleStaleClassCleaner(getTask().getOutputs());
+        cleaner.setDestinationDir(spec.getObjectFileDir());
+        cleaner.execute();
+        return cleaner.getDidWork();
+    }
+
+    protected TaskInternal getTask() {
+        return task;
+    }
+
+    private IncrementalCompileProcessor createProcessor(SourceIncludesParser sourceIncludesParser, Iterable<File> includes) {
+        PersistentStateCache<CompilationState> compileStateCache = createCompileStateCache(task.getPath());
+
+        DefaultSourceIncludesResolver dependencyParser = new DefaultSourceIncludesResolver(CollectionUtils.toList(includes));
+
+        return new IncrementalCompileProcessor(compileStateCache, dependencyParser, sourceIncludesParser, fileSnapshotter);
+    }
+
+    private PersistentStateCache<CompilationState> createCompileStateCache(final String taskPath) {
+        final PersistentIndexedCache<String, CompilationState> stateIndexedCache = cacheAccess.createCache("compilationState", String.class, new CompilationStateSerializer());
+        return new PersistentStateCache<CompilationState>() {
+            public CompilationState get() {
+                return stateIndexedCache.get(taskPath);
+            }
+
+            public void set(CompilationState newValue) {
+                stateIndexedCache.put(taskPath, newValue);
+            }
+
+            public void update(UpdateAction<CompilationState> updateAction) {
+                throw new UnsupportedOperationException();
+            }
+        };
+    }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParser.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParser.java
index 8d051c3175d3..5cbfff2e6f94 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParser.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParser.java
@@ -25,9 +25,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-// TODO:DAZ We might be better with a hand-crafter parser
 public class RegexBackedCSourceParser implements CSourceParser {
-    private static final String INCLUDE_IMPORT_PATTERN = "\\s*#\\s*(include|import)\\s+((<[^>]+>)|(\"[^\"]+\")|(\\w+))";
+    private static final String INCLUDE_IMPORT_PATTERN = "\\s*#\\s*(include|import)\\s+((<[^>]+>)|(\"[^\"]+\")|(\\w+))\\s*";
     private final Pattern includePattern;
 
     public RegexBackedCSourceParser() {
@@ -49,7 +48,7 @@ private void parseFile(File file, DefaultSourceDetails sourceDetails) {
                 while ((line = bf.readLine()) != null) {
                     Matcher m = includePattern.matcher(line);
 
-                    if (m.lookingAt()) {
+                    if (m.matches()) {
                         boolean isImport = "import".equals(m.group(1));
                         String value = m.group(2);
                         if (isImport) {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPlugin.groovy
deleted file mode 100644
index 53427c961b74..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPlugin.groovy
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.c.plugins
-import org.gradle.api.Incubating
-import org.gradle.api.Plugin
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.language.c.CSourceSet
-import org.gradle.language.c.plugins.CLangPlugin
-import org.gradle.nativebinaries.*
-import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
-import org.gradle.nativebinaries.language.c.tasks.CCompile
-import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
-/**
- * A plugin for projects wishing to build native binary components from C sources.
- *
- * <p>Automatically includes the {@link CLangPlugin} for core C++ support and the {@link NativeBinariesPlugin} for native binary support.</p>
- *
- * <li>Creates a {@link CCompile} task for each {@link CSourceSet} to compile the C sources.</li>
- */
-@Incubating
-class CNativeBinariesPlugin implements Plugin<ProjectInternal> {
-
-    void apply(ProjectInternal project) {
-        project.plugins.apply(NativeBinariesPlugin)
-        project.plugins.apply(CLangPlugin)
-
-        // TODO:DAZ Clean this up (see CppNativeBinariesPlugin)
-        project.executables.all { Executable executable ->
-            addLanguageExtensionsToComponent(executable)
-        }
-        project.libraries.all { Library library ->
-            addLanguageExtensionsToComponent(library)
-        }
-
-        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinaryInternal binary ->
-            binary.source.withType(CSourceSet).all { CSourceSet sourceSet ->
-                if (sourceSet.mayHaveSources) {
-                    def compileTask = createCompileTask(project, binary, sourceSet)
-                    compileTask.dependsOn sourceSet
-                    binary.tasks.add compileTask
-                    binary.tasks.builder.source compileTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
-                }
-            }
-        }
-    }
-
-    private def addLanguageExtensionsToComponent(ProjectNativeComponent component) {
-        component.binaries.all { binary ->
-            binary.extensions.create("cCompiler", DefaultPreprocessingTool)
-        }
-    }
-
-    private def createCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, CSourceSet sourceSet) {
-        def compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: CCompile) {
-            description = "Compiles the $sourceSet of $binary"
-        }
-
-        compileTask.toolChain = binary.toolChain
-        compileTask.targetPlatform = binary.targetPlatform
-        compileTask.positionIndependentCode = binary instanceof SharedLibraryBinary
-
-        compileTask.includes {
-            sourceSet.exportedHeaders.srcDirs
-        }
-        compileTask.includes {
-            binary.getLibs(sourceSet)*.includeRoots
-        }
-        compileTask.source sourceSet.source
-
-        compileTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
-        compileTask.macros = binary.cCompiler.macros
-        compileTask.compilerArgs = binary.cCompiler.args
-
-        compileTask
-    }
-
-}
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CPlugin.groovy
index bcefa8534296..c3652743e850 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/plugins/CPlugin.groovy
@@ -18,18 +18,67 @@ package org.gradle.nativebinaries.language.c.plugins
 import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.nativebinaries.toolchain.internal.plugins.StandardToolChainsPlugin
+import org.gradle.language.c.CSourceSet
+import org.gradle.language.c.plugins.CLangPlugin
+import org.gradle.nativebinaries.ProjectNativeBinary
+import org.gradle.nativebinaries.SharedLibraryBinary
+import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
+import org.gradle.nativebinaries.language.c.tasks.CCompile
+import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
+import org.gradle.nativebinaries.plugins.NativeComponentPlugin
 
 /**
  * A plugin for projects wishing to build native binary components from C sources.
  *
- * <p>Adds core tool chain support to the {@link CNativeBinariesPlugin}.</p>
+ * <p>Automatically includes the {@link CLangPlugin} for core C++ support and the {@link org.gradle.nativebinaries.plugins.NativeComponentPlugin} for native component support.</p>
+ *
+ * <li>Creates a {@link CCompile} task for each {@link CSourceSet} to compile the C sources.</li>
  */
 @Incubating
 class CPlugin implements Plugin<ProjectInternal> {
-
     void apply(ProjectInternal project) {
-        project.plugins.apply(StandardToolChainsPlugin)
-        project.plugins.apply(CNativeBinariesPlugin)
+        project.plugins.apply(NativeComponentPlugin)
+        project.plugins.apply(CLangPlugin)
+
+        project.nativeComponents.all { component ->
+            component.binaries.all { binary ->
+                binary.extensions.create("cCompiler", DefaultPreprocessingTool)
+            }
+        }
+
+        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinaryInternal binary ->
+            binary.source.withType(CSourceSet).all { CSourceSet sourceSet ->
+                if (sourceSet.mayHaveSources) {
+                    def compileTask = createCompileTask(project, binary, sourceSet)
+                    compileTask.dependsOn sourceSet
+                    binary.tasks.add compileTask
+                    binary.tasks.createOrLink.source compileTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
+                }
+            }
+        }
+    }
+
+    private def createCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, CSourceSet sourceSet) {
+        def compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: CCompile) {
+            description = "Compiles the $sourceSet of $binary"
+        }
+
+        compileTask.toolChain = binary.toolChain
+        compileTask.targetPlatform = binary.targetPlatform
+        compileTask.positionIndependentCode = binary instanceof SharedLibraryBinary
+
+        compileTask.includes {
+            sourceSet.exportedHeaders.srcDirs
+        }
+        compileTask.includes {
+            binary.getLibs(sourceSet)*.includeRoots
+        }
+        compileTask.source sourceSet.source
+
+        compileTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
+        compileTask.macros = binary.cCompiler.macros
+        compileTask.compilerArgs = binary.cCompiler.args
+
+        compileTask
     }
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/tasks/AbstractNativeCompileTask.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/tasks/AbstractNativeCompileTask.groovy
index 0a09f662ca76..3de2af9f3002 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/tasks/AbstractNativeCompileTask.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/c/tasks/AbstractNativeCompileTask.groovy
@@ -18,8 +18,6 @@ package org.gradle.nativebinaries.language.c.tasks
 import org.gradle.api.DefaultTask
 import org.gradle.api.Incubating
 import org.gradle.api.file.FileCollection
-import org.gradle.api.internal.changedetection.state.FileSnapshotter
-import org.gradle.api.internal.changedetection.state.TaskArtifactStateCacheAccess
 import org.gradle.api.internal.tasks.compile.Compiler
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFiles
@@ -33,13 +31,12 @@ import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec
 import org.gradle.nativebinaries.toolchain.internal.PlatformToolChain
 
 import javax.inject.Inject
+
 /**
  * Compiles native source files into object files.
  */
 @Incubating
 abstract class AbstractNativeCompileTask extends DefaultTask {
-    private final IncrementalCompilerBuilder incrementalCompilerBuilder
-
     /**
      * The tool chain used for compilation.
      */
@@ -92,14 +89,16 @@ abstract class AbstractNativeCompileTask extends DefaultTask {
     @Input
     List<String> compilerArgs
 
-    @Inject
     AbstractNativeCompileTask() {
-        incrementalCompilerBuilder = new IncrementalCompilerBuilder(services.get(TaskArtifactStateCacheAccess),
-                                                                    services.get(FileSnapshotter), this)
         includes = project.files()
         source = project.files()
     }
 
+    @Inject
+    IncrementalCompilerBuilder getIncrementalCompilerBuilder(){
+        throw new UnsupportedOperationException()
+    }
+
     @TaskAction
     void compile(IncrementalTaskInputs inputs) {
 
@@ -111,16 +110,12 @@ abstract class AbstractNativeCompileTask extends DefaultTask {
         spec.macros = getMacros()
         spec.args getCompilerArgs()
         spec.positionIndependentCode = isPositionIndependentCode()
+        spec.incrementalCompile = inputs.incremental
 
-        PlatformToolChain platformToolChain = toolChain.target(targetPlatform)
-        if (!inputs.incremental) {
-            incrementalCompilerBuilder.withCleanCompile()
-        }
-        incrementalCompilerBuilder.withIncludes(includes)
+        PlatformToolChain platformToolChain = toolChain.select(targetPlatform)
         final compiler = createCompiler(platformToolChain)
-        final incrementalCompiler = incrementalCompilerBuilder.createIncrementalCompiler(compiler)
 
-        def result = incrementalCompiler.execute(spec)
+        def result = incrementalCompilerBuilder.createIncrementalCompiler(this, compiler).execute(spec)
         didWork = result.didWork
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPlugin.groovy
deleted file mode 100644
index 6d68b09c0d56..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPlugin.groovy
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.cpp.plugins
-import org.gradle.api.Incubating
-import org.gradle.api.Plugin
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.language.cpp.CppSourceSet
-import org.gradle.language.cpp.plugins.CppLangPlugin
-import org.gradle.nativebinaries.*
-import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
-import org.gradle.nativebinaries.language.cpp.tasks.CppCompile
-import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
-/**
- * A plugin for projects wishing to build native binary components from C++ sources.
- *
- * <p>Automatically includes the {@link org.gradle.language.cpp.plugins.CppLangPlugin} for core C++ support and the {@link NativeBinariesPlugin} for native binary support.</p>
- *
- * <li>Creates a {@link CppCompile} task for each {@link CppSourceSet} to compile the C++ sources.</li>
- */
-@Incubating
-class CppNativeBinariesPlugin implements Plugin<ProjectInternal> {
-
-    void apply(ProjectInternal project) {
-        project.plugins.apply(NativeBinariesPlugin)
-        project.plugins.apply(CppLangPlugin)
-
-        // TODO:DAZ It's ugly that we can't do this as project.binaries.all, but this is the way I could
-        // add the cppCompiler in time to allow it to be configured within the component.binaries.all block.
-        project.executables.all { Executable executable ->
-            executable.binaries.all { binary ->
-                binary.extensions.create("cppCompiler", DefaultPreprocessingTool)
-            }
-        }
-        project.libraries.all { Library library ->
-            library.binaries.all { binary ->
-                binary.extensions.create("cppCompiler", DefaultPreprocessingTool)
-            }
-        }
-
-        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinaryInternal binary ->
-            binary.source.withType(CppSourceSet).all { CppSourceSet sourceSet ->
-                if (sourceSet.mayHaveSources) {
-                    def compileTask = createCompileTask(project, binary, sourceSet)
-                    compileTask.dependsOn sourceSet
-                    binary.tasks.add compileTask
-                    binary.tasks.builder.source compileTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
-                }
-            }
-        }
-    }
-
-    private def createCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, CppSourceSet sourceSet) {
-        def compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: CppCompile) {
-            description = "Compiles the $sourceSet of $binary"
-        }
-
-        compileTask.toolChain = binary.toolChain
-        compileTask.targetPlatform = binary.targetPlatform
-        compileTask.positionIndependentCode = binary instanceof SharedLibraryBinary
-
-        compileTask.includes {
-            sourceSet.exportedHeaders.srcDirs
-        }
-        compileTask.includes {
-            binary.getLibs(sourceSet)*.includeRoots
-        }
-        compileTask.source sourceSet.source
-
-        compileTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
-        compileTask.macros = binary.cppCompiler.macros
-        compileTask.compilerArgs = binary.cppCompiler.args
-
-        compileTask
-    }
-}
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPlugin.groovy
index 7f2c32298afe..466f2e238778 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPlugin.groovy
@@ -18,18 +18,68 @@ package org.gradle.nativebinaries.language.cpp.plugins
 import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.nativebinaries.toolchain.internal.plugins.StandardToolChainsPlugin
+import org.gradle.language.cpp.CppSourceSet
+import org.gradle.language.cpp.plugins.CppLangPlugin
+import org.gradle.nativebinaries.ProjectNativeBinary
+import org.gradle.nativebinaries.ProjectNativeComponent
+import org.gradle.nativebinaries.SharedLibraryBinary
+import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
+import org.gradle.nativebinaries.language.cpp.tasks.CppCompile
+import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
+import org.gradle.nativebinaries.plugins.NativeComponentPlugin
 
 /**
  * A plugin for projects wishing to build native binary components from C++ sources.
  *
- * <p>Adds core tool chain support to the {@link CppNativeBinariesPlugin}.</p>
+ * <p>Automatically includes the {@link CppLangPlugin} for core C++ support and the {@link NativeComponentPlugin} for native component support.</p>
+ *
+ * <li>Creates a {@link CppCompile} task for each {@link CppSourceSet} to compile the C++ sources.</li>
  */
 @Incubating
 class CppPlugin implements Plugin<ProjectInternal> {
-
     void apply(ProjectInternal project) {
-        project.plugins.apply(StandardToolChainsPlugin)
-        project.plugins.apply(CppNativeBinariesPlugin)
+        project.plugins.apply(NativeComponentPlugin)
+        project.plugins.apply(CppLangPlugin)
+
+        project.nativeComponents.all { ProjectNativeComponent component ->
+            component.binaries.all { binary ->
+                binary.extensions.create("cppCompiler", DefaultPreprocessingTool)
+            }
+        }
+
+        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinaryInternal binary ->
+            binary.source.withType(CppSourceSet).all { CppSourceSet sourceSet ->
+                if (sourceSet.mayHaveSources) {
+                    def compileTask = createCompileTask(project, binary, sourceSet)
+                    compileTask.dependsOn sourceSet
+                    binary.tasks.add compileTask
+                    binary.tasks.createOrLink.source compileTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
+                }
+            }
+        }
+    }
+
+    private def createCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, CppSourceSet sourceSet) {
+        def compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: CppCompile) {
+            description = "Compiles the $sourceSet of $binary"
+        }
+
+        compileTask.toolChain = binary.toolChain
+        compileTask.targetPlatform = binary.targetPlatform
+        compileTask.positionIndependentCode = binary instanceof SharedLibraryBinary
+
+        compileTask.includes {
+            sourceSet.exportedHeaders.srcDirs
+        }
+        compileTask.includes {
+            binary.getLibs(sourceSet)*.includeRoots
+        }
+        compileTask.source sourceSet.source
+
+        compileTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
+        compileTask.macros = binary.cppCompiler.macros
+        compileTask.compilerArgs = binary.cppCompiler.args
+
+        compileTask
     }
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/internal/AbstractNativeCompileSpec.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/internal/AbstractNativeCompileSpec.java
index 74112f357a86..5344dce325d0 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/internal/AbstractNativeCompileSpec.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/internal/AbstractNativeCompileSpec.java
@@ -27,6 +27,7 @@ public abstract class AbstractNativeCompileSpec extends AbstractBinaryToolSpec i
     private List<File> includeRoots = new ArrayList<File>();
     private List<File> sourceFiles = new ArrayList<File>();
     private List<File> removedSourceFiles = new ArrayList<File>();
+    private boolean incrementalCompile;
     private Map<String, String> macros = new LinkedHashMap<String, String>();
     private File objectFileDir;
     private boolean positionIndependentCode;
@@ -69,6 +70,14 @@ public void setRemovedSourceFiles(Collection<File> sources) {
         removedSourceFiles.addAll(sources);
     }
 
+    public boolean isIncrementalCompile() {
+        return incrementalCompile;
+    }
+
+    public void setIncrementalCompile(boolean flag) {
+        incrementalCompile = flag;
+    }
+
     public File getObjectFileDir() {
         return objectFileDir;
     }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPlugin.groovy
deleted file mode 100644
index ea340e8290a6..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPlugin.groovy
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.objectivec.plugins
-
-import org.gradle.api.Incubating
-import org.gradle.api.Plugin
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.language.objectivec.ObjectiveCSourceSet
-import org.gradle.language.objectivec.plugins.ObjectiveCLangPlugin
-import org.gradle.nativebinaries.*
-import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
-import org.gradle.nativebinaries.language.objectivec.tasks.ObjectiveCCompile
-import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
-/**
- * A plugin for projects wishing to build native binary components from Objective-C sources.
- *
- * <p>Automatically includes the {@link org.gradle.language.objectivec.plugins.ObjectiveCLangPlugin} for core Objective-C support and the {@link NativeBinariesPlugin} for native binary support.</p>
- *
- * <li>Creates a {@link ObjectiveCCompile} task for each {@link ObjectiveCSourceSet} to compile the Objective-C sources.</li>
- */
-@Incubating
-class ObjectiveCNativeBinariesPlugin implements Plugin<ProjectInternal> {
-
-    void apply(ProjectInternal project) {
-        project.plugins.apply(NativeBinariesPlugin)
-        project.plugins.apply(ObjectiveCLangPlugin)
-
-        project.executables.all { Executable executable ->
-            executable.binaries.all { binary ->
-                binary.extensions.create("objcCompiler", DefaultPreprocessingTool)
-            }
-        }
-
-        project.libraries.all { Library library ->
-            library.binaries.all { binary ->
-                binary.extensions.create("objcCompiler", DefaultPreprocessingTool)
-            }
-        }
-
-        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinary binary ->
-            binary.source.withType(ObjectiveCSourceSet).all { ObjectiveCSourceSet sourceSet ->
-                if (sourceSet.mayHaveSources) {
-                    def compileTask = createCompileTask(project, binary, sourceSet)
-                    binary.tasks.add compileTask
-                    binary.tasks.builder.source compileTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
-                }
-            }
-        }
-    }
-
-    private def createCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, ObjectiveCSourceSet sourceSet) {
-        def compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: ObjectiveCCompile) {
-            description = "Compiles the $sourceSet of $binary"
-        }
-
-        compileTask.toolChain = binary.toolChain
-        compileTask.targetPlatform = binary.targetPlatform
-        compileTask.positionIndependentCode = binary instanceof SharedLibraryBinary
-
-        compileTask.includes {
-            sourceSet.exportedHeaders.srcDirs
-        }
-        compileTask.includes {
-            binary.getLibs(sourceSet)*.includeRoots
-        }
-
-        compileTask.source sourceSet.source
-
-        compileTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
-        compileTask.macros = binary.objcCompiler.macros
-        compileTask.compilerArgs = binary.objcCompiler.args
-
-        compileTask
-    }
-}
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPlugin.groovy
index 14feee562e95..4a10f7c25170 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPlugin.groovy
@@ -15,22 +15,106 @@
  */
 package org.gradle.nativebinaries.language.objectivec.plugins
 
+import org.gradle.api.Action
 import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.nativebinaries.toolchain.internal.plugins.StandardToolChainsPlugin
+import org.gradle.language.objectivec.ObjectiveCSourceSet
+import org.gradle.language.objectivec.plugins.ObjectiveCLangPlugin
+import org.gradle.model.ModelRule
+import org.gradle.model.ModelRules
+import org.gradle.nativebinaries.ProjectNativeBinary
+import org.gradle.nativebinaries.ProjectNativeComponent
+import org.gradle.nativebinaries.SharedLibraryBinary
+import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
+import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
+import org.gradle.nativebinaries.language.objectivec.tasks.ObjectiveCCompile
+import org.gradle.nativebinaries.plugins.NativeComponentPlugin
+import org.gradle.nativebinaries.toolchain.Clang
+import org.gradle.nativebinaries.toolchain.Gcc
+import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
+import org.gradle.nativebinaries.toolchain.internal.ToolType
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultGccCommandLineToolConfiguration
+
+import javax.inject.Inject
 
 /**
  * A plugin for projects wishing to build native binary components from Objective-C sources.
  *
- * <p>Adds core tool chain support to the {@link ObjectiveCNativeBinariesPlugin}.</p>
+ * <p>Automatically includes the {@link ObjectiveCLangPlugin} for core Objective-C support and the {@link org.gradle.nativebinaries.plugins.NativeComponentPlugin} for native component support.</p>
+ *
+ * <li>Creates a {@link ObjectiveCCompile} task for each {@link ObjectiveCSourceSet} to compile the Objective-C sources.</li>
  */
 @Incubating
 class ObjectiveCPlugin implements Plugin<ProjectInternal> {
+    ModelRules modelRules;
+
+    @Inject
+    ObjectiveCPlugin(ModelRules modelRules) {
+        this.modelRules = modelRules
+    }
 
     void apply(ProjectInternal project) {
-        project.plugins.apply(StandardToolChainsPlugin)
-        project.plugins.apply(ObjectiveCNativeBinariesPlugin)
+        project.plugins.apply(NativeComponentPlugin)
+        project.plugins.apply(ObjectiveCLangPlugin)
+
+        modelRules.rule(new ModelRule() {
+            void addObjectiveCCompiler(ToolChainRegistryInternal toolChainRegistry) {
+                toolChainRegistry.withType(Clang).all(new Action<Clang>() {
+                    void execute(Clang toolchain) {
+                        toolchain.add(new DefaultGccCommandLineToolConfiguration("objcCompiler", ToolType.OBJECTIVEC_COMPILER, "clang"));
+                    }
+                })
+
+                toolChainRegistry.withType(Gcc).all(new Action<Gcc>() {
+                    void execute(Gcc toolchain) {
+                        toolchain.add(new DefaultGccCommandLineToolConfiguration("objcCompiler", ToolType.OBJECTIVEC_COMPILER, "gcc"));
+                    }
+                })
+            }
+        });
+
+
+        project.nativeComponents.all { ProjectNativeComponent component ->
+            component.binaries.all { binary ->
+                binary.extensions.create("objcCompiler", DefaultPreprocessingTool)
+            }
+        }
+
+        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinary binary ->
+            binary.source.withType(ObjectiveCSourceSet).all { ObjectiveCSourceSet sourceSet ->
+                if (sourceSet.mayHaveSources) {
+                    def compileTask = createCompileTask(project, binary, sourceSet)
+                    binary.tasks.add compileTask
+                    binary.tasks.createOrLink.source compileTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
+                }
+            }
+        }
+    }
+
+    private def createCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, ObjectiveCSourceSet sourceSet) {
+        def compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: ObjectiveCCompile) {
+            description = "Compiles the $sourceSet of $binary"
+        }
+
+        compileTask.toolChain = binary.toolChain
+        compileTask.targetPlatform = binary.targetPlatform
+        compileTask.positionIndependentCode = binary instanceof SharedLibraryBinary
+
+        compileTask.includes {
+            sourceSet.exportedHeaders.srcDirs
+        }
+        compileTask.includes {
+            binary.getLibs(sourceSet)*.includeRoots
+        }
+
+        compileTask.source sourceSet.source
+
+        compileTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
+        compileTask.macros = binary.objcCompiler.macros
+        compileTask.compilerArgs = binary.objcCompiler.args
+
+        compileTask
     }
 
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPlugin.groovy
deleted file mode 100644
index 11a3ab455dae..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPlugin.groovy
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.objectivecpp.plugins
-
-import org.gradle.api.Incubating
-import org.gradle.api.Plugin
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.language.objectivecpp.ObjectiveCppSourceSet
-import org.gradle.language.objectivecpp.plugins.ObjectiveCppLangPlugin
-import org.gradle.nativebinaries.*
-import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
-import org.gradle.nativebinaries.language.objectivecpp.tasks.ObjectiveCppCompile
-import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
-
-/**
- * A plugin for projects wishing to build native binary components from Objective-C++ sources.
- *
- * <p>Automatically includes the {@link org.gradle.language.objectivecpp.plugins.ObjectiveCppLangPlugin} for core Objective-C++ support and the {@link NativeBinariesPlugin} for native binary support.</p>
- *
- * <li>Creates a {@link ObjectiveCppCompile} task for each {@link ObjectiveCppSourceSet} to compile the Objective-C++ sources.</li>
- */
-@Incubating
-class ObjectiveCppNativeBinariesPlugin implements Plugin<ProjectInternal> {
-
-    void apply(ProjectInternal project) {
-        project.plugins.apply(NativeBinariesPlugin)
-        project.plugins.apply(ObjectiveCppLangPlugin)
-
-        project.executables.all { Executable executable ->
-            executable.binaries.all { binary ->
-                binary.extensions.create("objcppCompiler", DefaultPreprocessingTool)
-            }
-        }
-
-        project.libraries.all { Library library ->
-            library.binaries.all { binary ->
-                binary.extensions.create("objcppCompiler", DefaultPreprocessingTool)
-            }
-        }
-
-        project.binaries.withType(NativeBinary) { ProjectNativeBinaryInternal binary ->
-            binary.source.withType(ObjectiveCppSourceSet).all { ObjectiveCppSourceSet sourceSet ->
-                if (sourceSet.mayHaveSources) {
-                    def compileTask = createCompileTask(project, binary, sourceSet)
-                    binary.tasks.add compileTask
-                    binary.tasks.builder.source compileTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
-                }
-            }
-        }
-    }
-
-    private def createCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, ObjectiveCppSourceSet sourceSet) {
-        def compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: ObjectiveCppCompile) {
-            description = "Compiles the $sourceSet of $binary"
-        }
-
-        compileTask.toolChain = binary.toolChain
-        compileTask.targetPlatform = binary.targetPlatform
-        compileTask.positionIndependentCode = binary instanceof SharedLibraryBinary
-
-        compileTask.includes {
-            sourceSet.exportedHeaders.srcDirs
-        }
-
-        compileTask.source sourceSet.source
-        binary.getLibs(sourceSet).each { deps ->
-            compileTask.includes deps.includeRoots
-        }
-
-        compileTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
-        compileTask.macros = binary.objcppCompiler.macros
-        compileTask.compilerArgs = binary.objcppCompiler.args
-
-        compileTask
-    }
-}
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPlugin.groovy
index d871662afd5c..dd2b732f65dd 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPlugin.groovy
@@ -15,22 +15,107 @@
  */
 package org.gradle.nativebinaries.language.objectivecpp.plugins
 
+import org.gradle.api.Action
 import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.nativebinaries.toolchain.internal.plugins.StandardToolChainsPlugin
+import org.gradle.language.objectivecpp.ObjectiveCppSourceSet
+import org.gradle.language.objectivecpp.plugins.ObjectiveCppLangPlugin
+import org.gradle.model.ModelRule
+import org.gradle.model.ModelRules
+import org.gradle.nativebinaries.NativeBinary
+import org.gradle.nativebinaries.ProjectNativeComponent
+import org.gradle.nativebinaries.SharedLibraryBinary
+import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
+import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
+import org.gradle.nativebinaries.language.objectivecpp.tasks.ObjectiveCppCompile
+import org.gradle.nativebinaries.plugins.NativeComponentPlugin
+import org.gradle.nativebinaries.toolchain.Clang
+import org.gradle.nativebinaries.toolchain.Gcc
+import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
+import org.gradle.nativebinaries.toolchain.internal.ToolType
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultGccCommandLineToolConfiguration
+
+import javax.inject.Inject
 
 /**
  * A plugin for projects wishing to build native binary components from Objective-C++ sources.
  *
- * <p>Adds core tool chain support to the {@link ObjectiveCppNativeBinariesPlugin}.</p>
+ * <p>Automatically includes the {@link ObjectiveCppLangPlugin} for core Objective-C++ support and the {@link NativeComponentPlugin} for native component support.</p>
+ *
+ * <li>Creates a {@link ObjectiveCppCompile} task for each {@link ObjectiveCppSourceSet} to compile the Objective-C++ sources.</li>
  */
 @Incubating
 class ObjectiveCppPlugin implements Plugin<ProjectInternal> {
 
+    ModelRules modelRules;
+
+    @Inject
+    public ObjectiveCppPlugin(ModelRules modelRules){
+        this.modelRules = modelRules
+    }
+
     void apply(ProjectInternal project) {
-        project.plugins.apply(StandardToolChainsPlugin)
-        project.plugins.apply(ObjectiveCppNativeBinariesPlugin)
+        project.plugins.apply(NativeComponentPlugin)
+        project.plugins.apply(ObjectiveCppLangPlugin)
+
+        modelRules.rule(new ModelRule() {
+            void addObjectiveCppCompiler(ToolChainRegistryInternal toolChainRegistry) {
+                toolChainRegistry.withType(Clang).all(new Action<Clang>(){
+                    void execute(Clang toolchain) {
+                        toolchain.add(new DefaultGccCommandLineToolConfiguration("objcppCompiler", ToolType.OBJECTIVECPP_COMPILER, "clang++"));
+                    }
+                })
+
+                toolChainRegistry.withType(Gcc).all(new Action<Gcc>() {
+                    void execute(Gcc toolchain) {
+                        toolchain.add(new DefaultGccCommandLineToolConfiguration("objcppCompiler", ToolType.OBJECTIVECPP_COMPILER, "g++"));
+                    }
+                })
+            }
+        });
+
+
+        project.nativeComponents.all { ProjectNativeComponent component ->
+            component.binaries.all { binary ->
+                binary.extensions.create("objcppCompiler", DefaultPreprocessingTool)
+            }
+        }
+
+        project.binaries.withType(NativeBinary) { ProjectNativeBinaryInternal binary ->
+            binary.source.withType(ObjectiveCppSourceSet).all { ObjectiveCppSourceSet sourceSet ->
+                if (sourceSet.mayHaveSources) {
+                    def compileTask = createCompileTask(project, binary, sourceSet)
+                    binary.tasks.add compileTask
+                    binary.tasks.createOrLink.source compileTask.outputs.files.asFileTree.matching { include '**/*.obj', '**/*.o' }
+                }
+            }
+        }
+    }
+
+    private def createCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, ObjectiveCppSourceSet sourceSet) {
+        def compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: ObjectiveCppCompile) {
+            description = "Compiles the $sourceSet of $binary"
+        }
+
+        compileTask.toolChain = binary.toolChain
+        compileTask.targetPlatform = binary.targetPlatform
+        compileTask.positionIndependentCode = binary instanceof SharedLibraryBinary
+
+        compileTask.includes {
+            sourceSet.exportedHeaders.srcDirs
+        }
+
+        compileTask.source sourceSet.source
+        binary.getLibs(sourceSet).each { deps ->
+            compileTask.includes deps.includeRoots
+        }
+
+        compileTask.objectFileDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
+        compileTask.macros = binary.objcppCompiler.macros
+        compileTask.compilerArgs = binary.objcppCompiler.args
+
+        compileTask
     }
 
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesNativeBinariesPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesNativeBinariesPlugin.groovy
deleted file mode 100644
index b0dd256fe278..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesNativeBinariesPlugin.groovy
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.rc.plugins
-
-import org.gradle.api.Incubating
-import org.gradle.api.Plugin
-import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.language.rc.WindowsResourceSet
-import org.gradle.language.rc.plugins.WindowsResourceScriptPlugin
-import org.gradle.nativebinaries.*
-import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
-import org.gradle.nativebinaries.internal.StaticLibraryBinaryInternal
-import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
-import org.gradle.nativebinaries.language.rc.tasks.WindowsResourceCompile
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
-
-/**
- * A plugin for projects wishing to build native binary components from Windows Resource sources.
- *
- * <p>Automatically includes the {@link WindowsResourceScriptPlugin} for core Windows Resource source support
- * and the {@link NativeBinariesPlugin} for native binary support.</p>
- *
- * <li>Creates a {@link WindowsResourceCompile} task for each {@link WindowsResourceSet} to compile the sources.</li>
- */
-@Incubating
-class WindowsResourcesNativeBinariesPlugin implements Plugin<ProjectInternal> {
-
-    void apply(ProjectInternal project) {
-        project.plugins.apply(NativeBinariesPlugin)
-        project.plugins.apply(WindowsResourceScriptPlugin)
-
-        // TODO:DAZ Clean this up (see CppNativeBinariesPlugin)
-        project.executables.all { Executable executable ->
-            addLanguageExtensionsToComponent(executable)
-        }
-        project.libraries.all { Library library ->
-            addLanguageExtensionsToComponent(library)
-        }
-
-        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinaryInternal binary ->
-            if (shouldProcessResources(binary)) {
-                binary.source.withType(WindowsResourceSet).all { WindowsResourceSet resources ->
-                    if (resources.mayHaveSources) {
-                        def resourceCompileTask = createResourceCompileTask(project, binary, resources)
-                        resourceCompileTask.dependsOn resources
-                        binary.tasks.add resourceCompileTask
-                        final resourceOutputs = resourceCompileTask.outputs.files.asFileTree.matching { include '**/*.res' }
-                        binary.tasks.builder.source resourceOutputs
-                        if (binary instanceof StaticLibraryBinaryInternal) {
-                            binary.additionalLinkFiles resourceOutputs
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private def addLanguageExtensionsToComponent(ProjectNativeComponent component) {
-        component.binaries.all { NativeBinary binary ->
-            if (shouldProcessResources(binary)) {
-                binary.extensions.create("rcCompiler", DefaultPreprocessingTool)
-            }
-        }
-    }
-
-    private boolean shouldProcessResources(NativeBinary binary) {
-        binary.targetPlatform.operatingSystem.windows
-    }
-
-    private def createResourceCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, WindowsResourceSet sourceSet) {
-        WindowsResourceCompile compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: WindowsResourceCompile) {
-            description = "Compiles resources of the $sourceSet of $binary"
-        }
-
-        compileTask.toolChain = binary.toolChain
-        compileTask.targetPlatform = binary.targetPlatform
-
-        compileTask.includes {
-            sourceSet.exportedHeaders.srcDirs
-        }
-        compileTask.source sourceSet.source
-
-        compileTask.outputDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
-        compileTask.macros = binary.rcCompiler.macros
-        compileTask.compilerArgs = binary.rcCompiler.args
-
-        compileTask
-    }
-
-}
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPlugin.groovy
index 2e0ac110ef62..37e93d686057 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPlugin.groovy
@@ -15,22 +15,105 @@
  */
 package org.gradle.nativebinaries.language.rc.plugins
 
+import org.gradle.api.Action
 import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.nativebinaries.toolchain.internal.plugins.StandardToolChainsPlugin
+import org.gradle.language.rc.WindowsResourceSet
+import org.gradle.language.rc.plugins.WindowsResourceScriptPlugin
+import org.gradle.model.ModelRule
+import org.gradle.model.ModelRules
+import org.gradle.nativebinaries.*
+import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
+import org.gradle.nativebinaries.internal.StaticLibraryBinaryInternal
+import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool
+import org.gradle.nativebinaries.language.rc.tasks.WindowsResourceCompile
+import org.gradle.nativebinaries.plugins.NativeComponentPlugin
+import org.gradle.nativebinaries.toolchain.VisualCpp
+import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultCommandLineToolConfiguration
+
+import javax.inject.Inject
 
 /**
  * A plugin for projects wishing to build native binary components from Windows Resource sources.
  *
- * <p>Adds core tool chain support to the {@link WindowsResourcesNativeBinariesPlugin}.</p>
+ * <p>Automatically includes the {@link WindowsResourceScriptPlugin} for core Windows Resource source support
+ * and the {@link NativeComponentPlugin} for native component support.</p>
+ *
+ * <li>Creates a {@link WindowsResourceCompile} task for each {@link WindowsResourceSet} to compile the sources.</li>
  */
 @Incubating
 class WindowsResourcesPlugin implements Plugin<ProjectInternal> {
 
+    private ModelRules modelRules
+
+    @Inject
+    public WindowsResourcesPlugin(ModelRules modelRules){
+        this.modelRules = modelRules
+    }
+
     void apply(ProjectInternal project) {
-        project.plugins.apply(StandardToolChainsPlugin)
+        project.plugins.apply(NativeComponentPlugin)
+        project.plugins.apply(WindowsResourceScriptPlugin)
+
+        project.nativeComponents.all { ProjectNativeComponent component ->
+            component.binaries.all { NativeBinary binary ->
+                if (shouldProcessResources(binary)) {
+                    binary.extensions.create("rcCompiler", DefaultPreprocessingTool)
+                }
+            }
+        }
+
+        modelRules.rule(new ModelRule() {
+            void addWindowsResourcesTool(ToolChainRegistryInternal toolChainRegistry) {
+                toolChainRegistry.withType(VisualCpp).all(new Action<VisualCpp>(){
+                    void execute(VisualCpp toolchain) {
+                        toolchain.add(new DefaultCommandLineToolConfiguration("rcCompiler"));
+                    }
+                })
+            }
+        });
+
+        project.binaries.withType(ProjectNativeBinary) { ProjectNativeBinaryInternal binary ->
+            if (shouldProcessResources(binary)) {
+                binary.source.withType(WindowsResourceSet).all { WindowsResourceSet resources ->
+                    if (resources.mayHaveSources) {
+                        def resourceCompileTask = createResourceCompileTask(project, binary, resources)
+                        resourceCompileTask.dependsOn resources
+                        binary.tasks.add resourceCompileTask
+                        final resourceOutputs = resourceCompileTask.outputs.files.asFileTree.matching { include '**/*.res' }
+                        binary.tasks.createOrLink.source resourceOutputs
+                        if (binary instanceof StaticLibraryBinaryInternal) {
+                            binary.additionalLinkFiles resourceOutputs
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    private boolean shouldProcessResources(NativeBinary binary) {
+        binary.targetPlatform.operatingSystem.windows
+    }
+
+    private def createResourceCompileTask(ProjectInternal project, ProjectNativeBinaryInternal binary, WindowsResourceSet sourceSet) {
+        WindowsResourceCompile compileTask = project.task(binary.namingScheme.getTaskName("compile", sourceSet.fullName), type: WindowsResourceCompile) {
+            description = "Compiles resources of the $sourceSet of $binary"
+        }
+
+        compileTask.toolChain = binary.toolChain
+        compileTask.targetPlatform = binary.targetPlatform
+
+        compileTask.includes {
+            sourceSet.exportedHeaders.srcDirs
+        }
+        compileTask.source sourceSet.source
+
+        compileTask.outputDir = project.file("${project.buildDir}/objectFiles/${binary.namingScheme.outputDirectoryBase}/${sourceSet.fullName}")
+        compileTask.macros = binary.rcCompiler.macros
+        compileTask.compilerArgs = binary.rcCompiler.args
 
-        project.plugins.apply(WindowsResourcesNativeBinariesPlugin)
+        compileTask
     }
 }
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/tasks/WindowsResourceCompile.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/tasks/WindowsResourceCompile.groovy
index 4d0bd6269c94..184feb5337df 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/tasks/WindowsResourceCompile.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/language/rc/tasks/WindowsResourceCompile.groovy
@@ -15,11 +15,10 @@
  */
 
 package org.gradle.nativebinaries.language.rc.tasks
+
 import org.gradle.api.DefaultTask
 import org.gradle.api.Incubating
 import org.gradle.api.file.FileCollection
-import org.gradle.api.internal.changedetection.state.FileSnapshotter
-import org.gradle.api.internal.changedetection.state.TaskArtifactStateCacheAccess
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputDirectory
@@ -32,87 +31,85 @@ import org.gradle.nativebinaries.toolchain.ToolChain
 import org.gradle.nativebinaries.toolchain.internal.PlatformToolChain
 
 import javax.inject.Inject
+
 /**
  * Compiles Windows Resource scripts into .res files.
  */
 @Incubating
 class WindowsResourceCompile extends DefaultTask {
-    private final IncrementalCompilerBuilder incrementalCompilerBuilder
 
-    @Inject
     WindowsResourceCompile() {
-        incrementalCompilerBuilder = new IncrementalCompilerBuilder(services.get(TaskArtifactStateCacheAccess),
-                                                                    services.get(FileSnapshotter), this)
         includes = project.files()
         source = project.files()
     }
 
-     /**
-      * The tool chain used for compilation.
-      */
-     ToolChain toolChain
-
-     /**
-      * The platform being targeted.
-      */
-     Platform targetPlatform
-
-     /**
-      * The directory where object files will be generated.
-      */
-     @OutputDirectory
-     File outputDir
-
-     /**
-      * Returns the header directories to be used for compilation.
-      */
-     @InputFiles
-     FileCollection includes
-
-     /**
-      * Returns the source files to be compiled.
-      */
-     @InputFiles
-     FileCollection source
-
-     // Invalidate output when the tool chain output changes
-     @Input
-     def getOutputType() {
-         return "${toolChain.outputType}:${targetPlatform.compatibilityString}"
-     }
-
-     /**
-      * Macros that should be defined for the compiler.
-      */
-     @Input
-     Map<String, String> macros = [:]
-
-     /**
-      * Additional arguments to provide to the compiler.
-      */
-     @Input
-     List<String> compilerArgs = []
-
-     @TaskAction
-     void compile(IncrementalTaskInputs inputs) {
-         def spec = new DefaultWindowsResourceCompileSpec()
-         spec.tempDir = getTemporaryDir()
-         spec.objectFileDir = getOutputDir()
-         spec.include getIncludes()
-         spec.source getSource()
-         spec.macros = getMacros()
-         spec.args getCompilerArgs()
-
-         PlatformToolChain platformToolChain = toolChain.target(targetPlatform)
-         final compiler = platformToolChain.createWindowsResourceCompiler()
-         if (!inputs.incremental) {
-             incrementalCompilerBuilder.withCleanCompile()
-         }
-         incrementalCompilerBuilder.withIncludes(includes)
-         final incrementalCompiler = incrementalCompilerBuilder.createIncrementalCompiler(compiler)
-         def result = incrementalCompiler.execute(spec)
-         didWork = result.didWork
-     }
+    /**
+     * The tool chain used for compilation.
+     */
+    ToolChain toolChain
+
+    /**
+     * The platform being targeted.
+     */
+    Platform targetPlatform
+
+    /**
+     * The directory where object files will be generated.
+     */
+    @OutputDirectory
+    File outputDir
+
+    /**
+     * Returns the header directories to be used for compilation.
+     */
+    @InputFiles
+    FileCollection includes
+
+    /**
+     * Returns the source files to be compiled.
+     */
+    @InputFiles
+    FileCollection source
+
+    // Invalidate output when the tool chain output changes
+    @Input
+    def getOutputType() {
+        return "${toolChain.outputType}:${targetPlatform.compatibilityString}"
+    }
+
+    /**
+     * Macros that should be defined for the compiler.
+     */
+    @Input
+    Map<String, String> macros = [:]
+
+    /**
+     * Additional arguments to provide to the compiler.
+     */
+    @Input
+    List<String> compilerArgs = []
+
+    @Inject
+    IncrementalCompilerBuilder getIncrementalCompilerBuilder(){
+        throw new UnsupportedOperationException()
+    }
+
+    @TaskAction
+    void compile(IncrementalTaskInputs inputs) {
+        def spec = new DefaultWindowsResourceCompileSpec()
+        spec.tempDir = getTemporaryDir()
+        spec.objectFileDir = getOutputDir()
+        spec.include getIncludes()
+        spec.source getSource()
+        spec.macros = getMacros()
+        spec.args getCompilerArgs()
+        spec.incrementalCompile = inputs.incremental
+
+        PlatformToolChain platformToolChain = toolChain.select(targetPlatform)
+        final compiler = platformToolChain.createWindowsResourceCompiler()
+        def result = incrementalCompilerBuilder.createIncrementalCompiler(this, compiler).execute(spec)
+        didWork = result.didWork
+    }
 
     /**
      * Add directories where the compiler should search for header files.
@@ -121,11 +118,11 @@ class WindowsResourceCompile extends DefaultTask {
         includes.from(includeRoots)
     }
 
-     /**
-      * Adds a set of source files to be compiled.
-      * The provided sourceFiles object is evaluated as per {@link org.gradle.api.Project#files(Object...)}.
-      */
-     void source(Object sourceFiles) {
-         source.from sourceFiles
-     }
+    /**
+     * Adds a set of source files to be compiled.
+     * The provided sourceFiles object is evaluated as per {@link org.gradle.api.Project#files(Object ...)}.
+     */
+    void source(Object sourceFiles) {
+        source.from sourceFiles
+    }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPlugin.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeComponentModelPlugin.java
similarity index 73%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPlugin.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeComponentModelPlugin.java
index ac52682a2d94..acef74ef0b24 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPlugin.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeComponentModelPlugin.java
@@ -16,32 +16,30 @@
 package org.gradle.nativebinaries.plugins;
 
 import org.gradle.api.Incubating;
+import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Plugin;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.api.plugins.BasePlugin;
-import org.gradle.api.tasks.TaskContainer;
 import org.gradle.configuration.project.ProjectConfigurationActionContainer;
 import org.gradle.internal.Actions;
 import org.gradle.internal.Factory;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.BinaryContainer;
 import org.gradle.language.base.plugins.LanguageBasePlugin;
 import org.gradle.model.ModelFinalizer;
-import org.gradle.model.ModelRule;
 import org.gradle.model.ModelRules;
-import org.gradle.nativebinaries.BuildTypeContainer;
-import org.gradle.nativebinaries.FlavorContainer;
+import org.gradle.nativebinaries.*;
 import org.gradle.nativebinaries.internal.DefaultBuildTypeContainer;
-import org.gradle.nativebinaries.internal.DefaultExecutableContainer;
 import org.gradle.nativebinaries.internal.DefaultFlavorContainer;
-import org.gradle.nativebinaries.internal.DefaultLibraryContainer;
+import org.gradle.nativebinaries.internal.NativeExecutableFactory;
+import org.gradle.nativebinaries.internal.NativeLibraryFactory;
 import org.gradle.nativebinaries.internal.configure.*;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
 import org.gradle.nativebinaries.platform.PlatformContainer;
 import org.gradle.nativebinaries.platform.internal.DefaultPlatformContainer;
 import org.gradle.nativebinaries.toolchain.internal.DefaultToolChainRegistry;
 import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal;
+import org.gradle.runtime.base.ProjectComponentContainer;
 
 import javax.inject.Inject;
 import java.util.Arrays;
@@ -50,7 +48,7 @@
  * A plugin that sets up the infrastructure for defining native binaries.
  */
 @Incubating
-public class NativeBinariesModelPlugin implements Plugin<ProjectInternal> {
+public class NativeComponentModelPlugin implements Plugin<ProjectInternal> {
 
     private final Instantiator instantiator;
     private final ProjectConfigurationActionContainer configurationActions;
@@ -59,8 +57,8 @@ public class NativeBinariesModelPlugin implements Plugin<ProjectInternal> {
     private final FileResolver fileResolver;
 
     @Inject
-    public NativeBinariesModelPlugin(Instantiator instantiator, ProjectConfigurationActionContainer configurationActions, ModelRules modelRules,
-                                     NativeDependencyResolver resolver, FileResolver fileResolver) {
+    public NativeComponentModelPlugin(Instantiator instantiator, ProjectConfigurationActionContainer configurationActions, ModelRules modelRules,
+                                      NativeDependencyResolver resolver, FileResolver fileResolver) {
         this.instantiator = instantiator;
         this.configurationActions = configurationActions;
         this.modelRules = modelRules;
@@ -84,37 +82,29 @@ public void apply(final ProjectInternal project) {
         modelRules.rule(new CreateDefaultFlavors());
         modelRules.rule(new AddDefaultToolChainsIfRequired());
         modelRules.rule(new CreateNativeBinaries(instantiator, project, resolver));
-        modelRules.rule(new CloseBinariesForTasks());
-
-        project.getExtensions().create(
-                "executables",
-                DefaultExecutableContainer.class,
-                instantiator,
-                project
-        );
-        project.getExtensions().create(
-                "libraries",
-                DefaultLibraryContainer.class,
-                instantiator,
-                project
-        );
-
-        // TODO:DAZ Lazy configuration actions: need a better way to accomplish these.
+
+        ProjectComponentContainer components = project.getExtensions().getByType(ProjectComponentContainer.class);
+        components.registerFactory(NativeExecutable.class, new NativeExecutableFactory(instantiator, project));
+        NamedDomainObjectContainer<NativeExecutable> nativeExecutables = components.containerWithType(NativeExecutable.class);
+
+        components.registerFactory(NativeLibrary.class, new NativeLibraryFactory(instantiator, project));
+        NamedDomainObjectContainer<NativeLibrary> nativeLibraries = components.containerWithType(NativeLibrary.class);
+
+        project.getExtensions().create("nativeCode", DefaultNativeComponentExtension.class, nativeExecutables, nativeLibraries);
+
+        // TODO:DAZ Not sure if we should keep these
+        project.getExtensions().add("nativeComponents", components.withType(ProjectNativeComponent.class));
+        project.getExtensions().add("executables", nativeExecutables);
+        project.getExtensions().add("libraries", nativeLibraries);
+
         configurationActions.add(Actions.composite(
                 new ConfigureGeneratedSourceSets(),
                 new ApplySourceSetConventions()
         ));
     }
 
-    @SuppressWarnings("UnusedDeclaration")
-    private static class CloseBinariesForTasks extends ModelRule {
-        void closeBinariesForTasks(TaskContainer tasks, BinaryContainer binaries) {
-            // nothing needed here
-        }
-    }
-
-    @SuppressWarnings("UnusedDeclaration")
     private static class AddDefaultToolChainsIfRequired extends ModelFinalizer {
+        @SuppressWarnings("UnusedDeclaration")
         void createDefaultToolChain(ToolChainRegistryInternal toolChains) {
             if (toolChains.isEmpty()) {
                 toolChains.addDefaultToolChains();
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeComponentPlugin.groovy
similarity index 84%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPlugin.groovy
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeComponentPlugin.groovy
index cdbcfcec3130..cbd560e49cf2 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/plugins/NativeComponentPlugin.groovy
@@ -18,7 +18,6 @@ import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.api.plugins.BasePlugin
-import org.gradle.language.base.BinaryContainer
 import org.gradle.language.base.ProjectSourceSet
 import org.gradle.nativebinaries.*
 import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
@@ -27,22 +26,26 @@ import org.gradle.nativebinaries.tasks.InstallExecutable
 import org.gradle.nativebinaries.tasks.LinkExecutable
 import org.gradle.nativebinaries.tasks.LinkSharedLibrary
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal
+import org.gradle.nativebinaries.toolchain.internal.plugins.StandardToolChainsPlugin
+import org.gradle.runtime.base.BinaryContainer
+import org.gradle.runtime.base.ProjectComponentContainer
+
 /**
  * A plugin that creates tasks used for constructing native binaries.
  */
 @Incubating
-public class NativeBinariesPlugin implements Plugin<ProjectInternal> {
+public class NativeComponentPlugin implements Plugin<ProjectInternal> {
 
     public void apply(final ProjectInternal project) {
-        project.getPlugins().apply(NativeBinariesModelPlugin.class);
+        project.plugins.apply(NativeComponentModelPlugin.class);
+        project.plugins.apply(StandardToolChainsPlugin)
+
 
         // Create a functionalSourceSet for each native component, with the same name
         ProjectSourceSet projectSourceSet = project.getExtensions().getByType(ProjectSourceSet.class);
-        project.getExtensions().getByType(ExecutableContainer).all { Executable exe ->
-            exe.source projectSourceSet.maybeCreate(exe.name)
-        }
-        project.getExtensions().getByType(LibraryContainer).all { Library lib ->
-            lib.source projectSourceSet.maybeCreate(lib.name)
+        final ProjectComponentContainer components = project.getExtensions().getByType(ProjectComponentContainer)
+        components.withType(ProjectNativeComponent).all { ProjectNativeComponent component ->
+            component.source projectSourceSet.maybeCreate(component.name)
         }
 
         final BinaryContainer binaries = project.getExtensions().getByType(BinaryContainer.class);
@@ -54,14 +57,14 @@ public class NativeBinariesPlugin implements Plugin<ProjectInternal> {
 
     static boolean isBuildableBinary(ProjectNativeBinaryInternal binary) {
         final chain = binary.toolChain as ToolChainInternal
-        chain.target(binary.getTargetPlatform()).available
+        chain.select(binary.getTargetPlatform()).available
     }
 
     def createTasks(ProjectInternal project, ProjectNativeBinaryInternal binary) {
         def builderTask
-        if (binary instanceof ExecutableBinary) {
-            builderTask = createLinkExecutableTask(project, binary as ExecutableBinary)
-            binary.tasks.add createInstallTask(project, binary as ExecutableBinary);
+        if (binary instanceof NativeExecutableBinary) {
+            builderTask = createLinkExecutableTask(project, binary as NativeExecutableBinary)
+            binary.tasks.add createInstallTask(project, binary as NativeExecutableBinary);
         } else if (binary instanceof SharedLibraryBinary) {
             builderTask = createLinkSharedLibraryTask(project, binary)
         } else if (binary instanceof StaticLibraryBinary) {
@@ -73,7 +76,7 @@ public class NativeBinariesPlugin implements Plugin<ProjectInternal> {
         binary.builtBy builderTask
     }
 
-    private LinkExecutable createLinkExecutableTask(ProjectInternal project, ExecutableBinary executable) {
+    private LinkExecutable createLinkExecutableTask(ProjectInternal project, NativeExecutableBinary executable) {
         def binary = executable as ProjectNativeBinaryInternal
         LinkExecutable linkTask = project.task(binary.namingScheme.getTaskName("link"), type: LinkExecutable) {
              description = "Links ${executable}"
@@ -119,7 +122,7 @@ public class NativeBinariesPlugin implements Plugin<ProjectInternal> {
         return task
     }
 
-    def createInstallTask(ProjectInternal project, ExecutableBinary executable) {
+    def createInstallTask(ProjectInternal project, NativeExecutableBinary executable) {
         def binary = executable as ProjectNativeBinaryInternal
         InstallExecutable installTask = project.task(binary.namingScheme.getTaskName("install"), type: InstallExecutable) {
             description = "Installs a development image of $executable"
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/AbstractLinkTask.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/AbstractLinkTask.groovy
index d9a40648fce5..cbc7620ecbbb 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/AbstractLinkTask.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/AbstractLinkTask.groovy
@@ -28,7 +28,7 @@ import org.gradle.nativebinaries.internal.LinkerSpec
 import javax.inject.Inject
 
 @Incubating
-abstract class AbstractLinkTask extends DefaultTask implements BuildBinaryTask {
+abstract class AbstractLinkTask extends DefaultTask implements ObjectFilesToBinary {
     @Inject
     AbstractLinkTask() {
         libs = project.files()
@@ -112,7 +112,7 @@ abstract class AbstractLinkTask extends DefaultTask implements BuildBinaryTask {
         spec.libraries getLibs()
         spec.args getLinkerArgs()
 
-        def result = toolChain.target(targetPlatform).createLinker().execute(spec)
+        def result = toolChain.select(targetPlatform).createLinker().execute(spec)
         didWork = result.didWork
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/CreateStaticLibrary.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/CreateStaticLibrary.groovy
index 81b37846d762..c800d6bdc7d5 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/CreateStaticLibrary.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/CreateStaticLibrary.groovy
@@ -28,7 +28,7 @@ import javax.inject.Inject
  * Assembles a static library from object files.
  */
 @Incubating
-class CreateStaticLibrary extends DefaultTask implements BuildBinaryTask {
+class CreateStaticLibrary extends DefaultTask implements ObjectFilesToBinary {
     private FileCollection source
 
     @Inject
@@ -89,7 +89,7 @@ class CreateStaticLibrary extends DefaultTask implements BuildBinaryTask {
         spec.objectFiles getSource()
         spec.args getStaticLibArgs()
 
-        def result = toolChain.target(targetPlatform).createStaticLibraryArchiver().execute(spec)
+        def result = toolChain.select(targetPlatform).createStaticLibraryArchiver().execute(spec)
         didWork = result.didWork
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/InstallExecutable.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/InstallExecutable.groovy
index 7efdb9181cbe..85f2583f7f2d 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/InstallExecutable.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/InstallExecutable.groovy
@@ -38,16 +38,21 @@ import javax.inject.Inject
 @Incubating
 public class InstallExecutable extends DefaultTask {
 
-    private final Instantiator instantiator
-    private final FileOperations fileOperations
-
     @Inject
-    InstallExecutable(Instantiator instantiator, FileOperations fileOperations) {
-        this.instantiator = instantiator
-        this.fileOperations = fileOperations
+    InstallExecutable() {
         this.libs = project.files()
     }
 
+    @Inject
+    Instantiator getInstantiator() {
+        throw new UnsupportedOperationException()
+    }
+
+    @Inject
+    FileOperations getFileOperations() {
+        throw new UnsupportedOperationException()
+    }
+
     /**
      * The tool chain used for linking.
      */
@@ -86,8 +91,15 @@ public class InstallExecutable extends DefaultTask {
         new File(getDestinationDir(), os.getScriptName(getExecutable().name))
     }
 
-    // TODO:DAZ Allow this to be configured
-    private OperatingSystem os = OperatingSystem.current()
+    @Inject
+    OperatingSystem getOs() {
+        throw new UnsupportedOperationException()
+    }
+
+    @Inject
+    FileSystem getFileSystem() {
+        throw new UnsupportedOperationException()
+    }
 
     @TaskAction
     void install() {
@@ -139,7 +151,6 @@ export LD_LIBRARY_PATH="\$APP_BASE_NAME/lib"
 exec "\$APP_BASE_NAME/lib/${executable.name}" \"\$@\"
 """
 
-        FileSystem fileSystem = getServices().get(FileSystem.class);
         fileSystem.chmod(runScript, 0755)
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/BuildBinaryTask.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/ObjectFilesToBinary.java
similarity index 92%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/BuildBinaryTask.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/ObjectFilesToBinary.java
index c64a63333e1a..f12cfcfa4ace 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/BuildBinaryTask.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/tasks/ObjectFilesToBinary.java
@@ -17,12 +17,13 @@
 package org.gradle.nativebinaries.tasks;
 
 import org.gradle.api.Incubating;
+import org.gradle.api.Task;
 
 /**
  * A task that combines a set of object files into a single binary.
  */
 @Incubating
-public interface BuildBinaryTask {
+public interface ObjectFilesToBinary extends Task {
     /**
      * Adds a set of object files to be combined into the file binary.
      * The provided source object is evaluated as per {@link org.gradle.api.Project#files(Object...)}.
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuite.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/NativeTestSuite.java
similarity index 92%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuite.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/NativeTestSuite.java
index 687a58444553..5e2fda44be0a 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuite.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/NativeTestSuite.java
@@ -22,5 +22,5 @@
  * A component representing a suite of tests that will be executed together.
  */
 @Incubating
-public interface TestSuite extends ProjectNativeComponent {
+public interface NativeTestSuite extends ProjectNativeComponent {
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/NativeTestSuiteBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/NativeTestSuiteBinary.java
new file mode 100644
index 000000000000..78a90d3d1108
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/NativeTestSuiteBinary.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.test;
+
+import org.gradle.api.Incubating;
+import org.gradle.nativebinaries.ExecutableBinary;
+import org.gradle.nativebinaries.NativeExecutableBinary;
+
+/**
+ * An executable which runs a suite of tests.
+ */
+@Incubating
+public interface NativeTestSuiteBinary extends NativeExecutableBinary, ExecutableBinary {
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/ProjectComponentTestSuite.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/ProjectComponentNativeTestSuite.java
similarity index 92%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/ProjectComponentTestSuite.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/ProjectComponentNativeTestSuite.java
index b280fc558a9f..7567c4cdd055 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/ProjectComponentTestSuite.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/ProjectComponentNativeTestSuite.java
@@ -22,7 +22,7 @@
  * A suite of tests for a project component.
  */
 @Incubating
-public interface ProjectComponentTestSuite extends TestSuite {
+public interface ProjectComponentNativeTestSuite extends NativeTestSuite {
 
     /**
      * The tested component.
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteContainer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteContainer.java
index d950f5db7cd5..00e4bfa6ee6a 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteContainer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteContainer.java
@@ -20,8 +20,8 @@
 import org.gradle.api.Incubating;
 
 /**
- * A polymorphic container of {@link TestSuite} instances.
+ * A polymorphic container of {@link NativeTestSuite} instances.
  */
 @Incubating
-public interface TestSuiteContainer extends ExtensiblePolymorphicDomainObjectContainer<TestSuite> {
+public interface TestSuiteContainer extends ExtensiblePolymorphicDomainObjectContainer<NativeTestSuite> {
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteExecutableBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteExecutableBinary.java
index fbcdd4956be7..2de1251ea793 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteExecutableBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/TestSuiteExecutableBinary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,10 @@
 package org.gradle.nativebinaries.test;
 
 import org.gradle.api.Incubating;
-import org.gradle.nativebinaries.ExecutableBinary;
 
 /**
  * An executable which runs a suite of tests.
  */
 @Incubating
-public interface TestSuiteExecutableBinary extends ExecutableBinary {
+public interface TestSuiteExecutableBinary extends NativeTestSuiteBinary {
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestSuite.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestSuite.java
index bd746a5b64bf..086815a3329a 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestSuite.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestSuite.java
@@ -16,11 +16,11 @@
 package org.gradle.nativebinaries.test.cunit;
 
 import org.gradle.api.Incubating;
-import org.gradle.nativebinaries.test.ProjectComponentTestSuite;
+import org.gradle.nativebinaries.test.ProjectComponentNativeTestSuite;
 
 /**
  * Test suite of CUnit tests.
  */
 @Incubating
-public interface CUnitTestSuite extends ProjectComponentTestSuite {
+public interface CUnitTestSuite extends ProjectComponentNativeTestSuite {
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/CreateCUnitBinaries.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/CreateCUnitBinaries.java
index c9374c6be31e..676c77264751 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/CreateCUnitBinaries.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/CreateCUnitBinaries.java
@@ -19,17 +19,17 @@
 import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.BinaryContainer;
+import org.gradle.runtime.base.BinaryContainer;
 import org.gradle.language.base.LanguageSourceSet;
-import org.gradle.language.base.internal.BinaryNamingScheme;
-import org.gradle.language.base.internal.DefaultBinaryNamingSchemeBuilder;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.internal.DefaultBinaryNamingSchemeBuilder;
 import org.gradle.nativebinaries.ProjectNativeBinary;
 import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
 import org.gradle.nativebinaries.language.internal.DefaultPreprocessingTool;
-import org.gradle.nativebinaries.test.TestSuiteExecutableBinary;
+import org.gradle.nativebinaries.test.NativeTestSuiteBinary;
 import org.gradle.nativebinaries.test.cunit.CUnitTestSuite;
-import org.gradle.nativebinaries.test.internal.DefaultTestSuiteExecutableBinary;
+import org.gradle.nativebinaries.test.internal.DefaultNativeTestSuiteBinary;
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal;
 
 import java.io.File;
@@ -68,7 +68,7 @@ public ProjectNativeBinary createTestBinary(CUnitTestSuite cUnitTestSuite, Proje
                 .withComponentName(cUnitTestSuite.getBaseName())
                 .withTypeString("CUnitExe").build();
 
-        ProjectNativeBinary testBinary = instantiator.newInstance(DefaultTestSuiteExecutableBinary.class,
+        ProjectNativeBinary testBinary = instantiator.newInstance(DefaultNativeTestSuiteBinary.class,
                 cUnitTestSuite, testedBinary.getFlavor(), testedBinary.getToolChain(),
                 testedBinary.getTargetPlatform(), testedBinary.getBuildType(), namingScheme, resolver);
 
@@ -82,7 +82,7 @@ private void setupDefaults(ProjectNativeBinary nativeBinary, ProjectInternal pro
         String baseName = nativeBinary.getComponent().getBaseName();
 
         ToolChainInternal tc = (ToolChainInternal) nativeBinary.getToolChain();
-        ((TestSuiteExecutableBinary) nativeBinary).setExecutableFile(new File(binaryOutputDir, tc.getExecutableName(baseName)));
+        ((NativeTestSuiteBinary) nativeBinary).setExecutableFile(new File(binaryOutputDir, tc.getExecutableName(baseName)));
     }
 
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/DefaultCUnitTestSuite.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/DefaultCUnitTestSuite.java
index 5b6d34dc0635..38e11f7fcbc8 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/DefaultCUnitTestSuite.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/internal/DefaultCUnitTestSuite.java
@@ -17,14 +17,14 @@
 
 import org.gradle.nativebinaries.ProjectNativeComponent;
 import org.gradle.nativebinaries.internal.AbstractProjectNativeComponent;
-import org.gradle.nativebinaries.internal.NativeProjectComponentIdentifier;
-import org.gradle.nativebinaries.test.ProjectComponentTestSuite;
+import org.gradle.nativebinaries.internal.ProjectNativeComponentIdentifier;
+import org.gradle.nativebinaries.test.ProjectComponentNativeTestSuite;
 import org.gradle.nativebinaries.test.cunit.CUnitTestSuite;
 
-public class DefaultCUnitTestSuite extends AbstractProjectNativeComponent implements CUnitTestSuite, ProjectComponentTestSuite {
+public class DefaultCUnitTestSuite extends AbstractProjectNativeComponent implements CUnitTestSuite, ProjectComponentNativeTestSuite {
     private final ProjectNativeComponent testedComponent;
 
-    public DefaultCUnitTestSuite(NativeProjectComponentIdentifier id, ProjectNativeComponent testedComponent) {
+    public DefaultCUnitTestSuite(ProjectNativeComponentIdentifier id, ProjectNativeComponent testedComponent) {
         super(id);
         this.testedComponent = testedComponent;
     }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/plugins/CUnitPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/plugins/CUnitPlugin.groovy
index 4044e3f6890c..690095ae0ad8 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/plugins/CUnitPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/cunit/plugins/CUnitPlugin.groovy
@@ -18,9 +18,8 @@ import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.internal.reflect.Instantiator
-import org.gradle.language.base.BinaryContainer
-import org.gradle.nativebinaries.*
-import org.gradle.nativebinaries.internal.NativeProjectComponentIdentifier
+import org.gradle.nativebinaries.ProjectNativeComponent
+import org.gradle.nativebinaries.internal.ProjectNativeComponentIdentifier
 import org.gradle.nativebinaries.internal.ProjectNativeComponentInternal
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver
 import org.gradle.nativebinaries.test.TestSuiteContainer
@@ -29,6 +28,7 @@ import org.gradle.nativebinaries.test.cunit.internal.ConfigureCUnitTestSources
 import org.gradle.nativebinaries.test.cunit.internal.CreateCUnitBinaries
 import org.gradle.nativebinaries.test.cunit.internal.DefaultCUnitTestSuite
 import org.gradle.nativebinaries.test.plugins.NativeBinariesTestPlugin
+import org.gradle.runtime.base.BinaryContainer
 
 import javax.inject.Inject
 /**
@@ -51,18 +51,15 @@ public class CUnitPlugin implements Plugin<ProjectInternal> {
 
         TestSuiteContainer testSuites = project.getExtensions().getByType(TestSuiteContainer)
         BinaryContainer binaries = project.getExtensions().getByType(BinaryContainer)
-        project.getExtensions().getByType(ExecutableContainer).all { Executable executable ->
-            testSuites.add createCUnitTestSuite(executable, binaries, project)
-        }
-        project.getExtensions().getByType(LibraryContainer).all { Library library ->
-            testSuites.add createCUnitTestSuite(library, binaries, project)
+        project.nativeComponents.all { ProjectNativeComponent component ->
+            testSuites.add createCUnitTestSuite(component, binaries, project)
         }
     }
 
     private CUnitTestSuite createCUnitTestSuite(ProjectNativeComponent testedComponent, BinaryContainer binaries, ProjectInternal project) {
         String suiteName = "${testedComponent.name}Test"
         String path = (testedComponent as ProjectNativeComponentInternal).projectPath
-        NativeProjectComponentIdentifier id = new NativeProjectComponentIdentifier(path, suiteName);
+        ProjectNativeComponentIdentifier id = new ProjectNativeComponentIdentifier(path, suiteName);
         CUnitTestSuite cUnitTestSuite = instantiator.newInstance(DefaultCUnitTestSuite, id, testedComponent);
 
         new ConfigureCUnitTestSources(project).apply(cUnitTestSuite)
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteExecutableBinary.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultNativeTestSuiteBinary.java
similarity index 76%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteExecutableBinary.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultNativeTestSuiteBinary.java
index 1b0ba06a6d14..4d4e797fcfd3 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteExecutableBinary.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultNativeTestSuiteBinary.java
@@ -15,11 +15,12 @@
  */
 package org.gradle.nativebinaries.test.internal;
 
-import org.gradle.language.base.internal.BinaryNamingScheme;
+import org.gradle.nativebinaries.test.TestSuiteExecutableBinary;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 import org.gradle.nativebinaries.BuildType;
 import org.gradle.nativebinaries.Flavor;
 import org.gradle.nativebinaries.ProjectNativeComponent;
-import org.gradle.nativebinaries.test.TestSuiteExecutableBinary;
+import org.gradle.nativebinaries.test.NativeTestSuiteBinary;
 import org.gradle.nativebinaries.internal.AbstractProjectNativeBinary;
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver;
 import org.gradle.nativebinaries.platform.Platform;
@@ -27,10 +28,10 @@
 
 import java.io.File;
 
-public class DefaultTestSuiteExecutableBinary extends AbstractProjectNativeBinary implements TestSuiteExecutableBinary {
+public class DefaultNativeTestSuiteBinary extends AbstractProjectNativeBinary implements NativeTestSuiteBinary, TestSuiteExecutableBinary {
     private File executableFile;
 
-    public DefaultTestSuiteExecutableBinary(ProjectNativeComponent owner, Flavor flavor, ToolChainInternal toolChain, Platform targetPlatform, BuildType buildType, BinaryNamingScheme namingScheme, NativeDependencyResolver resolver) {
+    public DefaultNativeTestSuiteBinary(ProjectNativeComponent owner, Flavor flavor, ToolChainInternal toolChain, Platform targetPlatform, BuildType buildType, BinaryNamingScheme namingScheme, NativeDependencyResolver resolver) {
         super(owner, flavor, toolChain, targetPlatform, buildType, namingScheme, resolver);
     }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteContainer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteContainer.java
index dcf907dec3ec..1db8e7176ae7 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteContainer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/internal/DefaultTestSuiteContainer.java
@@ -18,13 +18,13 @@
 
 import org.gradle.api.internal.DefaultPolymorphicDomainObjectContainer;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.nativebinaries.test.TestSuite;
+import org.gradle.nativebinaries.test.NativeTestSuite;
 import org.gradle.nativebinaries.test.TestSuiteContainer;
 
 // TODO:DAZ Add a 'components' container (polymorphic), and then a writable container filtered by type that looks like a non-polymorphic container
 // Then 'executables', 'libraries' and 'testSuites' would all be filtered containers, not separate.
-public class DefaultTestSuiteContainer extends DefaultPolymorphicDomainObjectContainer<TestSuite> implements TestSuiteContainer {
+public class DefaultTestSuiteContainer extends DefaultPolymorphicDomainObjectContainer<NativeTestSuite> implements TestSuiteContainer {
     public DefaultTestSuiteContainer(Instantiator instantiator) {
-        super(TestSuite.class, instantiator);
+        super(NativeTestSuite.class, instantiator);
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/plugins/NativeBinariesTestPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/plugins/NativeBinariesTestPlugin.groovy
index fbacfc4018ad..2945cfa2c915 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/plugins/NativeBinariesTestPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/plugins/NativeBinariesTestPlugin.groovy
@@ -18,13 +18,13 @@ import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.internal.project.ProjectInternal
 import org.gradle.internal.reflect.Instantiator
-import org.gradle.language.base.BinaryContainer
+import org.gradle.runtime.base.BinaryContainer
 import org.gradle.model.ModelRules
 import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
+import org.gradle.nativebinaries.plugins.NativeComponentPlugin
 import org.gradle.nativebinaries.tasks.InstallExecutable
-import org.gradle.nativebinaries.test.TestSuiteExecutableBinary
+import org.gradle.nativebinaries.test.NativeTestSuiteBinary
 import org.gradle.nativebinaries.test.internal.DefaultTestSuiteContainer
 import org.gradle.nativebinaries.test.tasks.RunTestExecutable
 
@@ -48,7 +48,7 @@ public class NativeBinariesTestPlugin implements Plugin<ProjectInternal> {
     }
 
     public void apply(final ProjectInternal project) {
-        project.getPlugins().apply(NativeBinariesPlugin.class)
+        project.getPlugins().apply(NativeComponentPlugin.class)
 
         project.getExtensions().create(
                 "testSuites",
@@ -57,11 +57,10 @@ public class NativeBinariesTestPlugin implements Plugin<ProjectInternal> {
         );
 
         final BinaryContainer binaries = project.getExtensions().getByType(BinaryContainer.class);
-        binaries.withType(TestSuiteExecutableBinary).all { testBinary ->
+        binaries.withType(NativeTestSuiteBinary).all { testBinary ->
             def binary = testBinary as ProjectNativeBinaryInternal
             def namingScheme = binary.namingScheme
 
-            // TODO:DAZ Need a better model for accessing tasks related to binary
             def installTask = binary.tasks.withType(InstallExecutable).find()
 
             def runTask = project.tasks.create(namingScheme.getTaskName("run"), RunTestExecutable)
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/tasks/RunTestExecutable.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/tasks/RunTestExecutable.groovy
index 698a55f69e44..8596859d3668 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/tasks/RunTestExecutable.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/test/tasks/RunTestExecutable.groovy
@@ -15,6 +15,7 @@
  */
 
 package org.gradle.nativebinaries.test.tasks
+
 import org.gradle.api.GradleException
 import org.gradle.api.Incubating
 import org.gradle.api.internal.ConventionTask
@@ -23,9 +24,10 @@ import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.TaskAction
 import org.gradle.logging.ConsoleRenderer
-import org.gradle.process.ExecResult
-import org.gradle.process.internal.ExecAction
 import org.gradle.process.internal.ExecActionFactory
+
+import javax.inject.Inject
+
 /**
  * Runs a compiled and installed test executable.
  */
@@ -46,19 +48,18 @@ public class RunTestExecutable extends ConventionTask {
      */
     @Input boolean ignoreFailures
 
-    private ExecAction execAction;
-    private ExecResult execResult;
-
-    public RunTestExecutable() {
-        execAction = getServices().get(ExecActionFactory.class).newExecAction();
+    @Inject
+    ExecActionFactory getExecActionFactory() {
+        throw new UnsupportedOperationException()
     }
 
     @TaskAction
     void exec() {
+        def execAction = getExecActionFactory().newExecAction();
         execAction.setExecutable(getTestExecutable())
         execAction.setWorkingDir(getOutputDir())
         try {
-            execResult = execAction.execute();
+            execAction.execute();
         } catch (Exception e) {
             handleTestFailures(e);
         }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Clang.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Clang.java
index 0601249d732d..90239c6d0a10 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Clang.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Clang.java
@@ -25,7 +25,7 @@
  * The <a href="http://clang.llvm.org">Clang</a> tool chain.
  */
 @Incubating
-public interface Clang extends PlatformConfigurableToolChain {
+public interface Clang extends ConfigurableToolChain {
     /**
      * The paths setting required for executing the tool chain.
      * These are used to locate tools for this tool chain, and are prepended to the system PATH when executing these tools.
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/CommandLineToolConfiguration.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/CommandLineToolConfiguration.java
new file mode 100644
index 000000000000..9013a1c61cec
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/CommandLineToolConfiguration.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries.toolchain;
+
+import groovy.lang.Closure;
+import org.gradle.api.Action;
+import org.gradle.api.Incubating;
+import org.gradle.api.Named;
+
+import java.util.List;
+
+/**
+ * An executable tool that forms part of a tool chain.
+ */
+@Incubating
+public interface CommandLineToolConfiguration extends Named {
+
+    /**
+     * Adds an action that will be applied to the command-line arguments prior to execution.
+     * Remove method with Closure parameter and use Action instead
+     */
+    void withArguments(Closure arguments);
+
+    /**
+     * Adds an action that will be applied to the command-line arguments prior to execution.
+     */
+    void withArguments(Action<List<String>> arguments);
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryContainer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/ConfigurableToolChain.java
similarity index 74%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryContainer.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/ConfigurableToolChain.java
index 628f98710a34..329017b4ea34 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/LibraryContainer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/ConfigurableToolChain.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.gradle.nativebinaries;
+package org.gradle.nativebinaries.toolchain;
 
 import org.gradle.api.Incubating;
 import org.gradle.api.NamedDomainObjectSet;
 
 /**
- * A container of native libraries.
+ * A configurable tool chain.
+ * @param <T> the CommandLineToolConfiguration class
  */
 @Incubating
-public interface LibraryContainer extends NamedDomainObjectSet<Library> {
+public interface ConfigurableToolChain<T extends CommandLineToolConfiguration> extends ToolChain, NamedDomainObjectSet<T> {
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Gcc.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Gcc.java
index 1c65bf921133..2324c3088eb7 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Gcc.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/Gcc.java
@@ -25,7 +25,7 @@
  * The <a href="http://gcc.gnu.org/">GNU GCC</a> tool chain.
  */
 @Incubating
-public interface Gcc extends PlatformConfigurableToolChain {
+public interface Gcc extends ConfigurableToolChain {
     /**
      * The path required for executing the tool chain.
      * These are used to locate tools for this tool chain, and are prepended to the system PATH when executing these tools.
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/GccTool.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/GccCommandLineToolConfiguration.java
similarity index 75%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/GccTool.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/GccCommandLineToolConfiguration.java
index be4642f19406..6e777c9136bf 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/GccTool.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/GccCommandLineToolConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 
 package org.gradle.nativebinaries.toolchain;
 
-import groovy.lang.Closure;
+
 import org.gradle.api.Incubating;
 
 /**
- * An executable tool that forms part of a tool chain.
+ * An executable tool used for GCC that allows customizing the executable.
  */
 @Incubating
-public interface GccTool {
+public interface GccCommandLineToolConfiguration extends CommandLineToolConfiguration{
     /**
      * The name of the executable file for this tool.
      */
@@ -35,8 +35,4 @@ public interface GccTool {
      */
     void setExecutable(String file);
 
-    /**
-     * Adds an action that will be applied to the command-line arguments prior to execution.
-     */
-    void withArguments(Closure arguments);
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/PlatformConfigurableToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/PlatformConfigurableToolChain.java
index a74c8697217b..c0dbcac977b7 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/PlatformConfigurableToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/PlatformConfigurableToolChain.java
@@ -15,7 +15,12 @@
  */
 package org.gradle.nativebinaries.toolchain;
 
+import org.gradle.api.Action;
+import org.gradle.api.DomainObjectSet;
 import org.gradle.api.Incubating;
+import org.gradle.nativebinaries.platform.Platform;
+
+import java.util.List;
 
 /**
  * A ToolChain that can handle additional platforms simply by configuring the NativeBinary.
@@ -24,32 +29,43 @@
 public interface PlatformConfigurableToolChain extends ToolChain {
 
     /**
-     * Add configuration for a target platform.
+     * Add configuration for a target platform with additional configuration action.
+     */
+    public void target(Platform platform, Action<ConfigurableToolChain> action);
+
+    /**
+     * Add support for target platform.
      */
-    void addPlatformConfiguration(TargetPlatformConfiguration platformConfig);
+    public void target(Platform platform);
 
     /**
-     * The C++ compiler.
+     * Add support for a set of target platforms.
      */
-    GccTool getCCompiler();
+    public void target(DomainObjectSet<Platform> platform);
 
     /**
-     * The C compiler.
+     * Add support for target platform specified by name.
      */
-    GccTool getCppCompiler();
+    public void target(String platformName);
 
     /**
-     * The assembler.
+     * Add support for target platform specified by name.
      */
-    GccTool getAssembler();
+    public void target(List<String> platformNames);
 
     /**
-     * The linker.
+     * Add configuration for a set of target platforms with additional configuration action.
      */
-    GccTool getLinker();
+    public void target(DomainObjectSet<Platform> platform, Action<ConfigurableToolChain> action);
 
     /**
-     * The static library archiver.
+     * Add configuration for a target platform specified by name with additional configuration action.
      */
-    GccTool getStaticLibArchiver();
+    public void target(String platformName, Action<ConfigurableToolChain> action);
+
+    /**
+     * Add configuration for multiple target platforms specified by name with additional configuration action.
+     */
+    public void target(List<String> platformNames, Action<ConfigurableToolChain> action);
+
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/TargetPlatformConfiguration.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/TargetPlatformConfiguration.java
deleted file mode 100644
index eebc167e0375..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/TargetPlatformConfiguration.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.toolchain;
-
-import org.gradle.api.Incubating;
-import org.gradle.nativebinaries.platform.Platform;
-
-import java.util.List;
-
-/**
- * Configuration to add support for a target platform to a {@link PlatformConfigurableToolChain}.
- */
-@Incubating
-public interface TargetPlatformConfiguration {
-    /**
-     * Matches the platform that this configuration supports.
-     */
-    boolean supportsPlatform(Platform targetPlatform);
-
-    /**
-     * The additional args supplied to the C++ compiler to target the platform.
-     */
-    List<String> getCppCompilerArgs();
-
-    /**
-     * The additional args supplied to the C compiler to target the platform.
-     */
-    List<String> getCCompilerArgs();
-
-    /**
-     * The additional args supplied to the Objective-C++ compiler to target the platform.
-     */
-    List<String> getObjectiveCppCompilerArgs();
-
-    /**
-     * The additional args supplied to the Objective-C compiler to target the platform.
-     */
-    List<String> getObjectiveCCompilerArgs();
-
-    /**
-     * The additional args supplied to the Assembler to target the platform.
-     */
-    List<String> getAssemblerArgs();
-
-    /**
-     * The additional args supplied to the Static Library Archiver to target the platform.
-     */
-    List<String> getStaticLibraryArchiverArgs();
-
-    /**
-     * The additional args supplied to the Linker to target the platform.
-     */
-    List<String> getLinkerArgs();
-}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/VisualCpp.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/VisualCpp.java
index d432620d5240..4a59f97d381b 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/VisualCpp.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/VisualCpp.java
@@ -24,7 +24,7 @@
  * The Visual C++ tool chain.
  */
 @Incubating
-public interface VisualCpp extends ToolChain {
+public interface VisualCpp extends ConfigurableToolChain {
     /**
      * The directory where Visual Studio or Visual C++ is installed.
      */
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineTool.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineTool.java
index b06d42eaaec8..cc40bf8f42e8 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineTool.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineTool.java
@@ -18,28 +18,18 @@
 
 import com.google.common.base.Joiner;
 import org.gradle.api.GradleException;
-import org.gradle.api.Transformer;
-import org.gradle.api.internal.tasks.SimpleWorkResult;
-import org.gradle.api.tasks.WorkResult;
 import org.gradle.internal.os.OperatingSystem;
-import org.gradle.nativebinaries.internal.BinaryToolSpec;
 import org.gradle.process.internal.ExecAction;
 import org.gradle.process.internal.ExecActionFactory;
 import org.gradle.process.internal.ExecException;
 import org.gradle.util.GFileUtils;
 
 import java.io.File;
-import java.util.*;
 
-public class CommandLineTool<T extends BinaryToolSpec> {
+public class CommandLineTool {
     private final String action;
     private final File executable;
     private final ExecActionFactory execActionFactory;
-    private final Map<String, String> environment = new HashMap<String, String>();
-    private final List<File> path = new ArrayList<File>();
-    private ArgsTransformer<T> specToArgs;
-    private Transformer<T, T> specTransformer = new IdentityTransformer<T>();
-    private File workDir;
 
     public CommandLineTool(String action, File executable, ExecActionFactory execActionFactory) {
         this.action = action;
@@ -47,67 +37,29 @@ public CommandLineTool(String action, File executable, ExecActionFactory execAct
         this.execActionFactory = execActionFactory;
     }
 
-    public CommandLineTool<T> inWorkDirectory(File workDir) {
-        GFileUtils.mkdirs(workDir);
-        this.workDir = workDir;
-        return this;
-    }
-
-    public CommandLineTool<T> withSpecTransformer(Transformer<T, T> specAction) {
-        this.specTransformer = specAction;
-        return this;
-    }
-
-    public CommandLineTool<T> withPath(List<File> pathEntries) {
-        path.addAll(pathEntries);
-        return this;
-    }
-
-    public CommandLineTool<T> withPath(File... pathEntries) {
-        Collections.addAll(path, pathEntries);
-        return this;
-    }
-
-    public CommandLineTool<T> withEnvironmentVar(String name, String value) {
-        environment.put(name, value);
-        return this;
-    }
-
-    public CommandLineTool<T> withArguments(ArgsTransformer<T> arguments) {
-        this.specToArgs = arguments;
-        return this;
-    }
-
-    public WorkResult execute(T spec) {
+    public void execute(CommandLineToolInvocation invocation) {
         ExecAction compiler = execActionFactory.newExecAction();
         compiler.executable(executable);
-        if (workDir != null) {
-            compiler.workingDir(workDir);
+        if (invocation.getWorkDirectory() != null) {
+            GFileUtils.mkdirs(invocation.getWorkDirectory());
+            compiler.workingDir(invocation.getWorkDirectory());
         }
 
-        List<String> args = specToArgs.transform(specTransformer.transform(spec));
-        compiler.args(args);
+        compiler.args(invocation.getArgs());
 
-        if (!path.isEmpty()) {
+        if (!invocation.getPath().isEmpty()) {
             String pathVar = OperatingSystem.current().getPathVar();
-            String compilerPath = Joiner.on(File.pathSeparator).join(path);
+            String compilerPath = Joiner.on(File.pathSeparator).join(invocation.getPath());
             compilerPath = compilerPath + File.pathSeparator + System.getenv(pathVar);
             compiler.environment(pathVar, compilerPath);
         }
 
-        compiler.environment(environment);
+        compiler.environment(invocation.getEnvironment());
 
         try {
             compiler.execute();
         } catch (ExecException e) {
             throw new GradleException(String.format("%s failed; see the error output for details.", action), e);
         }
-        return new SimpleWorkResult(true);
-    }
-
-    static class IdentityTransformer<T> implements Transformer<T, T> {
-        public T transform(T original) {
-            return original;
-        }
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineToolInvocation.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineToolInvocation.java
new file mode 100644
index 000000000000..ca62f6733fa3
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/CommandLineToolInvocation.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.toolchain.internal;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+public interface CommandLineToolInvocation {
+    MutableCommandLineToolInvocation copy();
+
+    File getWorkDirectory();
+
+    List<File> getPath();
+
+    Map<String, String> getEnvironment();
+
+    List<String> getArgs();
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultCommandLineToolInvocation.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultCommandLineToolInvocation.java
new file mode 100644
index 000000000000..c9558e0133a0
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultCommandLineToolInvocation.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.toolchain.internal;
+
+import com.google.common.collect.Lists;
+import org.gradle.api.Action;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DefaultCommandLineToolInvocation implements MutableCommandLineToolInvocation {
+    private final List<Action<List<String>>> postArgsActions = new ArrayList<Action<List<String>>>();
+    private final Map<String, String> environment = new HashMap<String, String>();
+    private final List<File> path = new ArrayList<File>();
+    private List<String> args = new ArrayList<String>();
+    private File workDirectory;
+
+    public MutableCommandLineToolInvocation copy() {
+        DefaultCommandLineToolInvocation invocation = new DefaultCommandLineToolInvocation();
+        for (Action<List<String>> postArgsAction : postArgsActions) {
+            invocation.addPostArgsAction(postArgsAction);
+        }
+        invocation.args.addAll(this.args);
+        invocation.workDirectory = this.workDirectory;
+        invocation.path.addAll(this.path);
+        invocation.environment.putAll(environment);
+        return invocation;
+    }
+
+    public void addPostArgsAction(Action<List<String>> postArgsAction) {
+        postArgsActions.add(postArgsAction);
+    }
+
+    public List<String> getArgs() {
+        List<String> transformedArgs = Lists.newArrayList(args);
+        for (Action<List<String>> postArgsAction : postArgsActions) {
+            postArgsAction.execute(transformedArgs);
+        }
+        return transformedArgs;
+    }
+
+    public void setArgs(List<String> args) {
+        this.args = args;
+    }
+
+    public File getWorkDirectory() {
+        return workDirectory;
+    }
+
+    public void setWorkDirectory(File workDirectory) {
+        this.workDirectory = workDirectory;
+    }
+
+    public void addPath(File pathEntry) {
+        this.path.add(pathEntry);
+    }
+
+    public void addPath(List<File> path) {
+        this.path.addAll(path);
+    }
+
+    public List<File> getPath() {
+        return path;
+    }
+
+    public Map<String, String> getEnvironment() {
+        return environment;
+    }
+
+    public void addEnvironmentVar(String key, String value) {
+        this.environment.put(key, value);
+    }
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistry.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistry.java
index 3c57b7026507..d591a2f28786 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistry.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistry.java
@@ -64,7 +64,7 @@ public void addDefaultToolChains() {
 
     public ToolChain getForPlatform(Platform targetPlatform) {
         for (ToolChainInternal toolChain : searchOrder) {
-            if (toolChain.target(targetPlatform).isAvailable()) {
+            if (toolChain.select(targetPlatform).isAvailable()) {
                 return toolChain;
             }
         }
@@ -72,7 +72,7 @@ public ToolChain getForPlatform(Platform targetPlatform) {
         // No tool chains can build for this platform. Assemble a description of why
         Map<String, PlatformToolChain> candidates = new LinkedHashMap<String, PlatformToolChain>();
         for (ToolChainInternal toolChain : searchOrder) {
-            candidates.put(toolChain.getDisplayName(), toolChain.target(targetPlatform));
+            candidates.put(toolChain.getDisplayName(), toolChain.select(targetPlatform));
         }
 
         return new UnavailableToolChain(new UnavailableToolChainDescription(targetPlatform, candidates));
@@ -122,7 +122,7 @@ public String getName() {
             return "unavailable";
         }
 
-        public PlatformToolChain target(Platform targetPlatform) {
+        public PlatformToolChain select(Platform targetPlatform) {
             return new UnavailablePlatformToolChain(failure);
         }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/AbstractToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ExtendableToolChain.java
similarity index 79%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/AbstractToolChain.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ExtendableToolChain.java
index 0a78c3116619..b82faa35082d 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/AbstractToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ExtendableToolChain.java
@@ -16,17 +16,21 @@
 
 package org.gradle.nativebinaries.toolchain.internal;
 
+import org.gradle.api.internal.DefaultNamedDomainObjectSet;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.internal.os.OperatingSystem;
+import org.gradle.internal.reflect.Instantiator;
+import org.gradle.nativebinaries.toolchain.CommandLineToolConfiguration;
 
 import java.io.File;
 
-public abstract class AbstractToolChain implements ToolChainInternal {
+public abstract class ExtendableToolChain<T extends CommandLineToolConfiguration> extends DefaultNamedDomainObjectSet<T> implements ToolChainInternal {
     private final String name;
     protected final OperatingSystem operatingSystem;
     private final FileResolver fileResolver;
 
-    protected AbstractToolChain(String name, OperatingSystem operatingSystem, FileResolver fileResolver) {
+    protected ExtendableToolChain(Class<? extends T> type, String name, OperatingSystem operatingSystem, FileResolver fileResolver, Instantiator instantiator) {
+        super(type, instantiator);
         this.name = name;
         this.operatingSystem = operatingSystem;
         this.fileResolver = fileResolver;
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/MutableCommandLineToolInvocation.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/MutableCommandLineToolInvocation.java
new file mode 100644
index 000000000000..c9038b947049
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/MutableCommandLineToolInvocation.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.toolchain.internal;
+
+import org.gradle.api.Action;
+
+import java.io.File;
+import java.util.List;
+
+public interface MutableCommandLineToolInvocation extends CommandLineToolInvocation {
+    void addPostArgsAction(Action<List<String>> postArgsAction);
+
+    void setArgs(List<String> args);
+
+    void setWorkDirectory(File workDirectory);
+
+    void addPath(File pathEntry);
+
+    void addPath(List<File> path);
+
+    void addEnvironmentVar(String key, String value);
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/NativeCompileSpec.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/NativeCompileSpec.java
index 4efbccc4cca3..954bc27672c1 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/NativeCompileSpec.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/NativeCompileSpec.java
@@ -60,4 +60,8 @@ public interface NativeCompileSpec extends BinaryToolSpec {
     boolean isPositionIndependentCode();
 
     void setPositionIndependentCode(boolean flag);
+
+    boolean isIncrementalCompile();
+
+    void setIncrementalCompile(boolean flag);
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OptionsFileArgsTransformer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OptionsFileArgsTransformer.java
index 88f4393dde32..4a99f5dca86e 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OptionsFileArgsTransformer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OptionsFileArgsTransformer.java
@@ -16,32 +16,32 @@
 
 package org.gradle.nativebinaries.toolchain.internal;
 
+import com.beust.jcommander.internal.Lists;
 import org.apache.commons.io.IOUtils;
+import org.gradle.api.Action;
 import org.gradle.api.Transformer;
 import org.gradle.api.UncheckedIOException;
 import org.gradle.api.internal.tasks.compile.ArgWriter;
-import org.gradle.nativebinaries.internal.BinaryToolSpec;
 import org.gradle.util.GFileUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.ArrayList;
 import java.util.List;
 
-public class OptionsFileArgsTransformer<T extends BinaryToolSpec> implements ArgsTransformer<T> {
+public class OptionsFileArgsTransformer implements Action<List<String>> {
     private final Transformer<ArgWriter, PrintWriter> argWriterFactory;
-    private final ArgsTransformer<T> delegate;
+    private final File tempDir;
 
-    public OptionsFileArgsTransformer(Transformer<ArgWriter, PrintWriter> argWriterFactory, ArgsTransformer<T> delegate) {
+    public OptionsFileArgsTransformer(Transformer<ArgWriter, PrintWriter> argWriterFactory, File tempDir) {
         this.argWriterFactory = argWriterFactory;
-        this.delegate = delegate;
+        this.tempDir = tempDir;
     }
 
-    public List<String> transform(T spec) {
-        List<String> output = new ArrayList<String>();
-        transformArgs(delegate.transform(spec), output, spec.getTempDir());
-        return output;
+    public void execute(List<String> args) {
+        List<String> original = Lists.newArrayList(args);
+        args.clear();
+        transformArgs(original, args, tempDir);
     }
 
     protected void transformArgs(List<String> input, List<String> output, File tempDir) {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OutputCleaningCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OutputCleaningCompiler.java
index 5b51ce8852b8..b0ad9956f418 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OutputCleaningCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/OutputCleaningCompiler.java
@@ -19,7 +19,7 @@
 import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
-import org.gradle.internal.hash.HashUtil;
+import org.gradle.nativebinaries.internal.CompilerOutputFileNamingScheme;
 
 import java.io.File;
 
@@ -59,9 +59,9 @@ private boolean deleteOutputsForRemovedSources(NativeCompileSpec spec) {
     }
 
     private File getObjectFile(File objectFileRoot, File sourceFile) {
-        String objectFileName = sourceFile.getName().replaceFirst("\\.[^\\.]+$", outputFileSuffix);
-        String compactMD5 = HashUtil.createCompactMD5(sourceFile.getAbsolutePath());
-        File objectFileDir = new File(objectFileRoot, compactMD5);
-        return new File(objectFileDir, objectFileName);
+        return new CompilerOutputFileNamingScheme()
+                        .withObjectFileNameSuffix(outputFileSuffix)
+                        .withOutputBaseFolder(objectFileRoot)
+                        .map(sourceFile);
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/PlatformToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/PlatformToolChain.java
index a3c8fa0f55cd..005877e5fcb9 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/PlatformToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/PlatformToolChain.java
@@ -17,24 +17,29 @@
 package org.gradle.nativebinaries.toolchain.internal;
 
 import org.gradle.api.internal.tasks.compile.Compiler;
-import org.gradle.nativebinaries.internal.BinaryToolSpec;
 import org.gradle.nativebinaries.internal.LinkerSpec;
 import org.gradle.nativebinaries.internal.StaticLibraryArchiverSpec;
+import org.gradle.nativebinaries.language.assembler.internal.AssembleSpec;
+import org.gradle.nativebinaries.language.c.internal.CCompileSpec;
+import org.gradle.nativebinaries.language.cpp.internal.CppCompileSpec;
+import org.gradle.nativebinaries.language.objectivec.internal.ObjectiveCCompileSpec;
+import org.gradle.nativebinaries.language.objectivecpp.internal.ObjectiveCppCompileSpec;
+import org.gradle.nativebinaries.language.rc.internal.WindowsResourceCompileSpec;
 
 public interface PlatformToolChain extends ToolSearchResult {
-    <T extends BinaryToolSpec> Compiler<T> createCppCompiler();
+    Compiler<CppCompileSpec> createCppCompiler();
 
-    <T extends BinaryToolSpec> Compiler<T> createCCompiler();
+    Compiler<CCompileSpec> createCCompiler();
 
-    <T extends BinaryToolSpec> Compiler<T> createObjectiveCppCompiler();
+    Compiler<ObjectiveCppCompileSpec> createObjectiveCppCompiler();
 
-    <T extends BinaryToolSpec> Compiler<T> createObjectiveCCompiler();
+    Compiler<ObjectiveCCompileSpec> createObjectiveCCompiler();
 
-    <T extends BinaryToolSpec> Compiler<T> createAssembler();
+    Compiler<AssembleSpec> createAssembler();
 
-    <T extends BinaryToolSpec> Compiler<T> createWindowsResourceCompiler();
+    Compiler<WindowsResourceCompileSpec> createWindowsResourceCompiler();
 
-    <T extends LinkerSpec> Compiler<T> createLinker();
+    Compiler<LinkerSpec> createLinker();
 
-    <T extends StaticLibraryArchiverSpec> Compiler<T> createStaticLibraryArchiver();
+    Compiler<StaticLibraryArchiverSpec> createStaticLibraryArchiver();
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/SingleSourceCompileArgTransformer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/SingleSourceCompileArgTransformer.java
index 44ed06da18d4..f09bb5921ab9 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/SingleSourceCompileArgTransformer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/SingleSourceCompileArgTransformer.java
@@ -16,26 +16,27 @@
 
 package org.gradle.nativebinaries.toolchain.internal;
 
+import org.gradle.api.Transformer;
 import org.gradle.internal.FileUtils;
-import org.gradle.internal.hash.HashUtil;
+import org.gradle.nativebinaries.internal.CompilerOutputFileNamingScheme;
+import org.gradle.util.CollectionUtils;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class SingleSourceCompileArgTransformer<T extends NativeCompileSpec> implements ArgsTransformer<T> {
     private final ArgsTransformer<T> delegate;
-    private final String objectFileName;
+    private final String objectFileNameSuffix;
     private final File sourceFile;
-    private final boolean usingVisualCToolChain;
+    private final Transformer<List<String>, File> outputFileArgTransformer;
     private final boolean windowsPathLengthLimitation;
 
-    public SingleSourceCompileArgTransformer(File sourceFile, String objectFileName, ArgsTransformer<T> delegate, boolean windowsPathLengthLimitation, boolean usingVisualCToolChain) {
+    public SingleSourceCompileArgTransformer(File sourceFile, String objectFileNameSuffixExtension, ArgsTransformer<T> delegate, boolean windowsPathLengthLimitation, Transformer<List<String>, File> outputFileArgTransformer) {
         this.sourceFile = sourceFile;
         this.delegate = delegate;
-        this.objectFileName = objectFileName;
-        this.usingVisualCToolChain = usingVisualCToolChain;
+        this.objectFileNameSuffix = objectFileNameSuffixExtension;
+        this.outputFileArgTransformer = outputFileArgTransformer;
         this.windowsPathLengthLimitation = windowsPathLengthLimitation;
     }
 
@@ -46,21 +47,19 @@ public List<String> transform(T spec) {
         args.addAll(delegate.transform(spec));
         args.add(sourceFile.getAbsolutePath());
 
-        if (usingVisualCToolChain) {
-            Collections.addAll(args, "/Fo" + outputFilePath.getAbsolutePath());
-        } else {
-            Collections.addAll(args, "-o", outputFilePath.getAbsolutePath());
-        }
+        CollectionUtils.addAll(args, outputFileArgTransformer.transform(outputFilePath));
         return args;
     }
 
     protected File getOutputFileDir(File sourceFile, File objectFileDir) {
-        String compactMD5 = HashUtil.createCompactMD5(sourceFile.getAbsolutePath());
-        File outputFileDir = new File(objectFileDir, compactMD5);
-        if(!outputFileDir.exists()){
-            outputFileDir.mkdir();
+        File outputFile = new CompilerOutputFileNamingScheme()
+                                .withObjectFileNameSuffix(objectFileNameSuffix)
+                                .withOutputBaseFolder(objectFileDir)
+                                .map(sourceFile);
+        File outputDirectory = outputFile.getParentFile();
+        if (!outputDirectory.exists()) {
+            outputDirectory.mkdirs();
         }
-        File outputFile = new File(outputFileDir, objectFileName);
         return windowsPathLengthLimitation ? FileUtils.assertInWindowsPathLengthLimitation(outputFile) : outputFile;
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainInternal.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainInternal.java
index 2e53bcf9f7a2..cc8479752926 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainInternal.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/ToolChainInternal.java
@@ -23,9 +23,8 @@ public interface ToolChainInternal extends ToolChain {
     /**
      * Locates the tools that can target the given platform.
      */
-    PlatformToolChain target(Platform targetPlatform);
+    PlatformToolChain select(Platform targetPlatform);
 
-    // TODO:DAZ These are platform-specific
     String getExecutableName(String executablePath);
 
     String getSharedLibraryName(String libraryPath);
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/UnavailablePlatformToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/UnavailablePlatformToolChain.java
index fe4d0f2b86ee..e2ad4d81bb15 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/UnavailablePlatformToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/UnavailablePlatformToolChain.java
@@ -19,9 +19,14 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.internal.text.TreeFormatter;
-import org.gradle.nativebinaries.internal.BinaryToolSpec;
 import org.gradle.nativebinaries.internal.LinkerSpec;
 import org.gradle.nativebinaries.internal.StaticLibraryArchiverSpec;
+import org.gradle.nativebinaries.language.assembler.internal.AssembleSpec;
+import org.gradle.nativebinaries.language.c.internal.CCompileSpec;
+import org.gradle.nativebinaries.language.cpp.internal.CppCompileSpec;
+import org.gradle.nativebinaries.language.objectivec.internal.ObjectiveCCompileSpec;
+import org.gradle.nativebinaries.language.objectivecpp.internal.ObjectiveCppCompileSpec;
+import org.gradle.nativebinaries.language.rc.internal.WindowsResourceCompileSpec;
 import org.gradle.util.TreeVisitor;
 
 public class UnavailablePlatformToolChain implements PlatformToolChain {
@@ -45,35 +50,35 @@ private RuntimeException failure() {
         return new GradleException(formatter.toString());
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createAssembler() {
+    public Compiler<CppCompileSpec> createCppCompiler() {
         throw failure();
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createCppCompiler() {
+    public Compiler<CCompileSpec> createCCompiler() {
         throw failure();
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createCCompiler() {
+    public Compiler<ObjectiveCppCompileSpec> createObjectiveCppCompiler() {
         throw failure();
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createObjectiveCppCompiler() {
+    public Compiler<ObjectiveCCompileSpec> createObjectiveCCompiler() {
         throw failure();
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createObjectiveCCompiler() {
+    public Compiler<AssembleSpec> createAssembler() {
         throw failure();
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createWindowsResourceCompiler() {
+    public Compiler<WindowsResourceCompileSpec> createWindowsResourceCompiler() {
         throw failure();
     }
 
-    public <T extends LinkerSpec> Compiler<T> createLinker() {
+    public Compiler<LinkerSpec> createLinker() {
         throw failure();
     }
 
-    public <T extends StaticLibraryArchiverSpec> Compiler<T> createStaticLibraryArchiver() {
+    public Compiler<StaticLibraryArchiverSpec> createStaticLibraryArchiver() {
         throw failure();
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/clang/ClangToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/clang/ClangToolChain.java
index 0ef94a80c54c..aed3ac9004a8 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/clang/ClangToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/clang/ClangToolChain.java
@@ -18,25 +18,23 @@
 
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.internal.os.OperatingSystem;
+import org.gradle.internal.reflect.Instantiator;
 import org.gradle.nativebinaries.toolchain.Clang;
 import org.gradle.nativebinaries.toolchain.internal.ToolType;
 import org.gradle.nativebinaries.toolchain.internal.gcc.AbstractGccCompatibleToolChain;
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultGccCommandLineToolConfiguration;
 import org.gradle.nativebinaries.toolchain.internal.tools.ToolSearchPath;
 import org.gradle.process.internal.ExecActionFactory;
 
 public class ClangToolChain extends AbstractGccCompatibleToolChain implements Clang {
     public static final String DEFAULT_NAME = "clang";
 
-    public ClangToolChain(String name, OperatingSystem operatingSystem, FileResolver fileResolver, ExecActionFactory execActionFactory) {
-        super(name, operatingSystem, fileResolver, execActionFactory, new ToolSearchPath(operatingSystem));
-
-        registerTool(ToolType.CPP_COMPILER, "clang++");
-        registerTool(ToolType.C_COMPILER, "clang");
-        registerTool(ToolType.OBJECTIVECPP_COMPILER, "clang++");
-        registerTool(ToolType.OBJECTIVEC_COMPILER, "clang");
-        registerTool(ToolType.ASSEMBLER, "as");
-        registerTool(ToolType.LINKER, "clang++");
-        registerTool(ToolType.STATIC_LIB_ARCHIVER, "ar");
+    public ClangToolChain(String name, OperatingSystem operatingSystem, FileResolver fileResolver, ExecActionFactory execActionFactory, Instantiator instantiator) {
+        super(name, operatingSystem, fileResolver, execActionFactory, new ToolSearchPath(operatingSystem), instantiator);
+        add(new DefaultGccCommandLineToolConfiguration("linker", ToolType.LINKER, "clang++"));
+        add(new DefaultGccCommandLineToolConfiguration("staticLibArchiver", ToolType.STATIC_LIB_ARCHIVER, "ar"));
+        add(new DefaultGccCommandLineToolConfiguration("cCompiler", ToolType.C_COMPILER, "clang"));
+        add(new DefaultGccCommandLineToolConfiguration("cppCompiler", ToolType.CPP_COMPILER, "clang++"));
     }
 
     @Override
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
index 5a7575b14762..e2de591a36a8 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChain.java
@@ -15,58 +15,59 @@
  */
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
+import org.gradle.api.Action;
+import org.gradle.api.DomainObjectSet;
+import org.gradle.api.Transformer;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.internal.Actions;
 import org.gradle.internal.os.OperatingSystem;
+import org.gradle.internal.reflect.Instantiator;
 import org.gradle.nativebinaries.platform.Platform;
 import org.gradle.nativebinaries.platform.internal.ArchitectureInternal;
-import org.gradle.nativebinaries.toolchain.GccTool;
+import org.gradle.nativebinaries.toolchain.CommandLineToolConfiguration;
+import org.gradle.nativebinaries.toolchain.ConfigurableToolChain;
 import org.gradle.nativebinaries.toolchain.PlatformConfigurableToolChain;
-import org.gradle.nativebinaries.toolchain.TargetPlatformConfiguration;
-import org.gradle.nativebinaries.toolchain.internal.*;
-import org.gradle.nativebinaries.toolchain.internal.tools.*;
+import org.gradle.nativebinaries.toolchain.internal.ExtendableToolChain;
+import org.gradle.nativebinaries.toolchain.internal.PlatformToolChain;
+import org.gradle.nativebinaries.toolchain.internal.ToolChainAvailability;
+import org.gradle.nativebinaries.toolchain.internal.UnavailablePlatformToolChain;
+import org.gradle.nativebinaries.toolchain.internal.tools.ConfiguredToolRegistry;
+import org.gradle.nativebinaries.toolchain.internal.tools.GccCommandLineToolConfigurationInternal;
+import org.gradle.nativebinaries.toolchain.internal.tools.ToolRegistry;
+import org.gradle.nativebinaries.toolchain.internal.tools.ToolSearchPath;
 import org.gradle.process.internal.ExecActionFactory;
+import org.gradle.util.CollectionUtils;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 import static java.util.Arrays.asList;
-import static java.util.Collections.emptyList;
 
 /**
  * A tool chain that has GCC semantics, where all platform variants are produced by varying the tool args.
  */
-public abstract class AbstractGccCompatibleToolChain extends AbstractToolChain implements PlatformConfigurableToolChain {
+public abstract class AbstractGccCompatibleToolChain extends ExtendableToolChain implements PlatformConfigurableToolChain, ConfigurableToolChain {
     private final ExecActionFactory execActionFactory;
     private final ToolSearchPath toolSearchPath;
-    private final DefaultToolRegistry toolRegistry = new DefaultToolRegistry();
-
     private final List<TargetPlatformConfiguration> platformConfigs = new ArrayList<TargetPlatformConfiguration>();
+    private final Instantiator instantiator;
     private int configInsertLocation;
 
-    public AbstractGccCompatibleToolChain(String name, OperatingSystem operatingSystem, FileResolver fileResolver, ExecActionFactory execActionFactory, ToolSearchPath toolSearchPath) {
-        super(name, operatingSystem, fileResolver);
+    public AbstractGccCompatibleToolChain(String name, OperatingSystem operatingSystem, FileResolver fileResolver, ExecActionFactory execActionFactory, ToolSearchPath toolSearchPath,
+                                          Instantiator instantiator) {
+        super(GccCommandLineToolConfigurationInternal.class, name, operatingSystem, fileResolver, instantiator);
         this.execActionFactory = execActionFactory;
         this.toolSearchPath = toolSearchPath;
+        this.instantiator = instantiator;
 
-        addPlatformConfiguration(new ToolChainDefaultArchitecture());
-        addPlatformConfiguration(new Intel32Architecture());
-        addPlatformConfiguration(new Intel64Architecture());
+        target(new ToolChainDefaultArchitecture());
+        target(new Intel32Architecture());
+        target(new Intel64Architecture());
         configInsertLocation = 0;
     }
 
-    protected GccTool getTool(ToolType toolType) {
-        return toolRegistry.getTool(toolType);
-    }
-
-    protected void registerTool(ToolType type, String defaultExecutable) {
-        toolRegistry.register(type, defaultExecutable);
-    }
-
-    protected CommandLineToolSearchResult locate(ToolType type) {
-        GccTool gccTool = getTool(type);
-        return toolSearchPath.locate(type, gccTool.getExecutable());
+    protected CommandLineToolSearchResult locate(GccCommandLineToolConfigurationInternal gccTool) {
+        return toolSearchPath.locate(gccTool.getToolType(), gccTool.getExecutable());
     }
 
     public List<File> getPath() {
@@ -79,39 +80,84 @@ public void path(Object... pathEntries) {
         }
     }
 
-    protected void initTools(ToolChainAvailability availability) {
-        for (ToolType type : ToolType.values()) {
-            locate(type);
-        }
+    protected void initTools(ConfigurableToolChain configurableToolChain, ToolChainAvailability availability) {
+        SortedMap allTools = configurableToolChain.getAsMap();
         boolean found = false;
-        for (ToolType type : Arrays.asList(ToolType.C_COMPILER, ToolType.CPP_COMPILER, ToolType.OBJECTIVEC_COMPILER, ToolType.OBJECTIVECPP_COMPILER)) {
-            found |= locate(type).isAvailable();
+        for (Object o : allTools.values()) {
+            GccCommandLineToolConfigurationInternal tool = (GccCommandLineToolConfigurationInternal) o;
+            found |= toolSearchPath.locate(tool.getToolType(), tool.getExecutable()).isAvailable();
         }
         if (!found) {
-            availability.mustBeAvailable(locate(ToolType.C_COMPILER));
+            GccCommandLineToolConfigurationInternal cCompiler = (GccCommandLineToolConfigurationInternal) findByName("cCompiler");
+            if(cCompiler==null){
+                availability.unavailable("c compiler not found");
+            }else{
+                availability.mustBeAvailable(locate(cCompiler));
+            }
         }
     }
+    public void target(Platform platform) {
+        target(platform, Actions.<ConfigurableToolChain>doNothing());
+    }
+
+    public void target(DomainObjectSet<Platform> platforms) {
+        target(platforms, Actions.<ConfigurableToolChain>doNothing());
+    }
+
+    public void target(String platformName) {
+        target(platformName, Actions.<ConfigurableToolChain>doNothing());
+    }
+
+    public void target(List<String> platformNames) {
+        target(platformNames, Actions.<ConfigurableToolChain>doNothing());
+    }
 
-    public void addPlatformConfiguration(TargetPlatformConfiguration platformConfig) {
-        platformConfigs.add(configInsertLocation, platformConfig);
+    public void target(Platform platform, Action<ConfigurableToolChain> action) {
+        target(platform.getName(), action);
+    }
+
+    public void target(DomainObjectSet<Platform> platforms, Action<ConfigurableToolChain> action) {
+        Set<String> platformNames = CollectionUtils.collect(platforms, new Transformer<String, Platform>() {
+            public String transform(Platform original) {
+                return original.getName();
+            }
+        });
+        target(new DefaultTargetPlatformConfiguration(platformNames, action));
+    }
+
+    public void target(String platformName, Action<ConfigurableToolChain> action) {
+        target(new DefaultTargetPlatformConfiguration(asList(platformName), action));
+    }
+
+    public void target(List<String> platformNames, Action<ConfigurableToolChain> action) {
+        target(new DefaultTargetPlatformConfiguration(platformNames, action));
+    }
+
+    void target(TargetPlatformConfiguration targetPlatformConfiguration) {
+        platformConfigs.add(configInsertLocation, targetPlatformConfiguration);
         configInsertLocation++;
     }
 
-    public PlatformToolChain target(Platform targetPlatform) {
-        TargetPlatformConfiguration platformConfiguration = getPlatformConfiguration(targetPlatform);
+    public PlatformToolChain select(Platform targetPlatform) {
+        TargetPlatformConfiguration targetPlatformConfigurationConfiguration = getPlatformConfiguration(targetPlatform);
         ToolChainAvailability result = new ToolChainAvailability();
-        if (platformConfiguration == null) {
+        if (targetPlatformConfigurationConfiguration == null) {
             result.unavailable(String.format("Don't know how to build for platform '%s'.", targetPlatform.getName()));
             return new UnavailablePlatformToolChain(result);
         }
-        initTools(result);
+
+        DefaultGccConfigurableToolChain configurableToolChain  = instantiator.newInstance(DefaultGccConfigurableToolChain.class, CommandLineToolConfiguration.class, getAsMap(), instantiator, getName(), getDisplayName());
+        // apply the platform configuration
+        targetPlatformConfigurationConfiguration.apply(configurableToolChain);
+
+        initTools(configurableToolChain, result);
         if (!result.isAvailable()) {
             return new UnavailablePlatformToolChain(result);
         }
 
-        // Target the tools for the platform
-        ToolRegistry platformTools = new PlatformToolRegistry(toolRegistry, platformConfiguration);
-        return new GccPlatformToolChain(toolSearchPath, platformTools, execActionFactory, canUseCommandFile());
+        ToolRegistry platformTools = new ConfiguredToolRegistry(configurableToolChain);
+        String objectFileSuffix = targetPlatform.getOperatingSystem().isWindows() ? ".obj" : ".o";
+        return new GccPlatformToolChain(toolSearchPath, platformTools, execActionFactory, objectFileSuffix, canUseCommandFile());
     }
 
     protected TargetPlatformConfiguration getPlatformConfiguration(Platform targetPlatform) {
@@ -127,101 +173,73 @@ protected boolean canUseCommandFile() {
         return true;
     }
 
-    public GccTool getCppCompiler() {
-        return getTool(ToolType.CPP_COMPILER);
-    }
-
-    public GccTool getCCompiler() {
-        return getTool(ToolType.C_COMPILER);
-    }
-
-    // This is here to allow using this property from Groovy as `cCompiler`
-    public GccTool getcCompiler() {
-        return getTool(ToolType.C_COMPILER);
-    }
-
-    public GccTool getAssembler() {
-        return getTool(ToolType.ASSEMBLER);
-    }
-
-    public GccTool getLinker() {
-        return getTool(ToolType.LINKER);
-    }
-
-    public GccTool getStaticLibArchiver() {
-        return getTool(ToolType.STATIC_LIB_ARCHIVER);
-    }
     private static class ToolChainDefaultArchitecture implements TargetPlatformConfiguration {
         public boolean supportsPlatform(Platform targetPlatform) {
             return targetPlatform.getOperatingSystem().isCurrent()
-                && targetPlatform.getArchitecture() == ArchitectureInternal.TOOL_CHAIN_DEFAULT;
-        }
-
-        public List<String> getAssemblerArgs() {
-            return emptyList();
-        }
-
-        public List<String> getCppCompilerArgs() {
-            return emptyList();
-        }
-
-        public List<String> getCCompilerArgs() {
-            return emptyList();
-        }
-
-        public List<String> getObjectiveCppCompilerArgs() {
-            return emptyList();
+                    && targetPlatform.getArchitecture() == ArchitectureInternal.TOOL_CHAIN_DEFAULT;
         }
 
-        public List<String> getObjectiveCCompilerArgs() {
-            return emptyList();
-        }
-
-        public List<String> getStaticLibraryArchiverArgs() {
-            return emptyList();
-        }
-
-        public List<String> getLinkerArgs() {
-            return emptyList();
+        public ConfigurableToolChain apply(ConfigurableToolChain configurableToolChain) {
+            return configurableToolChain;
         }
     }
 
     private static class Intel32Architecture implements TargetPlatformConfiguration {
+
         public boolean supportsPlatform(Platform targetPlatform) {
             return targetPlatform.getOperatingSystem().isCurrent()
                     && ((ArchitectureInternal) targetPlatform.getArchitecture()).isI386();
         }
 
-        public List<String> getCppCompilerArgs() {
-            return asList("-m32");
-        }
-
-        public List<String> getCCompilerArgs() {
-            return asList("-m32");
-        }
-
-        public List<String> getObjectiveCppCompilerArgs() {
-            return asList("-m32");
-        }
-
-        public List<String> getObjectiveCCompilerArgs() {
-            return asList("-m32");
-        }
-
-        public List<String> getAssemblerArgs() {
-            if (OperatingSystem.current().isMacOsX()) {
-                return asList("-arch", "i386");
-            } else {
-                return asList("--32");
-            }
-        }
-
-        public List<String> getLinkerArgs() {
-            return asList("-m32");
-        }
-
-        public List<String> getStaticLibraryArchiverArgs() {
-            return emptyList();
+        public ConfigurableToolChain apply(ConfigurableToolChain configurableToolChain) {
+            Action<ConfigurableToolChain> action = new Action<ConfigurableToolChain>() {
+                public void execute(ConfigurableToolChain configurableToolChain) {
+                    Action<List<String>> m32args = new Action<List<String>>() {
+                        public void execute(List<String> args) {
+                            args.add("-m32");
+                        }
+                    };
+                    CommandLineToolConfiguration cppCompiler = (CommandLineToolConfiguration) configurableToolChain.findByName("cppCompiler");
+                    if(cppCompiler!=null){
+                        cppCompiler.withArguments(m32args);
+                    }
+
+                    CommandLineToolConfiguration cCompiler = (CommandLineToolConfiguration) configurableToolChain.findByName("cCompiler");
+                    if(cCompiler != null){
+                        cCompiler.withArguments(m32args);
+                    }
+
+                    CommandLineToolConfiguration objcCompiler = (CommandLineToolConfiguration) configurableToolChain.findByName("objcCompiler");
+                    if(objcCompiler != null){
+                        objcCompiler.withArguments(m32args);
+                    }
+
+                    CommandLineToolConfiguration objcppCompiler = (CommandLineToolConfiguration) configurableToolChain.findByName("objcppCompiler");
+                    if(objcppCompiler != null){
+                        objcppCompiler.withArguments(m32args);
+                    }
+
+                    CommandLineToolConfiguration linker = (CommandLineToolConfiguration) configurableToolChain.findByName("linker");
+                    if(linker != null){
+                        linker.withArguments(m32args);
+                    }
+
+                    CommandLineToolConfiguration assembler = (CommandLineToolConfiguration)configurableToolChain.findByName("assembler");
+                    if(assembler != null){
+                        assembler.withArguments(new Action<List<String>>() {
+                            public void execute(List<String> args) {
+                                if (OperatingSystem.current().isMacOsX()) {
+                                    args.addAll(asList("-arch", "i386"));
+                                } else {
+                                    args.add("--32");
+                                }
+                            };
+                        });
+                    }
+                }
+            };
+            action.execute(configurableToolChain);
+            return configurableToolChain;
         }
     }
 
@@ -231,37 +249,78 @@ public boolean supportsPlatform(Platform targetPlatform) {
                     && !OperatingSystem.current().isWindows() // Currently don't support building 64-bit binaries on GCC/Windows
                     && ((ArchitectureInternal) targetPlatform.getArchitecture()).isAmd64();
         }
-        public List<String> getCppCompilerArgs() {
-            return asList("-m64");
-        }
 
-        public List<String> getCCompilerArgs() {
-            return asList("-m64");
+        public ConfigurableToolChain apply(ConfigurableToolChain configurableToolChain) {
+
+            Action<ConfigurableToolChain> action = new Action<ConfigurableToolChain>() {
+                public void execute(ConfigurableToolChain configurableToolChain) {
+                    Action<List<String>> m64args = new Action<List<String>>() {
+                        public void execute(List<String> args) {
+                            args.add("-m64");
+                        }
+                    };
+                    CommandLineToolConfiguration cppCompiler = (CommandLineToolConfiguration) configurableToolChain.findByName("cppCompiler");
+                    if(cppCompiler!=null){
+                        cppCompiler.withArguments(m64args);
+                    }
+
+                    CommandLineToolConfiguration cCompiler = (CommandLineToolConfiguration) configurableToolChain.findByName("cCompiler");
+                    if(cCompiler != null){
+                        cCompiler.withArguments(m64args);
+                    }
+
+                    CommandLineToolConfiguration objcCompiler = (CommandLineToolConfiguration) configurableToolChain.findByName("objcCompiler");
+                    if(objcCompiler != null){
+                        objcCompiler.withArguments(m64args);
+                    }
+
+                    CommandLineToolConfiguration objcppCompiler = (CommandLineToolConfiguration) configurableToolChain.findByName("objcppCompiler");
+                    if(objcppCompiler != null){
+                        objcppCompiler.withArguments(m64args);
+                    }
+
+                    CommandLineToolConfiguration linker = (CommandLineToolConfiguration) configurableToolChain.findByName("linker");
+                    if(linker != null){
+                        linker.withArguments(m64args);
+                    }
+
+                    CommandLineToolConfiguration assembler = (CommandLineToolConfiguration) configurableToolChain.findByName("assembler");
+                    if(assembler != null){
+                        assembler.withArguments(new Action<List<String>>() {
+                            public void execute(List<String> args) {
+                                if (OperatingSystem.current().isMacOsX()) {
+                                    args.addAll(asList("-arch", "x86_64"));
+                                } else {
+                                    args.add("--64");
+                                }
+                            };
+                        });
+                    }
+                }
+            };
+            action.execute(configurableToolChain);
+            return configurableToolChain;
         }
+    }
 
-        public List<String> getObjectiveCppCompilerArgs() {
-            return asList("-m64");
-        }
+    private static class DefaultTargetPlatformConfiguration implements TargetPlatformConfiguration {
 
-        public List<String> getObjectiveCCompilerArgs() {
-            return asList("-m64");
-        }
+        //TODO this should be a container of platforms
+        private final Collection<String> platformNames;
+        private Action<ConfigurableToolChain> configurationAction;
 
-        public List<String> getAssemblerArgs() {
-            if (OperatingSystem.current().isMacOsX()) {
-                return asList("-arch", "x86_64");
-            } else {
-                return asList("--64");
-            }
+        public DefaultTargetPlatformConfiguration(Collection<String> targetPlatformNames, Action<ConfigurableToolChain> configurationAction) {
+            this.platformNames = targetPlatformNames;
+            this.configurationAction = configurationAction;
         }
 
-        public List<String> getLinkerArgs() {
-            return asList("-m64");
+        public boolean supportsPlatform(Platform targetPlatform) {
+            return platformNames.contains(targetPlatform.getName());
         }
 
-        public List<String> getStaticLibraryArchiverArgs() {
-            return emptyList();
+        public ConfigurableToolChain apply(ConfigurableToolChain configurableToolChain) {
+            configurationAction.execute(configurableToolChain);
+            return configurableToolChain;
         }
     }
-
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ArStaticLibraryArchiver.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ArStaticLibraryArchiver.java
index b867e0d08d63..2d040be12f9d 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ArStaticLibraryArchiver.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ArStaticLibraryArchiver.java
@@ -16,13 +16,15 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.gradle.api.Action;
 import org.gradle.api.GradleException;
+import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
 import org.gradle.nativebinaries.internal.StaticLibraryArchiverSpec;
 import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
+import org.gradle.nativebinaries.toolchain.internal.MutableCommandLineToolInvocation;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -32,17 +34,22 @@
  * A static library archiver based on the GNU 'ar' utility
  */
 class ArStaticLibraryArchiver implements Compiler<StaticLibraryArchiverSpec> {
-    private final CommandLineTool<StaticLibraryArchiverSpec> commandLineTool;
+    private final CommandLineTool commandLineTool;
+    private final ArgsTransformer<StaticLibraryArchiverSpec> arguments = new ArchiverSpecToArguments();
+    private final CommandLineToolInvocation baseInvocation;
 
-    public ArStaticLibraryArchiver(CommandLineTool<StaticLibraryArchiverSpec> commandLineTool, Action<List<String>> argsAction) {
-        ArgsTransformer<StaticLibraryArchiverSpec> arguments = new ArchiverSpecToArguments();
-        arguments = new PostTransformActionArgsTransformer<StaticLibraryArchiverSpec>(arguments, argsAction);
-        this.commandLineTool = commandLineTool.withArguments(arguments);
+    public ArStaticLibraryArchiver(CommandLineTool commandLineTool, CommandLineToolInvocation baseInvocation) {
+        this.commandLineTool = commandLineTool;
+        this.baseInvocation = baseInvocation;
     }
 
     public WorkResult execute(StaticLibraryArchiverSpec spec) {
         deletePreviousOutput(spec);
-        return commandLineTool.execute(spec);
+
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        invocation.setArgs(arguments.transform(spec));
+        commandLineTool.execute(invocation);
+        return new SimpleWorkResult(true);
     }
 
     private void deletePreviousOutput(StaticLibraryArchiverSpec spec) {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/Assembler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/Assembler.java
index 8799dbb60dcf..57fe55e6a073 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/Assembler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/Assembler.java
@@ -16,15 +16,15 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.apache.commons.io.FilenameUtils;
-import org.gradle.api.Action;
 import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
-import org.gradle.internal.hash.HashUtil;
+import org.gradle.nativebinaries.internal.CompilerOutputFileNamingScheme;
 import org.gradle.nativebinaries.language.assembler.internal.AssembleSpec;
 import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
+import org.gradle.nativebinaries.toolchain.internal.MutableCommandLineToolInvocation;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -33,26 +33,25 @@
 
 class Assembler implements Compiler<AssembleSpec> {
 
-    private final CommandLineTool<AssembleSpec> commandLineTool;
-    private final Action<List<String>> argsAction;
+    private final CommandLineTool commandLineTool;
+    private final CommandLineToolInvocation baseInvocation;
     private String outputFileSuffix;
 
-    public Assembler(CommandLineTool<AssembleSpec> commandLineTool, Action<List<String>> argsAction, String outputFileSuffix) {
+    public Assembler(CommandLineTool commandLineTool, CommandLineToolInvocation baseInvocation, String outputFileSuffix) {
         this.commandLineTool = commandLineTool;
-        this.argsAction = argsAction;
+        this.baseInvocation = baseInvocation;
         this.outputFileSuffix = outputFileSuffix;
     }
 
     public WorkResult execute(AssembleSpec spec) {
-        boolean didWork = false;
-        CommandLineTool<AssembleSpec> commandLineAssembler = commandLineTool.inWorkDirectory(spec.getObjectFileDir());
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        invocation.setWorkDirectory(spec.getObjectFileDir());
         for (File sourceFile : spec.getSourceFiles()) {
             ArgsTransformer<AssembleSpec> arguments = new AssembleSpecToArgsList(sourceFile, spec.getObjectFileDir(), outputFileSuffix);
-            arguments = new PostTransformActionArgsTransformer<AssembleSpec>(arguments, argsAction);
-            WorkResult result = commandLineAssembler.withArguments(arguments).execute(spec);
-            didWork = didWork || result.getDidWork();
+            invocation.setArgs(arguments.transform(spec));
+            commandLineTool.execute(invocation);
         }
-        return new SimpleWorkResult(didWork);
+        return new SimpleWorkResult(!spec.getSourceFiles().isEmpty());
     }
 
     private static class AssembleSpecToArgsList implements ArgsTransformer<AssembleSpec> {
@@ -61,16 +60,17 @@ private static class AssembleSpecToArgsList implements ArgsTransformer<AssembleS
 
         public AssembleSpecToArgsList(File inputFile, File objectFileRootDir, String outputFileSuffix) {
             this.inputFile = inputFile;
-            String outputFileName = FilenameUtils.removeExtension(inputFile.getName())+ outputFileSuffix;
-            File currentObjectOutputDir = new File(objectFileRootDir, HashUtil.createCompactMD5(inputFile.getAbsolutePath()));
-            this.outputFile = new File(currentObjectOutputDir, outputFileName);
+            this.outputFile = new CompilerOutputFileNamingScheme()
+                                    .withOutputBaseFolder(objectFileRootDir)
+                                    .withObjectFileNameSuffix(outputFileSuffix)
+                                    .map(inputFile);
         }
 
         public List<String> transform(AssembleSpec spec) {
             List<String> args = new ArrayList<String>();
             args.addAll(spec.getAllArgs());
-            if(!outputFile.getParentFile().exists()){
-                outputFile.getParentFile().mkdir();
+            if (!outputFile.getParentFile().exists()) {
+                outputFile.getParentFile().mkdirs();
             }
             Collections.addAll(args, "-o", outputFile.getAbsolutePath());
             args.add(inputFile.getAbsolutePath());
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompiler.java
index 1c5fce81ac2d..80de84b773d0 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompiler.java
@@ -16,16 +16,14 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.gradle.api.Action;
 import org.gradle.nativebinaries.language.c.internal.CCompileSpec;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
-
-import java.util.List;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
 
 class CCompiler extends NativeCompiler<CCompileSpec> {
 
-    public CCompiler(CommandLineTool<CCompileSpec> commandLineTool, Action<List<String>> toolChainArgsAction, boolean useCommandFile) {
-        super(commandLineTool, toolChainArgsAction, new CCompileArgsTransformer(), useCommandFile);
+    public CCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation baseInvocation, String objectFileSuffix, boolean useCommandFile) {
+        super(commandLineTool, baseInvocation, new CCompileArgsTransformer(), objectFileSuffix, useCommandFile);
     }
 
     private static class CCompileArgsTransformer extends GccCompilerArgsTransformer<CCompileSpec> {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CppCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CppCompiler.java
index 5ff0885a29b3..8d3d6347a6ff 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CppCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CppCompiler.java
@@ -16,17 +16,14 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.gradle.api.Action;
 import org.gradle.nativebinaries.language.cpp.internal.CppCompileSpec;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
-
-import java.util.List;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
 
 public class CppCompiler extends NativeCompiler<CppCompileSpec> {
 
-    public CppCompiler(CommandLineTool<CppCompileSpec> commandLineTool, Action<List<String>> toolChainArgsAction, boolean useCommandFile) {
-        super(commandLineTool, toolChainArgsAction, new CppCompileArgsTransformer(), useCommandFile);
-
+    public CppCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation baseInvocation, String objectFileSuffix, boolean useCommandFile) {
+        super(commandLineTool, baseInvocation, new CppCompileArgsTransformer(), objectFileSuffix, useCommandFile);
     }
 
     private static class CppCompileArgsTransformer extends GccCompilerArgsTransformer<CppCompileSpec> {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/DefaultGccConfigurableToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/DefaultGccConfigurableToolChain.java
new file mode 100644
index 000000000000..b4b5bebd92eb
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/DefaultGccConfigurableToolChain.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.toolchain.internal.gcc;
+
+import org.gradle.api.Action;
+import org.gradle.api.internal.DefaultNamedDomainObjectSet;
+import org.gradle.internal.reflect.Instantiator;
+import org.gradle.nativebinaries.toolchain.ConfigurableToolChain;
+import org.gradle.nativebinaries.toolchain.GccCommandLineToolConfiguration;
+import org.gradle.nativebinaries.toolchain.internal.tools.*;
+
+import java.util.List;
+import java.util.Map;
+
+public class DefaultGccConfigurableToolChain<T extends GccCommandLineToolConfiguration> extends DefaultNamedDomainObjectSet<T> implements ConfigurableToolChain<T> {
+    private final String name;
+    private final String displayName;
+
+    public DefaultGccConfigurableToolChain(Class<? extends T> type, Map<String, T> asMap, Instantiator instantiator, String name, String displayName) {
+        super(type, instantiator);
+        this.name = name;
+        this.displayName = displayName;
+        for (T tool : asMap.values()) {
+            add(newConfiguredGccTool(tool));
+        }
+    }
+
+    private T newConfiguredGccTool(T defaultTool) {
+        GccCommandLineToolConfigurationInternal gccToolInternal = (GccCommandLineToolConfigurationInternal) defaultTool;
+        DefaultGccCommandLineToolConfiguration platformTool = new DefaultGccCommandLineToolConfiguration(defaultTool.getName(), gccToolInternal.getToolType(), defaultTool.getExecutable());
+        Action<List<String>> argAction = gccToolInternal.getArgAction();
+        platformTool.withArguments(argAction);
+        return (T) platformTool;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinker.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinker.java
index 7c84bed36d31..aaf42955f070 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinker.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinker.java
@@ -16,7 +16,7 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.gradle.api.Action;
+import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
 import org.gradle.internal.os.OperatingSystem;
@@ -24,6 +24,8 @@
 import org.gradle.nativebinaries.internal.SharedLibraryLinkerSpec;
 import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
+import org.gradle.nativebinaries.toolchain.internal.MutableCommandLineToolInvocation;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,19 +33,26 @@
 
 class GccLinker implements Compiler<LinkerSpec> {
 
-    private final CommandLineTool<LinkerSpec> commandLineTool;
+    private final CommandLineTool commandLineTool;
+    private final ArgsTransformer<LinkerSpec> argsTransformer;
+    private final CommandLineToolInvocation baseInvocation;
+    private final boolean useCommandFile;
 
-    public GccLinker(CommandLineTool<LinkerSpec> commandLineTool, Action<List<String>> argsAction, boolean useCommandFile) {
-        ArgsTransformer<LinkerSpec> argsTransformer = new GccLinkerArgsTransformer();
-        argsTransformer = new PostTransformActionArgsTransformer<LinkerSpec>(argsTransformer, argsAction);
-        if (useCommandFile) {
-            argsTransformer = new GccOptionsFileArgTransformer<LinkerSpec>(argsTransformer);
-        }
-        this.commandLineTool = commandLineTool.withArguments(argsTransformer);
+    public GccLinker(CommandLineTool commandLineTool, CommandLineToolInvocation baseInvocation, boolean useCommandFile) {
+        this.argsTransformer = new GccLinkerArgsTransformer();
+        this.baseInvocation = baseInvocation;
+        this.useCommandFile = useCommandFile;
+        this.commandLineTool = commandLineTool;
     }
 
     public WorkResult execute(LinkerSpec spec) {
-        return commandLineTool.execute(spec);
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        if (useCommandFile) {
+            invocation.addPostArgsAction(new GccOptionsFileArgTransformer(spec.getTempDir()));
+        }
+        invocation.setArgs(argsTransformer.transform(spec));
+        commandLineTool.execute(invocation);
+        return new SimpleWorkResult(true);
     }
 
     private static class GccLinkerArgsTransformer implements ArgsTransformer<LinkerSpec> {
@@ -64,11 +73,7 @@ public List<String> transform(LinkerSpec spec) {
             for (File file : spec.getLibraries()) {
                 args.add(file.getAbsolutePath());
             }
-            for (File pathEntry : spec.getLibraryPath()) {
-                // TODO:DAZ It's not clear to me what the correct meaning of this should be for GCC
-//                args.add("-L" + pathEntry.getAbsolutePath());
-//                args.add("-Wl,-L" + pathEntry.getAbsolutePath());
-//                args.add("-Wl,-rpath," + pathEntry.getAbsolutePath());
+            if (!spec.getLibraryPath().isEmpty()) {
                 throw new UnsupportedOperationException("Library Path not yet supported on GCC");
             }
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccOptionsFileArgTransformer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccOptionsFileArgTransformer.java
index 6065ab6efc4b..c3687ed74d4f 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccOptionsFileArgTransformer.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccOptionsFileArgTransformer.java
@@ -17,8 +17,6 @@
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
 import org.gradle.api.internal.tasks.compile.ArgWriter;
-import org.gradle.nativebinaries.internal.BinaryToolSpec;
-import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
 import org.gradle.nativebinaries.toolchain.internal.OptionsFileArgsTransformer;
 
 import java.io.File;
@@ -30,11 +28,11 @@
  * Uses an option file for arguments passed to GCC if possible.
  * Certain GCC options do not function correctly when included in an option file, so include these directly on the command line as well.
  */
-class GccOptionsFileArgTransformer<T extends BinaryToolSpec> extends OptionsFileArgsTransformer<T> {
+class GccOptionsFileArgTransformer extends OptionsFileArgsTransformer {
     private static final List<String> CLI_ONLY_ARGS = Arrays.asList("-m32", "-m64");
 
-    public GccOptionsFileArgTransformer(ArgsTransformer<T> delegate) {
-        super(ArgWriter.unixStyleFactory(), delegate);
+    public GccOptionsFileArgTransformer(File tempDir) {
+        super(ArgWriter.unixStyleFactory(), tempDir);
     }
 
     @Override
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccPlatformToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccPlatformToolChain.java
index 82be2d079c2b..bffbbdde0d3c 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccPlatformToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccPlatformToolChain.java
@@ -16,8 +16,6 @@
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
 import org.gradle.api.internal.tasks.compile.Compiler;
-import org.gradle.internal.os.OperatingSystem;
-import org.gradle.nativebinaries.internal.BinaryToolSpec;
 import org.gradle.nativebinaries.internal.LinkerSpec;
 import org.gradle.nativebinaries.internal.StaticLibraryArchiverSpec;
 import org.gradle.nativebinaries.language.assembler.internal.AssembleSpec;
@@ -25,10 +23,9 @@
 import org.gradle.nativebinaries.language.cpp.internal.CppCompileSpec;
 import org.gradle.nativebinaries.language.objectivec.internal.ObjectiveCCompileSpec;
 import org.gradle.nativebinaries.language.objectivecpp.internal.ObjectiveCppCompileSpec;
-import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
-import org.gradle.nativebinaries.toolchain.internal.OutputCleaningCompiler;
-import org.gradle.nativebinaries.toolchain.internal.PlatformToolChain;
-import org.gradle.nativebinaries.toolchain.internal.ToolType;
+import org.gradle.nativebinaries.language.rc.internal.WindowsResourceCompileSpec;
+import org.gradle.nativebinaries.toolchain.internal.*;
+import org.gradle.nativebinaries.toolchain.internal.tools.GccCommandLineToolConfigurationInternal;
 import org.gradle.nativebinaries.toolchain.internal.tools.ToolRegistry;
 import org.gradle.nativebinaries.toolchain.internal.tools.ToolSearchPath;
 import org.gradle.process.internal.ExecActionFactory;
@@ -39,12 +36,14 @@ class GccPlatformToolChain implements PlatformToolChain {
     private final ToolRegistry toolRegistry;
     private final ExecActionFactory execActionFactory;
     private final boolean useCommandFile;
+    private final String outputFileSuffix;
 
-    GccPlatformToolChain(ToolSearchPath toolSearchPath, ToolRegistry toolRegistry, ExecActionFactory execActionFactory, boolean useCommandFile) {
+    GccPlatformToolChain(ToolSearchPath toolSearchPath, ToolRegistry toolRegistry, ExecActionFactory execActionFactory, String outputFileSuffix, boolean useCommandFile) {
         this.toolRegistry = toolRegistry;
         this.toolSearchPath = toolSearchPath;
         this.execActionFactory = execActionFactory;
         this.useCommandFile = useCommandFile;
+        this.outputFileSuffix = outputFileSuffix;
     }
 
     public boolean isAvailable() {
@@ -54,61 +53,62 @@ public boolean isAvailable() {
     public void explain(TreeVisitor<? super String> visitor) {
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createCppCompiler() {
-        CommandLineTool<CppCompileSpec> commandLineTool = commandLineTool(ToolType.CPP_COMPILER);
-        CppCompiler cppCompiler = new CppCompiler(commandLineTool, toolRegistry.getTool(ToolType.CPP_COMPILER).getArgAction(), useCommandFile);
-        return (Compiler<T>) new OutputCleaningCompiler<CppCompileSpec>(cppCompiler, getOutputFileSuffix());
+    public Compiler<CppCompileSpec> createCppCompiler() {
+        GccCommandLineToolConfigurationInternal cppCompilerTool = toolRegistry.getTool(ToolType.CPP_COMPILER);
+        CppCompiler cppCompiler = new CppCompiler(commandLineTool(cppCompilerTool), commandLineToolInvocation(cppCompilerTool), outputFileSuffix, useCommandFile);
+        return new OutputCleaningCompiler<CppCompileSpec>(cppCompiler, outputFileSuffix);
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createCCompiler() {
-        CommandLineTool<CCompileSpec> commandLineTool = commandLineTool(ToolType.C_COMPILER);
-        CCompiler cCompiler = new CCompiler(commandLineTool, toolRegistry.getTool(ToolType.C_COMPILER).getArgAction(), useCommandFile);
-        return (Compiler<T>) new OutputCleaningCompiler<CCompileSpec>(cCompiler, getOutputFileSuffix());
+    public Compiler<CCompileSpec> createCCompiler() {
+        GccCommandLineToolConfigurationInternal cCompilerTool = toolRegistry.getTool(ToolType.C_COMPILER);
+        CCompiler cCompiler = new CCompiler(commandLineTool(cCompilerTool), commandLineToolInvocation(cCompilerTool), outputFileSuffix, useCommandFile);
+        return new OutputCleaningCompiler<CCompileSpec>(cCompiler, outputFileSuffix);
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createObjectiveCppCompiler() {
-        CommandLineTool<ObjectiveCppCompileSpec> commandLineTool = commandLineTool(ToolType.OBJECTIVECPP_COMPILER);
-        ObjectiveCppCompiler objectiveCppCompiler = new ObjectiveCppCompiler(commandLineTool, toolRegistry.getTool(ToolType.OBJECTIVECPP_COMPILER).getArgAction(), useCommandFile);
-        return (Compiler<T>) new OutputCleaningCompiler<ObjectiveCppCompileSpec>(objectiveCppCompiler, getOutputFileSuffix());
+    public Compiler<ObjectiveCppCompileSpec> createObjectiveCppCompiler() {
+        GccCommandLineToolConfigurationInternal objectiveCppCompilerTool = toolRegistry.getTool(ToolType.OBJECTIVECPP_COMPILER);
+        ObjectiveCppCompiler objectiveCppCompiler = new ObjectiveCppCompiler(commandLineTool(objectiveCppCompilerTool), commandLineToolInvocation(objectiveCppCompilerTool), outputFileSuffix, useCommandFile);
+        return new OutputCleaningCompiler<ObjectiveCppCompileSpec>(objectiveCppCompiler, outputFileSuffix);
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createObjectiveCCompiler() {
-        CommandLineTool<ObjectiveCCompileSpec> commandLineTool = commandLineTool(ToolType.OBJECTIVEC_COMPILER);
-        ObjectiveCCompiler objectiveCCompiler = new ObjectiveCCompiler(commandLineTool, toolRegistry.getTool(ToolType.OBJECTIVEC_COMPILER).getArgAction(), useCommandFile);
-        return (Compiler<T>) new OutputCleaningCompiler<ObjectiveCCompileSpec>(objectiveCCompiler, getOutputFileSuffix());
+    public Compiler<ObjectiveCCompileSpec> createObjectiveCCompiler() {
+        GccCommandLineToolConfigurationInternal objectiveCCompilerTool = toolRegistry.getTool(ToolType.OBJECTIVEC_COMPILER);
+        ObjectiveCCompiler objectiveCCompiler = new ObjectiveCCompiler(commandLineTool(objectiveCCompilerTool), commandLineToolInvocation(objectiveCCompilerTool), outputFileSuffix, useCommandFile);
+        return new OutputCleaningCompiler<ObjectiveCCompileSpec>(objectiveCCompiler, outputFileSuffix);
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createAssembler() {
-        CommandLineTool<AssembleSpec> commandLineTool = commandLineTool(ToolType.ASSEMBLER);
-        return (Compiler<T>) new Assembler(commandLineTool, toolRegistry.getTool(ToolType.ASSEMBLER).getArgAction(), getOutputFileSuffix());
+    public Compiler<AssembleSpec> createAssembler() {
+        GccCommandLineToolConfigurationInternal assemblerTool = toolRegistry.getTool(ToolType.ASSEMBLER);
+        return new Assembler(commandLineTool(assemblerTool), commandLineToolInvocation(assemblerTool), outputFileSuffix);
     }
 
-    public <T extends BinaryToolSpec> Compiler<T> createWindowsResourceCompiler() {
-        throw new UnsupportedOperationException();
+    public Compiler<WindowsResourceCompileSpec> createWindowsResourceCompiler() {
+        throw new RuntimeException("Windows resource compiler is not available");
     }
 
-    public <T extends LinkerSpec> Compiler<T> createLinker() {
-        CommandLineTool<LinkerSpec> commandLineTool = commandLineTool(ToolType.LINKER);
-        return (Compiler<T>) new GccLinker(commandLineTool, toolRegistry.getTool(ToolType.LINKER).getArgAction(), useCommandFile);
+    public Compiler<LinkerSpec> createLinker() {
+        GccCommandLineToolConfigurationInternal linkerTool = toolRegistry.getTool(ToolType.LINKER);
+        return new GccLinker(commandLineTool(linkerTool), commandLineToolInvocation(linkerTool), useCommandFile);
     }
 
-    public <T extends StaticLibraryArchiverSpec> Compiler<T> createStaticLibraryArchiver() {
-        CommandLineTool<StaticLibraryArchiverSpec> commandLineTool = commandLineTool(ToolType.STATIC_LIB_ARCHIVER);
-            return (Compiler<T>) new ArStaticLibraryArchiver(commandLineTool, toolRegistry.getTool(ToolType.STATIC_LIB_ARCHIVER).getArgAction());
+    public Compiler<StaticLibraryArchiverSpec> createStaticLibraryArchiver() {
+        GccCommandLineToolConfigurationInternal staticLibArchiverTool = toolRegistry.getTool(ToolType.STATIC_LIB_ARCHIVER);
+        return new ArStaticLibraryArchiver(commandLineTool(staticLibArchiverTool), commandLineToolInvocation(staticLibArchiverTool));
     }
 
-
-    private String getOutputFileSuffix() {
-        return OperatingSystem.current().isWindows() ? ".obj" : ".o";
+    private CommandLineTool commandLineTool(GccCommandLineToolConfigurationInternal tool) {
+        ToolType key = tool.getToolType();
+        String exeName = tool.getExecutable();
+        return new CommandLineTool(key.getToolName(), toolSearchPath.locate(key, exeName).getTool(), execActionFactory);
     }
 
-    private <T extends BinaryToolSpec> CommandLineTool<T> commandLineTool(ToolType key) {
-        String exeName = toolRegistry.getTool(key).getExecutable();
-        CommandLineTool<T> commandLineTool = new CommandLineTool<T>(key.getToolName(), toolSearchPath.locate(key, exeName).getTool(), execActionFactory);
+    private CommandLineToolInvocation commandLineToolInvocation(GccCommandLineToolConfigurationInternal toolConfiguration) {
+        MutableCommandLineToolInvocation baseInvocation = new DefaultCommandLineToolInvocation();
         // MinGW requires the path to be set
-        commandLineTool.withPath(toolSearchPath.getPath());
-        commandLineTool.withEnvironmentVar("CYGWIN", "nodosfilewarning");
-        return commandLineTool;
-    }
+        baseInvocation.addPath(toolSearchPath.getPath());
+        baseInvocation.addEnvironmentVar("CYGWIN", "nodosfilewarning");
 
+        baseInvocation.addPostArgsAction(toolConfiguration.getArgAction());
+        return baseInvocation;
+    }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChain.java
index bc8f4ba181f1..ed0a17f6ddab 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChain.java
@@ -18,17 +18,22 @@
 import org.gradle.api.Transformer;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.internal.os.OperatingSystem;
+import org.gradle.internal.reflect.Instantiator;
+import org.gradle.nativebinaries.toolchain.ConfigurableToolChain;
 import org.gradle.nativebinaries.toolchain.Gcc;
 import org.gradle.nativebinaries.toolchain.internal.ToolChainAvailability;
 import org.gradle.nativebinaries.toolchain.internal.ToolType;
 import org.gradle.nativebinaries.toolchain.internal.gcc.version.GccVersionDeterminer;
 import org.gradle.nativebinaries.toolchain.internal.gcc.version.GccVersionResult;
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultGccCommandLineToolConfiguration;
+import org.gradle.nativebinaries.toolchain.internal.tools.GccCommandLineToolConfigurationInternal;
 import org.gradle.process.internal.ExecActionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
 
+
 /**
  * Compiler adapter for GCC.
  */
@@ -42,17 +47,14 @@ public class GccToolChain extends AbstractGccCompatibleToolChain implements Gcc
 
     private GccVersionResult versionResult;
 
-    public GccToolChain(String name, OperatingSystem operatingSystem, FileResolver fileResolver, ExecActionFactory execActionFactory) {
-        super(name, operatingSystem, fileResolver, execActionFactory, new GccToolSearchPath(operatingSystem));
+    public GccToolChain(Instantiator instantiator, String name, OperatingSystem operatingSystem, FileResolver fileResolver, ExecActionFactory execActionFactory) {
+        super(name, operatingSystem, fileResolver, execActionFactory, new GccToolSearchPath(operatingSystem), instantiator);
         this.versionDeterminer = new GccVersionDeterminer(execActionFactory);
 
-        registerTool(ToolType.CPP_COMPILER, "g++");
-        registerTool(ToolType.C_COMPILER, "gcc");
-        registerTool(ToolType.OBJECTIVECPP_COMPILER, "g++");
-        registerTool(ToolType.OBJECTIVEC_COMPILER, "gcc");
-        registerTool(ToolType.ASSEMBLER, "as");
-        registerTool(ToolType.LINKER, "g++");
-        registerTool(ToolType.STATIC_LIB_ARCHIVER, "ar");
+        add(new DefaultGccCommandLineToolConfiguration("cCompiler", ToolType.C_COMPILER, "gcc"));
+        add(new DefaultGccCommandLineToolConfiguration("cppCompiler", ToolType.CPP_COMPILER, "g++"));
+        add(new DefaultGccCommandLineToolConfiguration("linker", ToolType.LINKER, "g++"));
+        add(new DefaultGccCommandLineToolConfiguration("staticLibArchiver", ToolType.STATIC_LIB_ARCHIVER, "ar"));
     }
 
     @Override
@@ -61,11 +63,11 @@ protected String getTypeName() {
     }
 
     @Override
-    protected void initTools(ToolChainAvailability availability) {
+    protected void initTools(ConfigurableToolChain configurableToolChain, ToolChainAvailability availability) {
         if (versionResult == null) {
-            CommandLineToolSearchResult compiler = locate(ToolType.C_COMPILER);
+            CommandLineToolSearchResult compiler = locate((GccCommandLineToolConfigurationInternal) configurableToolChain.getByName("cCompiler"));
             if (!compiler.isAvailable()) {
-                compiler = locate(ToolType.CPP_COMPILER);
+                compiler = locate((GccCommandLineToolConfigurationInternal) configurableToolChain.getByName("cppCompiler"));
             }
             availability.mustBeAvailable(compiler);
             if (!compiler.isAvailable()) {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/NativeCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/NativeCompiler.java
index 56f7c8d998c5..69c19fc42a12 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/NativeCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/NativeCompiler.java
@@ -16,50 +16,57 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.apache.commons.io.FilenameUtils;
-import org.gradle.api.Action;
+import org.gradle.api.Transformer;
 import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
 import org.gradle.internal.os.OperatingSystem;
-import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
-import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
-import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec;
-import org.gradle.nativebinaries.toolchain.internal.SingleSourceCompileArgTransformer;
+import org.gradle.nativebinaries.toolchain.internal.*;
 
 import java.io.File;
+import java.util.Arrays;
 import java.util.List;
 
 abstract public class NativeCompiler<T extends NativeCompileSpec> implements Compiler<T> {
 
-    private final CommandLineTool<T> commandLineTool;
+    private final CommandLineTool commandLineTool;
     private final ArgsTransformer<T> argsTransfomer;
+    private final CommandLineToolInvocation baseInvocation;
+    private String objectFileSuffix;
+    private final boolean useCommandFile;
 
-    public NativeCompiler(CommandLineTool<T> commandLineTool, Action<List<String>> toolChainArgsAction, ArgsTransformer<T> argsTransformer, boolean useCommandFile) {
-        argsTransformer = new PostTransformActionArgsTransformer<T>(argsTransformer, toolChainArgsAction);
-        if (useCommandFile) {
-            argsTransformer = new GccOptionsFileArgTransformer<T>(argsTransformer);
-        }
+    public NativeCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation baseInvocation, ArgsTransformer<T> argsTransformer, String objectFileSuffix, boolean useCommandFile) {
+        this.baseInvocation = baseInvocation;
+        this.objectFileSuffix = objectFileSuffix;
+        this.useCommandFile = useCommandFile;
         this.argsTransfomer = argsTransformer;
         this.commandLineTool = commandLineTool;
     }
 
     public WorkResult execute(T spec) {
-        boolean didWork = false;
         boolean windowsPathLimitation = OperatingSystem.current().isWindows();
 
-        String objectFileExtension = OperatingSystem.current().isWindows() ? ".obj" : ".o";
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        invocation.setWorkDirectory(spec.getObjectFileDir());
+        if (useCommandFile) {
+            invocation.addPostArgsAction(new GccOptionsFileArgTransformer(spec.getTempDir()));
+        }
+
+        Transformer<List<String>, File> outputFileArgTransformer = new Transformer<List<String>, File>() {
+            public List<String> transform(File outputFile) {
+                return Arrays.asList("-o", outputFile.getAbsolutePath());
+            }
+        };
+
         for (File sourceFile : spec.getSourceFiles()) {
-            String objectFileName = FilenameUtils.removeExtension(sourceFile.getName()) + objectFileExtension;
-            WorkResult result = commandLineTool.inWorkDirectory(spec.getObjectFileDir())
-                    .withArguments(new SingleSourceCompileArgTransformer<T>(sourceFile,
-                                            objectFileName,
-                                            new ShortCircuitArgsTransformer(argsTransfomer),
-                                            windowsPathLimitation,
-                                            false))
-                    .execute(spec);
-            didWork = didWork || result.getDidWork();
+            SingleSourceCompileArgTransformer<T> argTransformer = new SingleSourceCompileArgTransformer<T>(sourceFile,
+                    objectFileSuffix,
+                    new ShortCircuitArgsTransformer<T>(argsTransfomer),
+                    windowsPathLimitation,
+                    outputFileArgTransformer);
+            invocation.setArgs(argTransformer.transform(spec));
+            commandLineTool.execute(invocation);
         }
-        return new SimpleWorkResult(didWork);
+        return new SimpleWorkResult(!spec.getSourceFiles().isEmpty());
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCCompiler.java
index f13affe02833..31e4a9e77081 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCCompiler.java
@@ -16,18 +16,18 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.gradle.api.Action;
 import org.gradle.nativebinaries.language.objectivec.internal.ObjectiveCCompileSpec;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
-
-import java.util.List;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
 
 public class ObjectiveCCompiler extends NativeCompiler<ObjectiveCCompileSpec> {
 
-    public ObjectiveCCompiler(CommandLineTool<ObjectiveCCompileSpec> commandLineTool, Action<List<String>> toolChainArgsAction, boolean useCommandFile) {
-        super(commandLineTool, toolChainArgsAction, new ObjectiveCCompileArgsTransformer(), useCommandFile);
+    public ObjectiveCCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation baseInvocation, String objectFileSuffix, boolean useCommandFile) {
+        super(commandLineTool, baseInvocation, new ObjectiveCCompileArgsTransformer(), objectFileSuffix, useCommandFile);
     }
 
+
+
     private static class ObjectiveCCompileArgsTransformer extends GccCompilerArgsTransformer<ObjectiveCCompileSpec> {
         protected String getLanguage() {
             return "objective-c";
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCppCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCppCompiler.java
index eaba4dd37d66..70e92d54dedd 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCppCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ObjectiveCppCompiler.java
@@ -16,16 +16,14 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.gradle.api.Action;
 import org.gradle.nativebinaries.language.objectivecpp.internal.ObjectiveCppCompileSpec;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
-
-import java.util.List;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
 
 public class ObjectiveCppCompiler extends NativeCompiler<ObjectiveCppCompileSpec> {
 
-    public ObjectiveCppCompiler(CommandLineTool<ObjectiveCppCompileSpec> commandLineTool, Action<List<String>> toolChainArgsAction, boolean useCommandFile) {
-        super(commandLineTool, toolChainArgsAction, new ObjectiveCppCompileArgsTransformer(), useCommandFile);
+    public ObjectiveCppCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation baseInvocation, String objectFileSuffix, boolean useCommandFile) {
+        super(commandLineTool, baseInvocation, new ObjectiveCppCompileArgsTransformer(), objectFileSuffix, useCommandFile);
     }
 
     private static class ObjectiveCppCompileArgsTransformer extends GccCompilerArgsTransformer<ObjectiveCppCompileSpec> {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/PostTransformActionArgsTransformer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/PostTransformActionArgsTransformer.java
deleted file mode 100644
index 0e62a7801a25..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/PostTransformActionArgsTransformer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.toolchain.internal.gcc;
-
-import org.gradle.api.Action;
-import org.gradle.nativebinaries.internal.BinaryToolSpec;
-import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-class PostTransformActionArgsTransformer<T extends BinaryToolSpec> implements ArgsTransformer<T> {
-    private final ArgsTransformer<T> delegate;
-    private final Action<List<String>> userTransformer;
-
-    PostTransformActionArgsTransformer(ArgsTransformer<T> delegate, Action<List<String>> userTransformer) {
-        this.delegate = delegate;
-        this.userTransformer = userTransformer;
-    }
-
-    public List<String> transform(T spec) {
-        List<String> args = new ArrayList<String>(delegate.transform(spec));
-        userTransformer.execute(args);
-        return args;
-    }
-}
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableImplementation.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/TargetPlatformConfiguration.java
similarity index 56%
rename from subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableImplementation.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/TargetPlatformConfiguration.java
index 52dd3dcd4e55..279c3a9c7f6a 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableImplementation.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/TargetPlatformConfiguration.java
@@ -14,18 +14,24 @@
  * limitations under the License.
  */
 
-package org.gradle.tooling.internal.impl;
+package org.gradle.nativebinaries.toolchain.internal.gcc;
 
-import org.gradle.api.Nullable;
-import org.gradle.tooling.internal.protocol.InternalLaunchable;
+import org.gradle.nativebinaries.platform.Platform;
+import org.gradle.nativebinaries.toolchain.ConfigurableToolChain;
 
 /**
- * SPI for launchables providing information necessary to initiate the build.
- *
- * @since 1.12
- */
-public interface LaunchableImplementation extends InternalLaunchable {
-    /** Task path for real tasks, selector name for task selectors. */
-    String getTaskName();
-    @Nullable String getProjectPath();
+ *  some javadoc
+ * */
+public interface TargetPlatformConfiguration {
+
+    /**
+     *  some other javadoc
+     * */
+    boolean supportsPlatform(Platform targetPlatform);
+
+
+    /**
+     *  some more other javadoc
+     * */
+    ConfigurableToolChain apply(ConfigurableToolChain configurableToolChain);
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/Assembler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/Assembler.java
index b9587d9ae066..72df99f43d5e 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/Assembler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/Assembler.java
@@ -16,14 +16,15 @@
 
 package org.gradle.nativebinaries.toolchain.internal.msvcpp;
 
-import org.apache.commons.io.FilenameUtils;
 import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
-import org.gradle.internal.hash.HashUtil;
+import org.gradle.nativebinaries.internal.CompilerOutputFileNamingScheme;
 import org.gradle.nativebinaries.language.assembler.internal.AssembleSpec;
 import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
+import org.gradle.nativebinaries.toolchain.internal.MutableCommandLineToolInvocation;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -33,20 +34,22 @@
 
 class Assembler implements Compiler<AssembleSpec> {
 
-    private final CommandLineTool<AssembleSpec> commandLineTool;
+    private final CommandLineTool commandLineTool;
+    private final CommandLineToolInvocation baseInvocation;
 
-    public Assembler(CommandLineTool<AssembleSpec> commandLineTool) {
+    public Assembler(CommandLineTool commandLineTool, CommandLineToolInvocation invocation) {
         this.commandLineTool = commandLineTool;
+        this.baseInvocation = invocation;
     }
 
     public WorkResult execute(AssembleSpec spec) {
-        boolean didWork = false;
-        CommandLineTool<AssembleSpec> commandLineAssembler = commandLineTool.inWorkDirectory(spec.getObjectFileDir());
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        invocation.setWorkDirectory(spec.getObjectFileDir());
         for (File sourceFile : spec.getSourceFiles()) {
-            WorkResult result = commandLineAssembler.withArguments(new AssemblerArgsTransformer(sourceFile)).execute(spec);
-            didWork = didWork || result.getDidWork();
+            invocation.setArgs(new AssemblerArgsTransformer(sourceFile).transform(spec));
+            commandLineTool.execute(invocation);
         }
-        return new SimpleWorkResult(didWork);
+        return new SimpleWorkResult(!spec.getSourceFiles().isEmpty());
     }
 
 
@@ -62,19 +65,17 @@ public List<String> transform(AssembleSpec spec) {
             args.addAll(escapeUserArgs(spec.getAllArgs()));
             args.add("/nologo");
             args.add("/c");
-            File outputFile = getOutputFilePath(spec);
-            if(!outputFile.getParentFile().exists()){
-                outputFile.getParentFile().mkdir();
+            File outputFile = new CompilerOutputFileNamingScheme()
+                    .withOutputBaseFolder(spec.getObjectFileDir())
+                    .withObjectFileNameSuffix(".obj")
+                    .map(inputFile);
+
+            if (!outputFile.getParentFile().exists()) {
+                outputFile.getParentFile().mkdirs();
             }
-            args.add("/Fo"+ outputFile);
+            args.add("/Fo" + outputFile);
             args.add(inputFile.getAbsolutePath());
             return args;
         }
-
-        public File getOutputFilePath(AssembleSpec spec) {
-            String compactMD5 = HashUtil.createCompactMD5(inputFile.getAbsolutePath());
-            File currentObjectOutputDir = new File(spec.getObjectFileDir(), compactMD5);
-            return new File(currentObjectOutputDir, FilenameUtils.removeExtension(inputFile.getName())+ ".obj");
-        }
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CCompiler.java
index 7120bad442f0..a03073fec063 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CCompiler.java
@@ -16,13 +16,15 @@
 
 package org.gradle.nativebinaries.toolchain.internal.msvcpp;
 
+import org.gradle.api.Transformer;
 import org.gradle.nativebinaries.language.c.internal.CCompileSpec;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
 
 class CCompiler extends NativeCompiler<CCompileSpec> {
 
-    CCompiler(CommandLineTool<CCompileSpec> commandLineTool) {
-        super(commandLineTool, new CCompilerArgsTransformer());
+    CCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation invocation, Transformer<CCompileSpec, CCompileSpec> specTransformer) {
+        super(commandLineTool, invocation, new CCompilerArgsTransformer(), specTransformer);
     }
 
     private static class CCompilerArgsTransformer extends VisualCppCompilerArgsTransformer<CCompileSpec> {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CppCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CppCompiler.java
index 892c485924b2..0b0e84755afe 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CppCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/CppCompiler.java
@@ -16,13 +16,15 @@
 
 package org.gradle.nativebinaries.toolchain.internal.msvcpp;
 
+import org.gradle.api.Transformer;
 import org.gradle.nativebinaries.language.cpp.internal.CppCompileSpec;
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation;
 
 class CppCompiler extends NativeCompiler<CppCompileSpec> {
 
-    CppCompiler(CommandLineTool<CppCompileSpec> commandLineTool) {
-        super(commandLineTool, new CppCompilerArgsTransformer());
+    CppCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation invocation, Transformer<CppCompileSpec, CppCompileSpec> specTransformer) {
+        super(commandLineTool, invocation, new CppCompilerArgsTransformer(), specTransformer);
     }
 
     private static class CppCompilerArgsTransformer extends VisualCppCompilerArgsTransformer<CppCompileSpec> {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java
index 2b6d38f8cfbd..2115d6c5675a 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LibExeStaticLibraryArchiver.java
@@ -16,13 +16,11 @@
 
 package org.gradle.nativebinaries.toolchain.internal.msvcpp;
 
-import org.gradle.api.internal.tasks.compile.ArgWriter;
+import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
 import org.gradle.nativebinaries.internal.StaticLibraryArchiverSpec;
-import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
-import org.gradle.nativebinaries.toolchain.internal.OptionsFileArgsTransformer;
-import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
+import org.gradle.nativebinaries.toolchain.internal.*;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -31,16 +29,22 @@
 import static org.gradle.nativebinaries.toolchain.internal.msvcpp.EscapeUserArgs.escapeUserArgs;
 
 class LibExeStaticLibraryArchiver implements Compiler<StaticLibraryArchiverSpec> {
-    private final CommandLineTool<StaticLibraryArchiverSpec> commandLineTool;
-
-    public LibExeStaticLibraryArchiver(CommandLineTool<StaticLibraryArchiverSpec> commandLineTool) {
-        this.commandLineTool = commandLineTool
-                .withArguments(new OptionsFileArgsTransformer<StaticLibraryArchiverSpec>(ArgWriter.windowsStyleFactory(), new LibExeSpecToArguments()
-        ));
+    private final CommandLineTool commandLineTool;
+    private final ArgsTransformer<StaticLibraryArchiverSpec> args;
+    private final CommandLineToolInvocation baseInvocation;
+
+    public LibExeStaticLibraryArchiver(CommandLineTool commandLineTool, CommandLineToolInvocation invocation) {
+        args = new LibExeSpecToArguments();
+        this.commandLineTool = commandLineTool;
+        this.baseInvocation = invocation;
     }
 
     public WorkResult execute(StaticLibraryArchiverSpec spec) {
-        return commandLineTool.execute(spec);
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        invocation.addPostArgsAction(new VisualCppOptionsFileArgTransformer(spec.getTempDir()));
+        invocation.setArgs(args.transform(spec));
+        commandLineTool.execute(invocation);
+        return new SimpleWorkResult(true);
     }
 
     private static class LibExeSpecToArguments implements ArgsTransformer<StaticLibraryArchiverSpec> {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LinkExeLinker.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LinkExeLinker.java
index 4f9bb4a803da..0f1e15199dd4 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LinkExeLinker.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/LinkExeLinker.java
@@ -16,14 +16,13 @@
 
 package org.gradle.nativebinaries.toolchain.internal.msvcpp;
 
-import org.gradle.api.internal.tasks.compile.ArgWriter;
+import org.gradle.api.Transformer;
+import org.gradle.api.internal.tasks.SimpleWorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
 import org.gradle.nativebinaries.internal.LinkerSpec;
 import org.gradle.nativebinaries.internal.SharedLibraryLinkerSpec;
-import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
-import org.gradle.nativebinaries.toolchain.internal.OptionsFileArgsTransformer;
-import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
+import org.gradle.nativebinaries.toolchain.internal.*;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -33,17 +32,24 @@
 
 class LinkExeLinker implements Compiler<LinkerSpec> {
 
-    private final CommandLineTool<LinkerSpec> commandLineTool;
+    private final CommandLineTool commandLineTool;
+    private final Transformer<LinkerSpec, LinkerSpec> specTransformer;
+    private final ArgsTransformer<LinkerSpec> argsTransformer;
+    private final CommandLineToolInvocation baseInvocation;
 
-    public LinkExeLinker(CommandLineTool<LinkerSpec> commandLineTool) {
-        this.commandLineTool = commandLineTool
-                .withArguments(new OptionsFileArgsTransformer<LinkerSpec>(
-                ArgWriter.windowsStyleFactory(), new LinkerArgsTransformer()
-        ));
+    public LinkExeLinker(CommandLineTool commandLineTool, CommandLineToolInvocation invocation, Transformer<LinkerSpec, LinkerSpec> specTransformer) {
+        argsTransformer = new LinkerArgsTransformer();
+        this.commandLineTool = commandLineTool;
+        this.baseInvocation = invocation;
+        this.specTransformer = specTransformer;
     }
 
     public WorkResult execute(LinkerSpec spec) {
-        return commandLineTool.execute(spec);
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        invocation.addPostArgsAction(new VisualCppOptionsFileArgTransformer(spec.getTempDir()));
+        invocation.setArgs(argsTransformer.transform(specTransformer.transform(spec)));
+        commandLineTool.execute(invocation);
+        return new SimpleWorkResult(true);
     }
 
     private static class LinkerArgsTransformer implements ArgsTransformer<LinkerSpec> {
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/NativeCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/NativeCompiler.java
index 819a933793ff..26844bc4a1ba 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/NativeCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/NativeCompiler.java
@@ -16,44 +16,51 @@
 
 package org.gradle.nativebinaries.toolchain.internal.msvcpp;
 
-import org.apache.commons.io.FilenameUtils;
+import org.gradle.api.Transformer;
 import org.gradle.api.internal.tasks.SimpleWorkResult;
-import org.gradle.api.internal.tasks.compile.ArgWriter;
+import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.tasks.WorkResult;
-import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
-import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
-import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec;
-import org.gradle.nativebinaries.toolchain.internal.OptionsFileArgsTransformer;
-import org.gradle.nativebinaries.toolchain.internal.SingleSourceCompileArgTransformer;
+import org.gradle.nativebinaries.toolchain.internal.*;
 import org.gradle.nativebinaries.toolchain.internal.gcc.ShortCircuitArgsTransformer;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.List;
 
-abstract public class NativeCompiler<T extends NativeCompileSpec> implements org.gradle.api.internal.tasks.compile.Compiler<T> {
+abstract public class NativeCompiler<T extends NativeCompileSpec> implements Compiler<T> {
 
-    private final CommandLineTool<T> commandLineTool;
-    private final OptionsFileArgsTransformer<T> argsTransFormer;
+    private final CommandLineTool commandLineTool;
+    private final ArgsTransformer<T> argsTransFormer;
+    private final Transformer<T, T> specTransformer;
+    private final CommandLineToolInvocation baseInvocation;
 
-    NativeCompiler(CommandLineTool<T> commandLineTool, ArgsTransformer<T> argsTransFormer) {
-        this.argsTransFormer = new OptionsFileArgsTransformer<T>(
-                        ArgWriter.windowsStyleFactory(),
-                        argsTransFormer);
+    NativeCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation invocation, ArgsTransformer<T> argsTransFormer, Transformer<T, T> specTransformer) {
+        this.argsTransFormer = argsTransFormer;
         this.commandLineTool = commandLineTool;
+        this.baseInvocation = invocation;
+        this.specTransformer = specTransformer;
     }
 
     public WorkResult execute(T spec) {
-        boolean didWork = false;
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        invocation.addPostArgsAction(new VisualCppOptionsFileArgTransformer(spec.getTempDir()));
+
+        Transformer<List<String>, File> outputFileArgTransformer = new Transformer<List<String>, File>(){
+            public List<String> transform(File outputFile) {
+                return Arrays.asList("/Fo"+ outputFile.getAbsolutePath());
+            }
+        };
         for (File sourceFile : spec.getSourceFiles()) {
-            String objectFileName = FilenameUtils.removeExtension(sourceFile.getName()) + ".obj";
-            WorkResult result = commandLineTool.inWorkDirectory(spec.getObjectFileDir())
-                    .withArguments(new SingleSourceCompileArgTransformer<T>(sourceFile,
-                                                                            objectFileName,
-                                                                            new ShortCircuitArgsTransformer<T>(argsTransFormer),
-                                                                            true,
-                                                                            true))
-                    .execute(spec);
-            didWork = didWork || result.getDidWork();
+            String objectFileNameSuffix = ".obj";
+            SingleSourceCompileArgTransformer<T> argTransformer = new SingleSourceCompileArgTransformer<T>(sourceFile,
+                    objectFileNameSuffix,
+                    new ShortCircuitArgsTransformer<T>(argsTransFormer),
+                    true,
+                    outputFileArgTransformer);
+            invocation.setArgs(argTransformer.transform(specTransformer.transform(spec)));
+            invocation.setWorkDirectory(spec.getObjectFileDir());
+            commandLineTool.execute(invocation);
         }
-        return new SimpleWorkResult(didWork);
+        return new SimpleWorkResult(!spec.getSourceFiles().isEmpty());
     }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppOptionsFileArgTransformer.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppOptionsFileArgTransformer.java
new file mode 100644
index 000000000000..f6bd928ad11f
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppOptionsFileArgTransformer.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries.toolchain.internal.msvcpp;
+
+import org.gradle.api.internal.tasks.compile.ArgWriter;
+import org.gradle.nativebinaries.toolchain.internal.OptionsFileArgsTransformer;
+
+import java.io.File;
+
+/**
+ * Uses an option file for arguments passed to Visual C++.
+ */
+class VisualCppOptionsFileArgTransformer extends OptionsFileArgsTransformer {
+    public VisualCppOptionsFileArgTransformer(File tempDir) {
+        super(ArgWriter.windowsStyleFactory(), tempDir);
+    }
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChain.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChain.java
index fe70d8dfef1a..229819d08f42 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChain.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChain.java
@@ -21,16 +21,20 @@
 import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.internal.jvm.Jvm;
 import org.gradle.internal.os.OperatingSystem;
-import org.gradle.nativebinaries.internal.BinaryToolSpec;
+import org.gradle.internal.reflect.Instantiator;
 import org.gradle.nativebinaries.internal.LinkerSpec;
 import org.gradle.nativebinaries.internal.StaticLibraryArchiverSpec;
 import org.gradle.nativebinaries.language.assembler.internal.AssembleSpec;
 import org.gradle.nativebinaries.language.c.internal.CCompileSpec;
 import org.gradle.nativebinaries.language.cpp.internal.CppCompileSpec;
+import org.gradle.nativebinaries.language.objectivec.internal.ObjectiveCCompileSpec;
+import org.gradle.nativebinaries.language.objectivecpp.internal.ObjectiveCppCompileSpec;
 import org.gradle.nativebinaries.language.rc.internal.WindowsResourceCompileSpec;
 import org.gradle.nativebinaries.platform.Platform;
 import org.gradle.nativebinaries.toolchain.VisualCpp;
 import org.gradle.nativebinaries.toolchain.internal.*;
+import org.gradle.nativebinaries.toolchain.internal.tools.CommandLineToolConfigurationInternal;
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultCommandLineToolConfiguration;
 import org.gradle.process.internal.ExecActionFactory;
 import org.gradle.util.TreeVisitor;
 import org.slf4j.Logger;
@@ -39,8 +43,13 @@
 import java.io.File;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.SortedMap;
 
-public class VisualCppToolChain extends AbstractToolChain implements VisualCpp {
+public class VisualCppToolChain extends ExtendableToolChain implements VisualCpp, ToolChainInternal {
+
+    private final String name;
+    protected final OperatingSystem operatingSystem;
+    private final FileResolver fileResolver;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(VisualCppToolChain.class);
 
@@ -56,35 +65,26 @@ public class VisualCppToolChain extends AbstractToolChain implements VisualCpp {
     private ToolChainAvailability availability;
 
     public VisualCppToolChain(String name, OperatingSystem operatingSystem, FileResolver fileResolver, ExecActionFactory execActionFactory,
-                              VisualStudioLocator visualStudioLocator, WindowsSdkLocator windowsSdkLocator) {
-        super(name, operatingSystem, fileResolver);
+                              VisualStudioLocator visualStudioLocator, WindowsSdkLocator windowsSdkLocator, Instantiator instantiator) {
+        super(CommandLineToolConfigurationInternal.class, name, operatingSystem, fileResolver, instantiator);
+
+        add(new DefaultCommandLineToolConfiguration("cCompiler"));
+        add(new DefaultCommandLineToolConfiguration("cppCompiler"));
+        add(new DefaultCommandLineToolConfiguration("linker"));
+        add(new DefaultCommandLineToolConfiguration("staticLibArchiver"));
+
+        this.name = name;
+        this.operatingSystem = operatingSystem;
+        this.fileResolver = fileResolver;
         this.execActionFactory = execActionFactory;
         this.visualStudioLocator = visualStudioLocator;
         this.windowsSdkLocator = windowsSdkLocator;
     }
 
-    @Override
     protected String getTypeName() {
         return "Visual Studio";
     }
 
-    private void checkAvailable(ToolChainAvailability availability) {
-        if (!operatingSystem.isWindows()) {
-            availability.unavailable("Visual Studio is not available on this operating system.");
-            return;
-        }
-        VisualStudioLocator.SearchResult visualStudioSearchResult = visualStudioLocator.locateVisualStudioInstalls(installDir);
-        availability.mustBeAvailable(visualStudioSearchResult);
-        if (visualStudioSearchResult.isAvailable()) {
-            visualCpp = visualStudioSearchResult.getVisualStudio().getVisualCpp();
-        }
-        WindowsSdkLocator.SearchResult windowsSdkSearchResult = windowsSdkLocator.locateWindowsSdks(windowsSdkDir);
-        availability.mustBeAvailable(windowsSdkSearchResult);
-        if (windowsSdkSearchResult.isAvailable()) {
-            windowsSdk = windowsSdkSearchResult.getSdk();
-        }
-    }
-
     public File getInstallDir() {
         return installDir;
     }
@@ -101,6 +101,18 @@ public void setWindowsSdkDir(Object windowsSdkDirPath) {
         this.windowsSdkDir = resolve(windowsSdkDirPath);
     }
 
+    public PlatformToolChain select(Platform targetPlatform) {
+        ToolChainAvailability result = new ToolChainAvailability();
+        result.mustBeAvailable(getAvailability());
+        if (visualCpp != null && !visualCpp.isSupportedPlatform(targetPlatform)) {
+            result.unavailable(String.format("Don't know how to build for platform '%s'.", targetPlatform.getName()));
+        }
+        if (!result.isAvailable()) {
+            return new UnavailablePlatformToolChain(result);
+        }
+        return new VisualCppPlatformToolChain(getAsMap(), visualCpp, windowsSdk, targetPlatform);
+    }
+
     private ToolChainAvailability getAvailability() {
         if (availability == null) {
             availability = new ToolChainAvailability();
@@ -109,29 +121,68 @@ private ToolChainAvailability getAvailability() {
         return availability;
     }
 
-    public PlatformToolChain target(Platform targetPlatform) {
-        ToolChainAvailability result = new ToolChainAvailability();
-        result.mustBeAvailable(getAvailability());
-        if (visualCpp != null && !visualCpp.isSupportedPlatform(targetPlatform)) {
-            result.unavailable(String.format("Don't know how to build for platform '%s'.", targetPlatform.getName()));
+    private void checkAvailable(ToolChainAvailability availability) {
+        if (!operatingSystem.isWindows()) {
+            availability.unavailable("Visual Studio is not available on this operating system.");
+            return;
         }
-        if (!result.isAvailable()) {
-            return new UnavailablePlatformToolChain(result);
+        VisualStudioLocator.SearchResult visualStudioSearchResult = visualStudioLocator.locateVisualStudioInstalls(installDir);
+        availability.mustBeAvailable(visualStudioSearchResult);
+        if (visualStudioSearchResult.isAvailable()) {
+            visualCpp = visualStudioSearchResult.getVisualStudio().getVisualCpp();
         }
-        return new VisualCppPlatformToolChain(visualCpp, windowsSdk, targetPlatform);
+        WindowsSdkLocator.SearchResult windowsSdkSearchResult = windowsSdkLocator.locateWindowsSdks(windowsSdkDir);
+        availability.mustBeAvailable(windowsSdkSearchResult);
+        if (windowsSdkSearchResult.isAvailable()) {
+            windowsSdk = windowsSdkSearchResult.getSdk();
+        }
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDisplayName() {
+        return String.format("Tool chain '%s' (%s)", getName(), getTypeName());
     }
 
     @Override
+    public String toString() {
+        return getDisplayName();
+    }
+
+    public String getOutputType() {
+        return String.format("%s-%s", getName(), operatingSystem.getName());
+    }
+
+    public String getExecutableName(String executablePath) {
+        return operatingSystem.getExecutableName(executablePath);
+    }
+
+    public String getSharedLibraryName(String libraryName) {
+        return operatingSystem.getSharedLibraryName(libraryName);
+    }
+
+    public String getStaticLibraryName(String libraryName) {
+        return operatingSystem.getStaticLibraryName(libraryName);
+    }
+
+    protected File resolve(Object path) {
+        return fileResolver.resolve(path);
+    }
+
     public String getSharedLibraryLinkFileName(String libraryName) {
         return getSharedLibraryName(libraryName).replaceFirst("\\.dll$", ".lib");
     }
 
     private class VisualCppPlatformToolChain implements PlatformToolChain {
+        private SortedMap<String, CommandLineToolConfigurationInternal> commandLineToolConfigurations;
+        private final VisualCppInstall visualCpp;
         private final WindowsSdk sdk;
         private final Platform targetPlatform;
-        private final VisualCppInstall visualCpp;
 
-        private VisualCppPlatformToolChain(VisualCppInstall visualCpp, WindowsSdk sdk, Platform targetPlatform) {
+        private VisualCppPlatformToolChain(SortedMap<String, CommandLineToolConfigurationInternal> commandLineToolConfigurations, VisualCppInstall visualCpp, WindowsSdk sdk, Platform targetPlatform) {
+            this.commandLineToolConfigurations = commandLineToolConfigurations;
             this.visualCpp = visualCpp;
             this.sdk = sdk;
             this.targetPlatform = targetPlatform;
@@ -144,74 +195,72 @@ public boolean isAvailable() {
         public void explain(TreeVisitor<? super String> visitor) {
         }
 
-        public <T extends BinaryToolSpec> Compiler<T> createCppCompiler() {
-            CommandLineTool<CppCompileSpec> commandLineTool = commandLineTool("C++ compiler", visualCpp.getCompiler(targetPlatform));
-            Transformer<CppCompileSpec, CppCompileSpec> specTransformer = addIncludePathAndDefinitions();
-            commandLineTool.withSpecTransformer(specTransformer);
-            CppCompiler cppCompiler = new CppCompiler(commandLineTool);
-            return (Compiler<T>) new OutputCleaningCompiler<CppCompileSpec>(cppCompiler, ".obj");
+        public Compiler<CppCompileSpec> createCppCompiler() {
+            CommandLineTool commandLineTool = tool("C++ compiler", visualCpp.getCompiler(targetPlatform));
+            CppCompiler cppCompiler = new CppCompiler(commandLineTool, invocation(commandLineToolConfigurations.get("cppCompiler")), addIncludePathAndDefinitions(CppCompileSpec.class));
+            return new OutputCleaningCompiler<CppCompileSpec>(cppCompiler, ".obj");
         }
 
-        public <T extends BinaryToolSpec> Compiler<T> createCCompiler() {
-            CommandLineTool<CCompileSpec> commandLineTool = commandLineTool("C compiler", visualCpp.getCompiler(targetPlatform));
-            Transformer<CCompileSpec, CCompileSpec> specTransformer = addIncludePathAndDefinitions();
-            commandLineTool.withSpecTransformer(specTransformer);
-            CCompiler cCompiler = new CCompiler(commandLineTool);
-            return (Compiler<T>) new OutputCleaningCompiler<CCompileSpec>(cCompiler, ".obj");
+        public Compiler<CCompileSpec> createCCompiler() {
+            CommandLineTool commandLineTool = tool("C compiler", visualCpp.getCompiler(targetPlatform));
+            CCompiler cCompiler = new CCompiler(commandLineTool, invocation(commandLineToolConfigurations.get("cCompiler")), addIncludePathAndDefinitions(CCompileSpec.class));
+            return new OutputCleaningCompiler<CCompileSpec>(cCompiler, ".obj");
         }
 
-        public <T extends BinaryToolSpec> Compiler<T> createObjectiveCppCompiler() {
+        public Compiler<ObjectiveCppCompileSpec> createObjectiveCppCompiler() {
             throw new RuntimeException("Objective-C++ is not available on the Visual C++ toolchain");
         }
 
-        public <T extends BinaryToolSpec> Compiler<T> createObjectiveCCompiler() {
+        public Compiler<ObjectiveCCompileSpec> createObjectiveCCompiler() {
             throw new RuntimeException("Objective-C is not available on the Visual C++ toolchain");
         }
 
-        public <T extends BinaryToolSpec> Compiler<T> createAssembler() {
-            CommandLineTool<AssembleSpec> commandLineTool = commandLineTool("Assembler", visualCpp.getAssembler(targetPlatform));
-            return (Compiler<T>) new Assembler(commandLineTool);
+        public Compiler<AssembleSpec> createAssembler() {
+            CommandLineTool commandLineTool = tool("Assembler", visualCpp.getAssembler(targetPlatform));
+            return new Assembler(commandLineTool, invocation(commandLineToolConfigurations.get("assembler")));
         }
 
-        public <T extends BinaryToolSpec> Compiler<T> createWindowsResourceCompiler() {
-            CommandLineTool<WindowsResourceCompileSpec> commandLineTool = commandLineTool("Windows resource compiler", sdk.getResourceCompiler(targetPlatform));
-            Transformer<WindowsResourceCompileSpec, WindowsResourceCompileSpec> specTransformer = addIncludePathAndDefinitions();
-            commandLineTool.withSpecTransformer(specTransformer);
-            WindowsResourceCompiler windowsResourceCompiler = new WindowsResourceCompiler(commandLineTool);
-            return (Compiler<T>) new OutputCleaningCompiler<WindowsResourceCompileSpec>(windowsResourceCompiler, ".res");
+        public Compiler<WindowsResourceCompileSpec> createWindowsResourceCompiler() {
+            CommandLineTool commandLineTool = tool("Windows resource compiler", sdk.getResourceCompiler(targetPlatform));
+            WindowsResourceCompiler windowsResourceCompiler = new WindowsResourceCompiler(commandLineTool, invocation(commandLineToolConfigurations.get("rcCompiler")), addIncludePathAndDefinitions(WindowsResourceCompileSpec.class));
+            return new OutputCleaningCompiler<WindowsResourceCompileSpec>(windowsResourceCompiler, ".res");
         }
 
-        public <T extends LinkerSpec> Compiler<T> createLinker() {
-            CommandLineTool<LinkerSpec> commandLineTool = commandLineTool("Linker", visualCpp.getLinker(targetPlatform));
-            commandLineTool.withSpecTransformer(addLibraryPath());
-            return (Compiler<T>) new LinkExeLinker(commandLineTool);
+        public Compiler<LinkerSpec> createLinker() {
+            CommandLineTool commandLineTool = tool("Linker", visualCpp.getLinker(targetPlatform));
+            return new LinkExeLinker(commandLineTool, invocation(commandLineToolConfigurations.get("linker")), addLibraryPath());
         }
 
-        public <T extends StaticLibraryArchiverSpec> Compiler<T> createStaticLibraryArchiver() {
-            CommandLineTool<StaticLibraryArchiverSpec> commandLineTool = commandLineTool("Static library archiver", visualCpp.getArchiver(targetPlatform));
-            return (Compiler<T>) new LibExeStaticLibraryArchiver(commandLineTool);
+        public Compiler<StaticLibraryArchiverSpec> createStaticLibraryArchiver() {
+            CommandLineTool commandLineTool = tool("Static library archiver", visualCpp.getArchiver(targetPlatform));
+            return new LibExeStaticLibraryArchiver(commandLineTool, invocation(commandLineToolConfigurations.get("staticLibArchiver")));
         }
 
-        private <T extends BinaryToolSpec> CommandLineTool<T> commandLineTool(String toolName, File exe) {
-            CommandLineTool<T> tool = new CommandLineTool<T>(toolName, exe, execActionFactory);
+        private CommandLineTool tool(String toolName, File exe) {
+            return new CommandLineTool(toolName, exe, execActionFactory);
+        }
 
+        private CommandLineToolInvocation invocation(CommandLineToolConfigurationInternal commandLineToolConfiguration) {
+            MutableCommandLineToolInvocation invocation = new DefaultCommandLineToolInvocation();
             // The visual C++ tools use the path to find other executables
             // TODO:ADAM - restrict this to the specific path for the target tool
-            tool.withPath(visualCpp.getPath(targetPlatform));
-            tool.withPath(sdk.getBinDir(targetPlatform));
-
+            invocation.addPath(visualCpp.getPath(targetPlatform));
+            invocation.addPath(sdk.getBinDir(targetPlatform));
             // Clear environment variables that might effect cl.exe & link.exe
-            clearEnvironmentVars(tool, "INCLUDE", "CL", "LIBPATH", "LINK", "LIB");
-            return tool;
+            clearEnvironmentVars(invocation, "INCLUDE", "CL", "LIBPATH", "LINK", "LIB");
+
+            invocation.addPostArgsAction(commandLineToolConfiguration.getArgAction());
+            return invocation;
         }
 
-        private <T extends BinaryToolSpec> void clearEnvironmentVars(CommandLineTool<T> tool, String... names) {
+        private void clearEnvironmentVars(MutableCommandLineToolInvocation invocation, String... names) {
+            // TODO:DAZ This check should really be done in the compiler process
             Map<String, ?> environmentVariables = Jvm.current().getInheritableEnvironmentVariables(System.getenv());
             for (String name : names) {
                 Object value = environmentVariables.get(name);
                 if (value != null) {
                     LOGGER.warn("Ignoring value '{}' set for environment variable '{}'.", value, name);
-                    tool.withEnvironmentVar(name, "");
+                    invocation.addEnvironmentVar(name, "");
                 }
             }
         }
@@ -220,7 +269,8 @@ public String getOutputType() {
             return String.format("%s-%s", getName(), operatingSystem.getName());
         }
 
-        private <T extends NativeCompileSpec> Transformer<T, T> addIncludePathAndDefinitions() {
+        // TODO:DAZ These should be modelled properly, not hidden in a compile spec transformation
+        private <T extends NativeCompileSpec> Transformer<T, T> addIncludePathAndDefinitions(Class<T> type) {
             return new Transformer<T, T>() {
                 public T transform(T original) {
                     original.include(visualCpp.getIncludePath(targetPlatform));
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsResourceCompiler.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsResourceCompiler.java
index 93adae2e4cf7..5fe041545a69 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsResourceCompiler.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/WindowsResourceCompiler.java
@@ -15,17 +15,15 @@
  */
 package org.gradle.nativebinaries.toolchain.internal.msvcpp;
 
-import org.apache.commons.io.FilenameUtils;
+import org.gradle.api.Transformer;
 import org.gradle.api.internal.tasks.SimpleWorkResult;
-import org.gradle.api.tasks.WorkResult;
 import org.gradle.api.internal.tasks.compile.Compiler;
+import org.gradle.api.tasks.WorkResult;
 import org.gradle.internal.FileUtils;
-import org.gradle.internal.hash.HashUtil;
 import org.gradle.internal.os.OperatingSystem;
+import org.gradle.nativebinaries.internal.CompilerOutputFileNamingScheme;
 import org.gradle.nativebinaries.language.rc.internal.WindowsResourceCompileSpec;
-import org.gradle.nativebinaries.toolchain.internal.ArgsTransformer;
-import org.gradle.nativebinaries.toolchain.internal.CommandLineTool;
-import org.gradle.nativebinaries.toolchain.internal.MacroArgsConverter;
+import org.gradle.nativebinaries.toolchain.internal.*;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -33,21 +31,27 @@
 
 public class WindowsResourceCompiler implements Compiler<WindowsResourceCompileSpec> {
 
-    private final CommandLineTool<WindowsResourceCompileSpec> commandLineTool;
+    private final CommandLineTool commandLineTool;
+    private final Transformer<WindowsResourceCompileSpec, WindowsResourceCompileSpec> specTransformer;
+    private final CommandLineToolInvocation baseInvocation;
 
-    WindowsResourceCompiler(CommandLineTool<WindowsResourceCompileSpec> commandLineTool) {
+    WindowsResourceCompiler(CommandLineTool commandLineTool, CommandLineToolInvocation invocation, Transformer<WindowsResourceCompileSpec, WindowsResourceCompileSpec> specTransformer) {
         this.commandLineTool = commandLineTool;
+        this.specTransformer = specTransformer;
+        this.baseInvocation = invocation;
     }
 
     public WorkResult execute(WindowsResourceCompileSpec spec) {
-        boolean didWork = false;
         boolean windowsPathLimitation = OperatingSystem.current().isWindows();
-        CommandLineTool<WindowsResourceCompileSpec> commandLineAssembler = commandLineTool.inWorkDirectory(spec.getObjectFileDir());
+        MutableCommandLineToolInvocation invocation = baseInvocation.copy();
+        spec = specTransformer.transform(spec);
         for (File sourceFile : spec.getSourceFiles()) {
-            WorkResult result = commandLineAssembler.withArguments(new RcCompilerArgsTransformer(sourceFile, windowsPathLimitation)).execute(spec);
-            didWork |= result.getDidWork();
+            RcCompilerArgsTransformer argsTransformer = new RcCompilerArgsTransformer(sourceFile, windowsPathLimitation);
+            invocation.setArgs(argsTransformer.transform(spec));
+            invocation.setWorkDirectory(spec.getObjectFileDir());
+            commandLineTool.execute(invocation);
         }
-        return new SimpleWorkResult(didWork);
+        return new SimpleWorkResult(!spec.getSourceFiles().isEmpty());
     }
 
     private static class RcCompilerArgsTransformer implements ArgsTransformer<WindowsResourceCompileSpec> {
@@ -77,13 +81,16 @@ public List<String> transform(WindowsResourceCompileSpec spec) {
         }
 
         private File getOutputFile(WindowsResourceCompileSpec spec) {
-            String outputFileName = FilenameUtils.getBaseName(inputFile.getName()) + ".res";
-            String compactMD5 = HashUtil.createCompactMD5(inputFile.getAbsolutePath());
-            File outputDirectory = new File(spec.getObjectFileDir(), compactMD5);
-            if(!outputDirectory.exists()){
-                outputDirectory.mkdir();
+
+            File outputFile = new CompilerOutputFileNamingScheme()
+                    .withObjectFileNameSuffix(".res")
+                    .withOutputBaseFolder(spec.getObjectFileDir())
+                    .map(inputFile);
+
+            File outputDirectory = outputFile.getParentFile();
+            if (!outputDirectory.exists()) {
+                outputDirectory.mkdirs();
             }
-            File outputFile = new File(outputDirectory, outputFileName);
             return windowsPathLengthLimitation ? FileUtils.assertInWindowsPathLengthLimitation(outputFile) : outputFile;
         }
     }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/CommandLineToolConfigurationInternal.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/CommandLineToolConfigurationInternal.java
new file mode 100644
index 000000000000..5b063ce1e059
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/CommandLineToolConfigurationInternal.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries.toolchain.internal.tools;
+
+import org.gradle.api.Action;
+import org.gradle.nativebinaries.toolchain.CommandLineToolConfiguration;
+
+import java.util.List;
+
+public interface CommandLineToolConfigurationInternal extends CommandLineToolConfiguration{
+
+    public Action<List<String>> getArgAction();
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ConfiguredToolRegistry.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ConfiguredToolRegistry.java
new file mode 100644
index 000000000000..30d370b39fc5
--- /dev/null
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ConfiguredToolRegistry.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.toolchain.internal.tools;
+
+import org.gradle.nativebinaries.toolchain.CommandLineToolConfiguration;
+import org.gradle.nativebinaries.toolchain.internal.ToolType;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ConfiguredToolRegistry implements ToolRegistry {
+    private final Map<ToolType, GccCommandLineToolConfigurationInternal> gccTools = new HashMap<ToolType, GccCommandLineToolConfigurationInternal>();
+
+    public ConfiguredToolRegistry(Iterable<? extends CommandLineToolConfiguration> toolConfigurations) {
+        for (CommandLineToolConfiguration registeredTool : toolConfigurations) {
+            register((GccCommandLineToolConfigurationInternal) registeredTool);
+        }
+    }
+
+    private void register(GccCommandLineToolConfigurationInternal tool) {
+        gccTools.put(tool.getToolType(), tool);
+    }
+
+    public GccCommandLineToolConfigurationInternal getTool(ToolType toolType) {
+        return gccTools.get(toolType);
+    }
+}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultTool.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultCommandLineToolConfiguration.java
similarity index 66%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultTool.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultCommandLineToolConfiguration.java
index e2feb02361c0..7748cde0f83e 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultTool.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultCommandLineToolConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,46 +13,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.gradle.nativebinaries.toolchain.internal.tools;
 
 import groovy.lang.Closure;
 import org.gradle.api.Action;
 import org.gradle.api.internal.ClosureBackedAction;
 import org.gradle.internal.Actions;
-import org.gradle.nativebinaries.toolchain.internal.ToolType;
 
 import java.util.ArrayList;
 import java.util.List;
 
-class DefaultTool implements GccToolInternal {
-    private final ToolType toolType;
-    private String executable;
+public class DefaultCommandLineToolConfiguration implements CommandLineToolConfigurationInternal {
     private List<Action<? super List<String>>> argActions = new ArrayList<Action<? super List<String>>>();
+    private String name;
 
-    public DefaultTool(ToolType toolType, String defaultExecutable) {
-        this.toolType = toolType;
-        this.executable = defaultExecutable;
-    }
-
-    public ToolType getToolType() {
-        return toolType;
-    }
-
-    public String getExecutable() {
-        return executable;
-    }
-
-    public void setExecutable(String file) {
-        executable = file;
+    public DefaultCommandLineToolConfiguration(String name) {
+        this.name = name;
     }
 
-    // TODO:DAZ Decorate class and use an action parameter
     public void withArguments(Closure arguments) {
         Action<List<String>> action = new ClosureBackedAction<List<String>>(arguments);
         argActions.add(action);
     }
 
+    // TODO:Rene Decorate class instead of method overloading
+    public void withArguments(Action<List<String>> action) {
+        argActions.add(action);
+    }
+
     public Action<List<String>> getArgAction() {
         return Actions.composite(argActions);
     }
+
+    public String getName() {
+        return this.name;
+    }
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultToolRegistry.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultGccCommandLineToolConfiguration.java
similarity index 54%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultToolRegistry.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultGccCommandLineToolConfiguration.java
index 7e2f7ad2821c..cfd1ef2b2a25 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultToolRegistry.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/DefaultGccCommandLineToolConfiguration.java
@@ -17,19 +17,28 @@
 
 import org.gradle.nativebinaries.toolchain.internal.ToolType;
 
-import java.util.HashMap;
-import java.util.Map;
+public class DefaultGccCommandLineToolConfiguration extends DefaultCommandLineToolConfiguration implements GccCommandLineToolConfigurationInternal {
+    private final ToolType toolType;
+    private String executable;
 
-public class DefaultToolRegistry implements ToolRegistry {
-    private final Map<ToolType, GccToolInternal> gccTools = new HashMap<ToolType, GccToolInternal>();
 
-    // TODO:DAZ Should not need default executable here?
-    public void register(ToolType toolType, String defaultExecutable) {
-        DefaultTool tool = new DefaultTool(toolType, defaultExecutable);
-        gccTools.put(toolType, tool);
+    public DefaultGccCommandLineToolConfiguration(String name, ToolType toolType, String defaultExecutable) {
+        super(name);
+        this.toolType = toolType;
+        this.executable = defaultExecutable;
     }
 
-    public GccToolInternal getTool(ToolType toolType) {
-        return gccTools.get(toolType);
+    public ToolType getToolType() {
+        return toolType;
     }
+
+    public String getExecutable() {
+        return executable;
+    }
+
+    public void setExecutable(String file) {
+        executable = file;
+    }
+
+
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/GccToolInternal.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/GccCommandLineToolConfigurationInternal.java
similarity index 83%
rename from subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/GccToolInternal.java
rename to subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/GccCommandLineToolConfigurationInternal.java
index c803ddbc2abe..03bd67a35121 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/GccToolInternal.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/GccCommandLineToolConfigurationInternal.java
@@ -16,12 +16,12 @@
 package org.gradle.nativebinaries.toolchain.internal.tools;
 
 import org.gradle.api.Action;
-import org.gradle.nativebinaries.toolchain.GccTool;
+import org.gradle.nativebinaries.toolchain.GccCommandLineToolConfiguration;
 import org.gradle.nativebinaries.toolchain.internal.ToolType;
 
 import java.util.List;
 
-public interface GccToolInternal extends GccTool {
+public interface GccCommandLineToolConfigurationInternal extends GccCommandLineToolConfiguration {
 
     ToolType getToolType();
 
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformGccTool.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformGccTool.java
deleted file mode 100644
index efee0bc181f1..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformGccTool.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.toolchain.internal.tools;
-
-import groovy.lang.Closure;
-import org.gradle.api.Action;
-import org.gradle.internal.Actions;
-import org.gradle.nativebinaries.toolchain.internal.ToolType;
-
-import java.util.List;
-
-public class PlatformGccTool implements GccToolInternal {
-    private final GccToolInternal baseTool;
-    private final List<String> platformArgs;
-
-    public PlatformGccTool(GccToolInternal baseTool, List<String> platformArgs) {
-        this.baseTool = baseTool;
-        this.platformArgs = platformArgs;
-    }
-
-    public ToolType getToolType() {
-        return baseTool.getToolType();
-    }
-
-    public String getExecutable() {
-        return baseTool.getExecutable();
-    }
-
-    public void setExecutable(String file) {
-        throw new UnsupportedOperationException();
-    }
-
-    public Action<List<String>> getArgAction() {
-        Action<? super List<String>> platformArgsAction = new Action<List<String>>() {
-            public void execute(List<String> strings) {
-                strings.addAll(0, platformArgs);
-            }
-        };
-        return Actions.composite(baseTool.getArgAction(), platformArgsAction);
-    }
-
-    public void withArguments(Closure arguments) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformToolRegistry.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformToolRegistry.java
deleted file mode 100644
index ea32d956d389..000000000000
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/PlatformToolRegistry.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.toolchain.internal.tools;
-
-import org.gradle.nativebinaries.toolchain.GccTool;
-import org.gradle.nativebinaries.toolchain.TargetPlatformConfiguration;
-import org.gradle.nativebinaries.toolchain.internal.ToolType;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class PlatformToolRegistry implements ToolRegistry {
-    private final Map<ToolType, GccToolInternal> gccTools = new HashMap<ToolType, GccToolInternal>();
-
-    public PlatformToolRegistry(ToolRegistry defaultTools, TargetPlatformConfiguration configuration) {
-        // TODO:DAZ Replace TargetPlatformConfiguration with an action that applies to the entire registry.
-        // This will involve exposing the tools by their 'name' in a container, and applying the action to that container.
-        register(defaultTools.getTool(ToolType.CPP_COMPILER), configuration.getCppCompilerArgs());
-        register(defaultTools.getTool(ToolType.C_COMPILER), configuration.getCCompilerArgs());
-        register(defaultTools.getTool(ToolType.OBJECTIVECPP_COMPILER), configuration.getObjectiveCppCompilerArgs());
-        register(defaultTools.getTool(ToolType.OBJECTIVEC_COMPILER), configuration.getObjectiveCCompilerArgs());
-        register(defaultTools.getTool(ToolType.ASSEMBLER), configuration.getAssemblerArgs());
-        register(defaultTools.getTool(ToolType.LINKER), configuration.getLinkerArgs());
-        register(defaultTools.getTool(ToolType.STATIC_LIB_ARCHIVER), configuration.getStaticLibraryArchiverArgs());
-    }
-
-    private GccTool register(GccToolInternal baseTool, List<String> platformArgs) {
-        return gccTools.put(baseTool.getToolType(), new PlatformGccTool(baseTool, platformArgs));
-    }
-
-    public GccToolInternal getTool(ToolType toolType) {
-        return gccTools.get(toolType);
-    }
-}
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolRegistry.java b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolRegistry.java
index 4edfa3a8728c..d8cbfb52878a 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolRegistry.java
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/internal/tools/ToolRegistry.java
@@ -18,5 +18,5 @@
 import org.gradle.nativebinaries.toolchain.internal.ToolType;
 
 public interface ToolRegistry {
-    GccToolInternal getTool(ToolType toolType);
+    GccCommandLineToolConfigurationInternal getTool(ToolType toolType);
 }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/ClangCompilerPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/ClangCompilerPlugin.groovy
index 36da872a9dfe..9ca222843f4d 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/ClangCompilerPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/ClangCompilerPlugin.groovy
@@ -19,12 +19,12 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.internal.os.OperatingSystem
+import org.gradle.internal.reflect.Instantiator
 import org.gradle.model.ModelRule
 import org.gradle.model.ModelRules
-import org.gradle.internal.reflect.Instantiator
-import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
+import org.gradle.nativebinaries.plugins.NativeComponentModelPlugin
 import org.gradle.nativebinaries.toolchain.Clang
+import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
 import org.gradle.nativebinaries.toolchain.internal.clang.ClangToolChain
 import org.gradle.process.internal.ExecActionFactory
 
@@ -48,12 +48,12 @@ class ClangCompilerPlugin implements Plugin<Project> {
     }
 
     void apply(Project project) {
-        project.plugins.apply(NativeBinariesPlugin)
+        project.plugins.apply(NativeComponentModelPlugin);
 
         modelRules.rule(new ModelRule() {
             void addToolChain(ToolChainRegistryInternal toolChainRegistry) {
                 toolChainRegistry.registerFactory(Clang, { String name ->
-                    return instantiator.newInstance(ClangToolChain, name, OperatingSystem.current(), fileResolver, execActionFactory)
+                    return instantiator.newInstance(ClangToolChain, name, OperatingSystem.current(), fileResolver, execActionFactory, instantiator)
                 })
                 toolChainRegistry.registerDefaultToolChain(ClangToolChain.DEFAULT_NAME, Clang)
             }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/GccCompilerPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/GccCompilerPlugin.groovy
index 89a6ce17e608..74625ed92ad7 100644
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/GccCompilerPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/GccCompilerPlugin.groovy
@@ -19,12 +19,12 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.internal.os.OperatingSystem
+import org.gradle.internal.reflect.Instantiator
 import org.gradle.model.ModelRule
 import org.gradle.model.ModelRules
-import org.gradle.internal.reflect.Instantiator
-import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
+import org.gradle.nativebinaries.plugins.NativeComponentModelPlugin
 import org.gradle.nativebinaries.toolchain.Gcc
+import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
 import org.gradle.nativebinaries.toolchain.internal.gcc.GccToolChain
 import org.gradle.process.internal.ExecActionFactory
 
@@ -48,12 +48,12 @@ class GccCompilerPlugin implements Plugin<Project> {
     }
 
     void apply(Project project) {
-        project.plugins.apply(NativeBinariesPlugin)
+        project.plugins.apply(NativeComponentModelPlugin);
 
         modelRules.rule(new ModelRule() {
             void addGccToolChain(ToolChainRegistryInternal toolChainRegistry) {
                 toolChainRegistry.registerFactory(Gcc, { String name ->
-                    return instantiator.newInstance(GccToolChain, name, OperatingSystem.current(), fileResolver, execActionFactory)
+                    return instantiator.newInstance(GccToolChain, instantiator, name, OperatingSystem.current(), fileResolver, execActionFactory)
                 })
                 toolChainRegistry.registerDefaultToolChain(GccToolChain.DEFAULT_NAME, Gcc)
             }
diff --git a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/MicrosoftVisualCppPlugin.groovy b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/MicrosoftVisualCppPlugin.groovy
index f61abfb9fd5f..59e5ca886465 100755
--- a/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/MicrosoftVisualCppPlugin.groovy
+++ b/subprojects/cpp/src/main/groovy/org/gradle/nativebinaries/toolchain/plugins/MicrosoftVisualCppPlugin.groovy
@@ -17,7 +17,6 @@
 
 
 package org.gradle.nativebinaries.toolchain.plugins
-
 import org.gradle.api.Incubating
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -26,7 +25,7 @@ import org.gradle.internal.os.OperatingSystem
 import org.gradle.internal.reflect.Instantiator
 import org.gradle.model.ModelRule
 import org.gradle.model.ModelRules
-import org.gradle.nativebinaries.plugins.NativeBinariesPlugin
+import org.gradle.nativebinaries.plugins.NativeComponentModelPlugin
 import org.gradle.nativebinaries.toolchain.VisualCpp
 import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
 import org.gradle.nativebinaries.toolchain.internal.msvcpp.VisualCppToolChain
@@ -35,7 +34,6 @@ import org.gradle.nativebinaries.toolchain.internal.msvcpp.WindowsSdkLocator
 import org.gradle.process.internal.ExecActionFactory
 
 import javax.inject.Inject
-
 /**
  * A {@link Plugin} which makes the Microsoft Visual C++ compiler available to compile C/C++ code.
  */
@@ -62,12 +60,12 @@ class MicrosoftVisualCppPlugin implements Plugin<Project> {
     }
 
     void apply(Project project) {
-        project.plugins.apply(NativeBinariesPlugin)
+        project.plugins.apply(NativeComponentModelPlugin);
 
         modelRules.rule(new ModelRule() {
             void addToolChain(ToolChainRegistryInternal toolChainRegistry) {
                 toolChainRegistry.registerFactory(VisualCpp, { String name ->
-                    return instantiator.newInstance(VisualCppToolChain, name, operatingSystem, fileResolver, execActionFactory, visualStudioLocator, windowsSdkLocator)
+                    return instantiator.newInstance(VisualCppToolChain, name, operatingSystem, fileResolver, execActionFactory, visualStudioLocator, windowsSdkLocator, instantiator)
                 })
                 toolChainRegistry.registerDefaultToolChain(VisualCppToolChain.DEFAULT_NAME, VisualCpp)
             }
diff --git a/subprojects/cpp/src/main/resources/META-INF/gradle-plugins/native-binaries.properties b/subprojects/cpp/src/main/resources/META-INF/gradle-plugins/native-binaries.properties
deleted file mode 100644
index 838bbddfdad7..000000000000
--- a/subprojects/cpp/src/main/resources/META-INF/gradle-plugins/native-binaries.properties
+++ /dev/null
@@ -1 +0,0 @@
-implementation-class=org.gradle.nativebinaries.plugins.NativeBinariesPlugin
\ No newline at end of file
diff --git a/subprojects/cpp/src/main/resources/META-INF/gradle-plugins/native-component.properties b/subprojects/cpp/src/main/resources/META-INF/gradle-plugins/native-component.properties
new file mode 100644
index 000000000000..74f0f79980a5
--- /dev/null
+++ b/subprojects/cpp/src/main/resources/META-INF/gradle-plugins/native-component.properties
@@ -0,0 +1 @@
+implementation-class=org.gradle.nativebinaries.plugins.NativeComponentPlugin
\ No newline at end of file
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/ide/cdt/model/CprojectSettingsSpec.groovy b/subprojects/cpp/src/test/groovy/org/gradle/ide/cdt/model/CprojectSettingsSpec.groovy
index a76d9fde7d67..a93683d626ff 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/ide/cdt/model/CprojectSettingsSpec.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/ide/cdt/model/CprojectSettingsSpec.groovy
@@ -32,7 +32,7 @@ class CprojectSettingsSpec extends Specification {
     def "wire in includes"() {
         given:
         project.apply plugin: 'cpp-exe'
-        settings.binary = project.executables.main
+        settings.binary = project.nativeCode.executables.main
         descriptor.loadDefaults()
 
         expect:
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfigurationTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfigurationTest.groovy
index bcf2c85fcd27..a6ce13c1b47f 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfigurationTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectConfigurationTest.groovy
@@ -16,6 +16,7 @@
 
 package org.gradle.ide.visualstudio.internal
 
+import org.gradle.api.Task
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.SourceDirectorySet
 import org.gradle.api.internal.DefaultDomainObjectSet
@@ -24,9 +25,10 @@ import org.gradle.api.plugins.ExtensionContainer
 import org.gradle.internal.reflect.DirectInstantiator
 import org.gradle.language.HeaderExportingSourceSet
 import org.gradle.language.base.LanguageSourceSet
-import org.gradle.nativebinaries.Executable
-import org.gradle.nativebinaries.ExecutableBinary
+import org.gradle.nativebinaries.NativeBinaryTasks
 import org.gradle.nativebinaries.NativeDependencySet
+import org.gradle.nativebinaries.NativeExecutable
+import org.gradle.nativebinaries.NativeExecutableBinary
 import org.gradle.nativebinaries.internal.DefaultFlavor
 import org.gradle.nativebinaries.internal.DefaultFlavorContainer
 import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
@@ -38,7 +40,7 @@ import spock.lang.Specification
 class VisualStudioProjectConfigurationTest extends Specification {
     final flavor = new DefaultFlavor("flavor1")
     def flavors = new DefaultFlavorContainer(new DirectInstantiator())
-    def exe = Mock(ExecutableInternal) {
+    def exe = Mock(NativeExecutableInternal) {
         getFlavors() >> flavors
     }
     def extensions = Mock(ExtensionContainer)
@@ -66,13 +68,17 @@ class VisualStudioProjectConfigurationTest extends Specification {
     }
 
     def "configuration tasks are binary tasks"() {
+        given:
+        def tasks = Mock(NativeBinaryTasks)
+        def lifecycleTask = Mock(Task)
         when:
-        exeBinary.name >> "exeBinary"
-        exeBinary.component >> exe
+        exeBinary.tasks >> tasks
+        tasks.build >> lifecycleTask
+        lifecycleTask.path >> "lifecycle-task-path"
         exe.projectPath >> ":project-path"
 
         then:
-        configuration.buildTask == ":project-path:exeBinary"
+        configuration.buildTask == "lifecycle-task-path"
         configuration.cleanTask == ":project-path:clean"
     }
 
@@ -190,7 +196,7 @@ class VisualStudioProjectConfigurationTest extends Specification {
         return deps
     }
 
-    interface ExecutableInternal extends Executable, ProjectNativeComponentInternal {}
-    interface TestExecutableBinary extends ProjectNativeBinaryInternal, ExecutableBinary, ExtensionAware {}
+    interface NativeExecutableInternal extends NativeExecutable, ProjectNativeComponentInternal {}
+    interface TestExecutableBinary extends ProjectNativeBinaryInternal, NativeExecutableBinary, ExtensionAware {}
 
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapperTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapperTest.groovy
index 90e07ddf85c8..a08d267a54a8 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapperTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectMapperTest.groovy
@@ -15,7 +15,7 @@
  */
 
 package org.gradle.ide.visualstudio.internal
-import org.gradle.language.base.internal.BinaryNamingScheme
+import org.gradle.runtime.base.internal.BinaryNamingScheme
 import org.gradle.nativebinaries.*
 import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
 import org.gradle.nativebinaries.internal.ProjectNativeComponentInternal
@@ -27,9 +27,9 @@ import spock.lang.Specification
 class VisualStudioProjectMapperTest extends Specification {
     def mapper = new VisualStudioProjectMapper()
 
-    def executable = Mock(ExecutableInternal)
-    ExecutableBinaryInternal executableBinary
-    def library = Mock(LibraryInternal)
+    def executable = Mock(NativeExecutableInternal)
+    NativeExecutableBinaryInternal executableBinary
+    def library = Mock(NativeLibraryInternal)
     def namingScheme = Mock(BinaryNamingScheme)
 
     def flavorOne = Mock(Flavor)
@@ -103,7 +103,7 @@ class VisualStudioProjectMapperTest extends Specification {
     }
 
     private def createExecutableBinary(String binaryName, def buildType, def platform) {
-        def binary = Mock(ExecutableBinaryInternal)
+        def binary = Mock(NativeExecutableBinaryInternal)
         binary.name >> binaryName
         binary.component >> executable
         binary.buildType >> buildType
@@ -124,7 +124,7 @@ class VisualStudioProjectMapperTest extends Specification {
         return ArchitectureNotationParser.parser().parseNotation(name)
     }
 
-    private libraryBinary(Class<? extends LibraryBinary> type) {
+    private libraryBinary(Class<? extends NativeLibraryBinary> type) {
         def binary = Mock(type)
         binary.component >> library
         binary.flavor >> flavorOne
@@ -134,9 +134,9 @@ class VisualStudioProjectMapperTest extends Specification {
         return binary
     }
 
-    interface ExecutableInternal extends Executable, ProjectNativeComponentInternal {}
-    interface LibraryInternal extends Library, ProjectNativeComponentInternal {}
-    interface ExecutableBinaryInternal extends ExecutableBinary, ProjectNativeBinaryInternal {}
+    interface NativeExecutableInternal extends NativeExecutable, ProjectNativeComponentInternal {}
+    interface NativeLibraryInternal extends NativeLibrary, ProjectNativeComponentInternal {}
+    interface NativeExecutableBinaryInternal extends NativeExecutableBinary, ProjectNativeBinaryInternal {}
     interface SharedLibraryBinaryInternal extends SharedLibraryBinary, ProjectNativeBinaryInternal {}
     interface StaticLibraryBinaryInternal extends StaticLibraryBinary, ProjectNativeBinaryInternal {}
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistryTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistryTest.groovy
index 5444cdcf0d96..03beabdc07a5 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistryTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/ide/visualstudio/internal/VisualStudioProjectRegistryTest.groovy
@@ -30,10 +30,10 @@ class VisualStudioProjectRegistryTest extends Specification {
     def visualStudioProjectMapper = Mock(VisualStudioProjectMapper)
     def registry = new VisualStudioProjectRegistry(fileResolver, visualStudioProjectMapper, new DirectInstantiator())
 
-    def executable = Mock(Executable)
+    def executable = Mock(NativeExecutable)
 
     def "creates a matching visual studio project configuration for NativeBinary"() {
-        def executableBinary = Mock(ExecutableInternal)
+        def executableBinary = Mock(NativeExecutableInternal)
         when:
         visualStudioProjectMapper.mapToConfiguration(executableBinary) >> new VisualStudioProjectMapper.ProjectConfigurationNames("vsProject", "vsConfig", "vsPlatform")
         executableBinary.component >> executable
@@ -52,8 +52,8 @@ class VisualStudioProjectRegistryTest extends Specification {
     }
 
     def "returns same visual studio project configuration for native binaries that share project name"() {
-        def executableBinary1 = Mock(ExecutableInternal)
-        def executableBinary2 = Mock(ExecutableInternal)
+        def executableBinary1 = Mock(NativeExecutableInternal)
+        def executableBinary2 = Mock(NativeExecutableInternal)
 
         when:
         visualStudioProjectMapper.mapToConfiguration(executableBinary1) >> new VisualStudioProjectMapper.ProjectConfigurationNames("vsProject", "vsConfig1", "vsPlatform")
@@ -84,8 +84,8 @@ class VisualStudioProjectRegistryTest extends Specification {
     }
 
     def "visual studio project contains sources for native binaries for all configurations"() {
-        def executableBinary1 = Mock(ExecutableInternal)
-        def executableBinary2 = Mock(ExecutableInternal)
+        def executableBinary1 = Mock(NativeExecutableInternal)
+        def executableBinary2 = Mock(NativeExecutableInternal)
         def sourceCommon = Mock(LanguageSourceSet)
         def source1 = Mock(LanguageSourceSet)
         def source2 = Mock(LanguageSourceSet)
@@ -105,5 +105,5 @@ class VisualStudioProjectRegistryTest extends Specification {
         vsProject.sources as List == [sourceCommon, source1, source2]
     }
 
-    interface ExecutableInternal extends ExecutableBinary, ProjectNativeBinaryInternal {}
+    interface NativeExecutableInternal extends NativeExecutableBinary, ProjectNativeBinaryInternal {}
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasksTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasksTest.groovy
index 9e2d31ad8567..704fb942f53a 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasksTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeBinaryTasksTest.groovy
@@ -28,7 +28,7 @@ class DefaultNativeBinaryTasksTest extends Specification {
         expect:
         tasks.link == null
         tasks.createStaticLib == null
-        tasks.builder == null
+        tasks.createOrLink == null
     }
 
     def "returns link task when defined"() {
@@ -39,7 +39,7 @@ class DefaultNativeBinaryTasksTest extends Specification {
         then:
         tasks.link == linkTask
         tasks.createStaticLib == null
-        tasks.builder == linkTask
+        tasks.createOrLink == linkTask
     }
 
     def "returns create task when defined"() {
@@ -50,6 +50,6 @@ class DefaultNativeBinaryTasksTest extends Specification {
         then:
         tasks.link == null
         tasks.createStaticLib == createTask
-        tasks.builder == createTask
+        tasks.createOrLink == createTask
     }
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeComponentTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeComponentTest.groovy
index d43d2dfe1f5c..32a6d4673512 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeComponentTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeComponentTest.groovy
@@ -25,7 +25,7 @@ import spock.lang.Specification
 
 class DefaultNativeComponentTest extends Specification {
     def instantiator = new ClassGeneratorBackedInstantiator(new AsmBackedClassGenerator(), new DirectInstantiator())
-    def id = new NativeProjectComponentIdentifier("project", "name")
+    def id = new ProjectNativeComponentIdentifier("project", "name")
     def component = new TestProjectNativeComponent(id)
 
     def "uses all source sets from a functional source set"() {
@@ -62,7 +62,7 @@ class DefaultNativeComponentTest extends Specification {
     }
 
     class TestProjectNativeComponent extends AbstractTargetedProjectNativeComponent {
-        TestProjectNativeComponent(NativeProjectComponentIdentifier id) {
+        TestProjectNativeComponent(ProjectNativeComponentIdentifier id) {
             super(id)
         }
 
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableBinaryTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutableBinaryTest.groovy
similarity index 73%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableBinaryTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutableBinaryTest.groovy
index 13ca2de2f766..73c117509276 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableBinaryTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutableBinaryTest.groovy
@@ -15,23 +15,23 @@
  */
 
 package org.gradle.nativebinaries.internal
-import org.gradle.language.base.internal.DefaultBinaryNamingScheme
+import org.gradle.runtime.base.internal.DefaultBinaryNamingScheme
 import org.gradle.nativebinaries.BuildType
-import org.gradle.nativebinaries.Executable
+import org.gradle.nativebinaries.NativeExecutable
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver
 import org.gradle.nativebinaries.platform.Platform
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal
 import spock.lang.Specification
 
-class DefaultExecutableBinaryTest extends Specification {
+class DefaultNativeExecutableBinaryTest extends Specification {
     def namingScheme = new DefaultBinaryNamingScheme("bigOne", "executable", [])
 
     def "has useful string representation"() {
         given:
-        def executable = Stub(Executable)
+        def executable = Stub(NativeExecutable)
 
         when:
-        def binary = new ProjectExecutableBinary(executable, new DefaultFlavor("flavorOne"), Stub(ToolChainInternal), Stub(Platform), Stub(BuildType), namingScheme, Mock(NativeDependencyResolver))
+        def binary = new ProjectNativeExecutableBinary(executable, new DefaultFlavor("flavorOne"), Stub(ToolChainInternal), Stub(Platform), Stub(BuildType), namingScheme, Mock(NativeDependencyResolver))
 
         then:
         binary.toString() == "executable 'bigOne:executable'"
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutableTest.groovy
similarity index 83%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutableTest.groovy
index 4347607c2ede..580ec13aa288 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultExecutableTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeExecutableTest.groovy
@@ -18,8 +18,8 @@ package org.gradle.nativebinaries.internal
 
 import spock.lang.Specification
 
-class DefaultExecutableTest extends Specification {
-    def executable = new DefaultExecutable(new NativeProjectComponentIdentifier("project-path", "someExe"))
+class DefaultNativeExecutableTest extends Specification {
+    def executable = new DefaultNativeExecutable(new ProjectNativeComponentIdentifier("project-path", "someExe"))
 
     def "has useful string representation"() {
         expect:
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultLibraryTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeLibraryTest.groovy
similarity index 90%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultLibraryTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeLibraryTest.groovy
index 9d1dcc6e2df6..c4958c7c6c64 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultLibraryTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/DefaultNativeLibraryTest.groovy
@@ -18,8 +18,8 @@ package org.gradle.nativebinaries.internal
 
 import spock.lang.Specification
 
-class DefaultLibraryTest extends Specification {
-    final library = new DefaultLibrary(new NativeProjectComponentIdentifier("project-path", "someLib"))
+class DefaultNativeLibraryTest extends Specification {
+    final library = new DefaultNativeLibrary(new ProjectNativeComponentIdentifier("project-path", "someLib"))
 
     def "has useful string representation"() {
         expect:
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryTest.groovy
index 955eab924fee..f463b6303ff6 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectNativeBinaryTest.groovy
@@ -18,8 +18,8 @@ package org.gradle.nativebinaries.internal
 import org.gradle.internal.reflect.DirectInstantiator
 import org.gradle.language.DependentSourceSet
 import org.gradle.language.base.LanguageSourceSet
-import org.gradle.language.base.internal.BinaryNamingScheme
-import org.gradle.language.base.internal.DefaultBinaryNamingScheme
+import org.gradle.runtime.base.internal.BinaryNamingScheme
+import org.gradle.runtime.base.internal.DefaultBinaryNamingScheme
 import org.gradle.language.base.internal.DefaultFunctionalSourceSet
 import org.gradle.nativebinaries.*
 import org.gradle.nativebinaries.internal.resolve.NativeBinaryResolveResult
@@ -32,7 +32,7 @@ import spock.lang.Specification
 
 class ProjectNativeBinaryTest extends Specification {
     def flavor1 = new DefaultFlavor("flavor1")
-    def id = new NativeProjectComponentIdentifier("project", "name")
+    def id = new ProjectNativeComponentIdentifier("project", "name")
     def component = new TestProjectNativeComponent(id)
     def toolChain1 = Stub(ToolChainInternal) {
         getName() >> "ToolChain1"
@@ -122,7 +122,7 @@ class ProjectNativeBinaryTest extends Specification {
 
     def "order of libraries is maintained"() {
         def binary = testBinary(component)
-        def libraryBinary = Mock(LibraryBinary)
+        def libraryBinary = Mock(NativeLibraryBinary)
         def dependency1 = Stub(NativeDependencySet)
         def dependency2 = Stub(NativeDependencySet)
         def dependency3 = Stub(NativeDependencySet)
@@ -180,7 +180,7 @@ class ProjectNativeBinaryTest extends Specification {
     }
 
     class TestProjectNativeComponent extends AbstractProjectNativeComponent {
-        TestProjectNativeComponent(NativeProjectComponentIdentifier id) {
+        TestProjectNativeComponent(ProjectNativeComponentIdentifier id) {
             super(id)
         }
 
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinaryTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinaryTest.groovy
index 21f75277c7fb..854dd08368a5 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinaryTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectSharedLibraryBinaryTest.groovy
@@ -18,10 +18,10 @@ package org.gradle.nativebinaries.internal
 import org.gradle.api.Task
 import org.gradle.api.file.SourceDirectorySet
 import org.gradle.language.HeaderExportingSourceSet
-import org.gradle.language.base.internal.DefaultBinaryNamingScheme
+import org.gradle.runtime.base.internal.DefaultBinaryNamingScheme
 import org.gradle.language.rc.WindowsResourceSet
 import org.gradle.nativebinaries.BuildType
-import org.gradle.nativebinaries.Library
+import org.gradle.nativebinaries.NativeLibrary
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver
 import org.gradle.nativebinaries.platform.Platform
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal
@@ -35,7 +35,7 @@ class ProjectSharedLibraryBinaryTest extends Specification {
     final toolChain = Stub(ToolChainInternal)
     final platform = Stub(Platform)
     final buildType = Stub(BuildType)
-    final library = Stub(Library)
+    final library = Stub(NativeLibrary)
     final resolver = Stub(NativeDependencyResolver)
     def sharedLibraryFile = Mock(File)
     def sharedLibraryLinkFile = Mock(File)
@@ -64,7 +64,7 @@ class ProjectSharedLibraryBinaryTest extends Specification {
         binary.sharedLibraryFile = sharedLibraryFile
         binary.sharedLibraryLinkFile = sharedLibraryLinkFile
         def lifecycleTask = Stub(Task)
-        binary.setLifecycleTask(lifecycleTask)
+        binary.setBuildTask(lifecycleTask)
         binary.builtBy(Stub(Task))
 
         and: "has at least one header exporting source set"
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinaryTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinaryTest.groovy
index 77a544b491f3..ef0e29b0bf18 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinaryTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/ProjectStaticLibraryBinaryTest.groovy
@@ -19,9 +19,9 @@ import org.gradle.api.Task
 import org.gradle.api.file.FileCollection
 import org.gradle.api.file.SourceDirectorySet
 import org.gradle.language.HeaderExportingSourceSet
-import org.gradle.language.base.internal.DefaultBinaryNamingScheme
+import org.gradle.runtime.base.internal.DefaultBinaryNamingScheme
 import org.gradle.nativebinaries.BuildType
-import org.gradle.nativebinaries.Library
+import org.gradle.nativebinaries.NativeLibrary
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver
 import org.gradle.nativebinaries.platform.Platform
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal
@@ -33,7 +33,7 @@ import spock.lang.Specification
 class ProjectStaticLibraryBinaryTest extends Specification {
     @Rule TestNameTestDirectoryProvider tmpDir
     def namingScheme = new DefaultBinaryNamingScheme("main", "staticLibrary", [])
-    def library = Stub(Library)
+    def library = Stub(NativeLibrary)
     def toolChain = Stub(ToolChainInternal)
     def platform = Stub(Platform)
     def buildType = Stub(BuildType)
@@ -65,7 +65,7 @@ class ProjectStaticLibraryBinaryTest extends Specification {
         final binary = staticLibrary
         given:
         def lifecycleTask = Stub(Task)
-        binary.lifecycleTask = lifecycleTask
+        binary.buildTask = lifecycleTask
         binary.builtBy(Stub(Task))
 
         and:
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactoryTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactoryTest.groovy
index 47803dace14d..4524d8c9ac1d 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactoryTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/DefaultNativeBinariesFactoryTest.groovy
@@ -17,14 +17,14 @@
 package org.gradle.nativebinaries.internal.configure
 import org.gradle.api.Action
 import org.gradle.internal.reflect.DirectInstantiator
-import org.gradle.language.base.internal.DefaultBinaryNamingSchemeBuilder
+import org.gradle.runtime.base.internal.DefaultBinaryNamingSchemeBuilder
 import org.gradle.nativebinaries.BuildType
 import org.gradle.nativebinaries.Flavor
 import org.gradle.nativebinaries.ProjectNativeBinary
 import org.gradle.nativebinaries.SharedLibraryBinary
-import org.gradle.nativebinaries.internal.DefaultExecutable
-import org.gradle.nativebinaries.internal.DefaultLibrary
-import org.gradle.nativebinaries.internal.NativeProjectComponentIdentifier
+import org.gradle.nativebinaries.internal.DefaultNativeExecutable
+import org.gradle.nativebinaries.internal.DefaultNativeLibrary
+import org.gradle.nativebinaries.internal.ProjectNativeComponentIdentifier
 import org.gradle.nativebinaries.internal.resolve.NativeDependencyResolver
 import org.gradle.nativebinaries.platform.Platform
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal
@@ -39,14 +39,14 @@ class DefaultNativeBinariesFactoryTest extends Specification {
     def buildType = Mock(BuildType)
     def flavor = Mock(Flavor)
 
-    def id = new NativeProjectComponentIdentifier("project", "name")
+    def id = new ProjectNativeComponentIdentifier("project", "name")
 
     def namingSchemeBuilder = new DefaultBinaryNamingSchemeBuilder().withComponentName("test")
     def factory = new DefaultNativeBinariesFactory(new DirectInstantiator(), configAction, resolver)
 
     def "creates binaries for executable"() {
         given:
-        def executable = new DefaultExecutable(id)
+        def executable = new DefaultNativeExecutable(id)
 
         when:
         1 * configAction.execute(_)
@@ -66,7 +66,7 @@ class DefaultNativeBinariesFactoryTest extends Specification {
 
     def "creates binaries for library"() {
         given:
-        def library = new DefaultLibrary(id)
+        def library = new DefaultNativeLibrary(id)
 
         when:
         2 * configAction.execute(_)
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializerTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializerTest.groovy
index 90658959c493..bd0ff1c6d34b 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializerTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeBinaryInitializerTest.groovy
@@ -17,7 +17,7 @@
 package org.gradle.nativebinaries.internal.configure
 
 import org.gradle.api.Project
-import org.gradle.language.base.internal.BinaryNamingScheme
+import org.gradle.runtime.base.internal.BinaryNamingScheme
 import org.gradle.nativebinaries.*
 import org.gradle.nativebinaries.internal.ProjectNativeBinaryInternal
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal
@@ -41,7 +41,7 @@ class ProjectNativeBinaryInitializerTest extends Specification {
     }
 
     def "test executable"() {
-        def binary = initBinary(ExecutableBinaryInternal)
+        def binary = initBinary(NativeExecutableBinaryInternal)
 
         when:
         toolChain.getExecutableName("base_name") >> "exe_name"
@@ -92,7 +92,7 @@ class ProjectNativeBinaryInitializerTest extends Specification {
         return binary
     }
 
-    interface ExecutableBinaryInternal extends ExecutableBinary, ProjectNativeBinaryInternal {}
+    interface NativeExecutableBinaryInternal extends NativeExecutableBinary, ProjectNativeBinaryInternal {}
     interface SharedLibraryBinaryInternal extends SharedLibraryBinary, ProjectNativeBinaryInternal {}
     interface StaticLibraryBinaryInternal extends StaticLibraryBinary, ProjectNativeBinaryInternal {}
 
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializerTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializerTest.groovy
index 689f9ae938d6..3ae2c54e1db0 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializerTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/configure/ProjectNativeComponentInitializerTest.groovy
@@ -17,11 +17,11 @@
 package org.gradle.nativebinaries.internal.configure
 
 import org.gradle.api.Named
-import org.gradle.language.base.internal.BinaryNamingSchemeBuilder
+import org.gradle.runtime.base.internal.BinaryNamingSchemeBuilder
 import org.gradle.nativebinaries.BuildType
 import org.gradle.nativebinaries.Flavor
-import org.gradle.nativebinaries.internal.DefaultExecutable
-import org.gradle.nativebinaries.internal.NativeProjectComponentIdentifier
+import org.gradle.nativebinaries.internal.DefaultNativeExecutable
+import org.gradle.nativebinaries.internal.ProjectNativeComponentIdentifier
 import org.gradle.nativebinaries.platform.Platform
 import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal
 import org.gradle.nativebinaries.toolchain.internal.ToolChainRegistryInternal
@@ -37,8 +37,8 @@ class ProjectNativeComponentInitializerTest extends Specification {
     def buildType = createStub(BuildType, "buildType1")
     def flavor = createStub(Flavor, "flavor1")
 
-    def id = new NativeProjectComponentIdentifier("project", "name")
-    def component = new DefaultExecutable(id)
+    def id = new ProjectNativeComponentIdentifier("project", "name")
+    def component = new DefaultNativeExecutable(id)
 
     def "does not use variant dimension names for single valued dimensions"() {
         when:
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParserTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParserTest.groovy
index 489be6fb8707..8adfc54316d8 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParserTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/NativeDependencyNotationParserTest.groovy
@@ -15,14 +15,14 @@
  */
 package org.gradle.nativebinaries.internal.resolve
 import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.nativebinaries.Library
+import org.gradle.nativebinaries.NativeLibrary
 import org.gradle.nativebinaries.NativeLibraryRequirement
 import spock.lang.Specification
 
 class NativeDependencyNotationParserTest extends Specification {
     def parser = NativeDependencyNotationParser.parser()
     def requirement = Mock(NativeLibraryRequirement)
-    def library = Mock(Library)
+    def library = Mock(NativeLibrary)
     def project = Mock(ProjectInternal)
 
     def "uses shared variant of library"() {
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocatorTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocatorTest.groovy
index 1ee846e2d09e..e58eae8ead5c 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocatorTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/internal/resolve/ProjectLibraryBinaryLocatorTest.groovy
@@ -15,12 +15,13 @@
  */
 package org.gradle.nativebinaries.internal.resolve
 import org.gradle.api.DomainObjectSet
+import org.gradle.api.NamedDomainObjectSet
 import org.gradle.api.UnknownDomainObjectException
 import org.gradle.api.UnknownProjectException
 import org.gradle.api.internal.plugins.ExtensionContainerInternal
 import org.gradle.api.internal.project.ProjectInternal
-import org.gradle.nativebinaries.Library
-import org.gradle.nativebinaries.LibraryContainer
+import org.gradle.runtime.base.ProjectComponentContainer
+import org.gradle.nativebinaries.NativeLibrary
 import org.gradle.nativebinaries.NativeLibraryRequirement
 import org.gradle.nativebinaries.internal.ProjectNativeLibraryRequirement
 import spock.lang.Specification
@@ -29,7 +30,7 @@ class ProjectLibraryBinaryLocatorTest extends Specification {
     def project = Mock(ProjectInternal)
     def projectLocator = Mock(ProjectLocator)
     def requirement = Mock(NativeLibraryRequirement)
-    def library = Mock(Library)
+    def library = Mock(NativeLibrary)
     def binaries = Mock(DomainObjectSet)
     def locator = new ProjectLibraryBinaryLocator(projectLocator)
 
@@ -126,11 +127,14 @@ class ProjectLibraryBinaryLocatorTest extends Specification {
         def libraries = findLibraryContainer(project)
         libraries.getByName("libName") >> library
     }
-    private LibraryContainer findLibraryContainer(ProjectInternal project) {
+
+    private findLibraryContainer(ProjectInternal project) {
         def extensions = Mock(ExtensionContainerInternal)
-        def libraries = Mock(LibraryContainer)
+        def components = Mock(ProjectComponentContainer)
+        def libraryContainer = Mock(NamedDomainObjectSet)
         project.getExtensions() >> extensions
-        extensions.findByName("libraries") >> libraries
-        return libraries
+        extensions.findByType(ProjectComponentContainer) >> components
+        components.withType(NativeLibrary) >> libraryContainer
+        return libraryContainer
     }
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/AbstractNativeBinariesPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/AbstractNativeComponentPluginTest.groovy
similarity index 91%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/AbstractNativeBinariesPluginTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/AbstractNativeComponentPluginTest.groovy
index 96c7c6b7791d..9a4473feece6 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/AbstractNativeBinariesPluginTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/AbstractNativeComponentPluginTest.groovy
@@ -18,21 +18,22 @@ package org.gradle.nativebinaries.language
 
 import org.apache.commons.lang.StringUtils
 import org.gradle.api.Plugin
+import org.gradle.api.Task
 import org.gradle.api.tasks.TaskDependencyMatchers
 import org.gradle.language.base.FunctionalSourceSet
 import org.gradle.language.base.LanguageSourceSet
-import org.gradle.nativebinaries.ExecutableBinary
+import org.gradle.nativebinaries.NativeExecutableBinary
 import org.gradle.nativebinaries.NativeBinary
 import org.gradle.util.GFileUtils
 import org.gradle.util.TestUtil
 import spock.lang.Specification
 
-abstract class AbstractNativeBinariesPluginTest extends Specification {
+abstract class AbstractNativeComponentPluginTest extends Specification {
     final def project = TestUtil.createRootProject()
 
     abstract Class<? extends Plugin> getPluginClass();
     abstract Class<? extends LanguageSourceSet> getSourceSetClass();
-    abstract Class<? extends Plugin> getCompileTaskClass();
+    abstract Class<? extends Task> getCompileTaskClass();
     abstract String getPluginName();
 
     def "creates source set with conventional locations for components"() {
@@ -57,14 +58,14 @@ abstract class AbstractNativeBinariesPluginTest extends Specification {
         sourceSetClass.isInstance(sourceSets.exe."$pluginName")
         sourceSets.exe."$pluginName".source.srcDirs == [project.file("src/exe/$pluginName")] as Set
         sourceSets.exe."$pluginName".exportedHeaders.srcDirs == [project.file("src/exe/headers")] as Set
-        project.executables.exe.source == [sourceSets.exe."$pluginName"] as Set
+        project.nativeCode.executables.exe.source == [sourceSets.exe."$pluginName"] as Set
 
         and:
         sourceSets.lib instanceof FunctionalSourceSet
         sourceSetClass.isInstance(sourceSets.lib."$pluginName")
         sourceSets.lib."$pluginName".source.srcDirs == [project.file("src/lib/$pluginName")] as Set
         sourceSets.lib."$pluginName".exportedHeaders.srcDirs == [project.file("src/lib/headers")] as Set
-        project.libraries.lib.source == [sourceSets.lib."$pluginName"] as Set
+        project.nativeCode.libraries.lib.source == [sourceSets.lib."$pluginName"] as Set
     }
 
     def "can configure source set locations"() {
@@ -132,7 +133,7 @@ abstract class AbstractNativeBinariesPluginTest extends Specification {
         }
 
         then:
-        ExecutableBinary binary = project.binaries.testExecutable
+        NativeExecutableBinary binary = project.binaries.testExecutable
         binary.tasks.withType(compileTaskClass)*.name == ["compileTestExecutableTestAnotherOne", "compileTestExecutableTest${StringUtils.capitalize(pluginName)}"]
 
         and:
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPluginTest.groovy
similarity index 85%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPluginTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPluginTest.groovy
index dbb720e1d097..e0d42593c0df 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerNativeBinariesPluginTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/plugins/AssemblerPluginTest.groovy
@@ -18,22 +18,23 @@ package org.gradle.nativebinaries.language.assembler.plugins
 import org.gradle.api.tasks.TaskDependencyMatchers
 import org.gradle.language.assembler.AssemblerSourceSet
 import org.gradle.language.base.FunctionalSourceSet
-import org.gradle.nativebinaries.ExecutableBinary
+import org.gradle.nativebinaries.NativeExecutableBinary
 import org.gradle.nativebinaries.NativeBinary
 import org.gradle.nativebinaries.SharedLibraryBinary
 import org.gradle.nativebinaries.StaticLibraryBinary
 import org.gradle.nativebinaries.language.assembler.tasks.Assemble
+import org.gradle.nativebinaries.toolchain.ToolChainRegistry
 import org.gradle.util.GFileUtils
 import org.gradle.util.TestUtil
 import spock.lang.Specification
 
-class AssemblerNativeBinariesPluginTest extends Specification {
+class AssemblerPluginTest extends Specification {
     final def project = TestUtil.createRootProject()
 
     def "creates asm source set with conventional locations for components"() {
         when:
         dsl {
-            apply plugin: AssemblerNativeBinariesPlugin
+            apply plugin: AssemblerPlugin
             executables {
                 exe {}
             }
@@ -50,19 +51,19 @@ class AssemblerNativeBinariesPluginTest extends Specification {
         and:
         sourceSets.exe.asm instanceof AssemblerSourceSet
         sourceSets.exe.asm.source.srcDirs == [project.file("src/exe/asm")] as Set
-        project.executables.exe.source == [sourceSets.exe.asm] as Set
+        project.nativeCode.executables.exe.source == [sourceSets.exe.asm] as Set
 
         and:
         sourceSets.lib instanceof FunctionalSourceSet
         sourceSets.lib.asm instanceof AssemblerSourceSet
         sourceSets.lib.asm.source.srcDirs == [project.file("src/lib/asm")] as Set
-        project.libraries.lib.source == [sourceSets.lib.asm] as Set
+        project.nativeCode.libraries.lib.source == [sourceSets.lib.asm] as Set
     }
 
     def "can configure source set locations"() {
         given:
         dsl {
-            apply plugin: AssemblerNativeBinariesPlugin
+            apply plugin: AssemblerPlugin
             sources {
                 exe {
                     asm {
@@ -91,7 +92,7 @@ class AssemblerNativeBinariesPluginTest extends Specification {
         touch("src/test/asm/dummy.s")
         touch("src/test/anotherOne/dummy.s")
         dsl {
-            apply plugin: AssemblerNativeBinariesPlugin
+            apply plugin: AssemblerPlugin
             sources {
                 test {
                     anotherOne(AssemblerSourceSet) {}
@@ -108,7 +109,7 @@ class AssemblerNativeBinariesPluginTest extends Specification {
         }
 
         then:
-        ExecutableBinary binary = project.binaries.testExecutable
+        NativeExecutableBinary binary = project.binaries.testExecutable
         binary.tasks.withType(Assemble)*.name == ["assembleTestExecutableTestAnotherOne", "assembleTestExecutableTestAsm"]
 
         and:
@@ -128,7 +129,7 @@ class AssemblerNativeBinariesPluginTest extends Specification {
         touch("src/test/asm/dummy.s")
         touch("src/test/anotherOne/dummy.s")
         dsl {
-            apply plugin: AssemblerNativeBinariesPlugin
+            apply plugin: AssemblerPlugin
             sources {
                 test {
                     anotherOne(AssemblerSourceSet) {}
@@ -171,6 +172,24 @@ class AssemblerNativeBinariesPluginTest extends Specification {
         staticLibTask TaskDependencyMatchers.dependsOn("assembleTestStaticLibraryTestAnotherOne", "assembleTestStaticLibraryTestAsm")
     }
 
+    def "registers assembler tool to toolchains"() {
+        when:
+        dsl {
+            apply plugin: AssemblerPlugin
+            executables {
+                exe {}
+            }
+            libraries {
+                lib {}
+            }
+        }
+        then:
+        ToolChainRegistry toolChains = project.modelRegistry.get("toolChains", ToolChainRegistry)
+        toolChains.each { def toolChain ->
+            toolChain.getByName("assembler")  != null
+        }
+    }
+
     def touch(String filePath) {
         GFileUtils.touch(project.file(filePath))
     }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/tasks/AssemblerTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/tasks/AssemblerTest.groovy
index 4c6b8da7e390..251a190741cf 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/tasks/AssemblerTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/assembler/tasks/AssemblerTest.groovy
@@ -47,7 +47,7 @@ class AssemblerTest extends Specification {
         then:
         _ * toolChain.outputType >> "c"
         _ * platform.compatibilityString >> "p"
-        1 * toolChain.target(platform) >> platformToolChain
+        1 * toolChain.select(platform) >> platformToolChain
         1 * platformToolChain.createAssembler() >> assembler
         1 * assembler.execute({ AssembleSpec spec ->
             assert spec.sourceFiles*.name == ["sourceFile"]
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompilerTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompilerTest.groovy
deleted file mode 100644
index 269cc9d83770..000000000000
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/CleanCompilingNativeCompilerTest.groovy
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.nativebinaries.language.c.internal.incremental
-
-import org.gradle.api.internal.TaskInternal
-import org.gradle.api.internal.TaskOutputsInternal
-import org.gradle.api.internal.file.collections.SimpleFileCollection
-import org.gradle.api.internal.tasks.SimpleWorkResult
-import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec
-import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
-import org.junit.Rule
-import spock.lang.Specification
-
-class CleanCompilingNativeCompilerTest extends Specification {
-    @Rule final TestNameTestDirectoryProvider temporaryFolder = new TestNameTestDirectoryProvider()
-
-    def delegateCompiler = Mock(org.gradle.api.internal.tasks.compile.Compiler)
-    def incrementalCompileProcessor = Mock(IncrementalCompileProcessor)
-    def task = Mock(TaskInternal)
-    def outputs = Mock(TaskOutputsInternal)
-    def includesParser = Mock(SourceIncludesParser);
-    def compiler = new CleanCompilingNativeCompiler(task, includesParser, null, null, null, delegateCompiler)
-
-    def "cleans outputs and delegates spec for compilation"() {
-        def spec = Mock(NativeCompileSpec)
-        def existingSource = temporaryFolder.file("existing")
-        def newSource = temporaryFolder.file("new")
-        def outputFile = temporaryFolder.createFile("output", "previous")
-
-        def sources = [existingSource, newSource]
-        def compilation = Mock(IncrementalCompilation)
-
-        when:
-        outputFile.assertExists()
-
-        and:
-        spec.getSourceFiles() >> sources
-        incrementalCompileProcessor.processSourceFiles(_) >> compilation
-        0 * compilation._
-
-        and:
-        def result = compiler.doIncrementalCompile(incrementalCompileProcessor, spec)
-
-        then:
-        1 * spec.getObjectFileDir() >> outputFile.parentFile
-        1 * task.getOutputs() >> outputs
-        1 * outputs.previousFiles >> new SimpleFileCollection(outputFile)
-        0 * spec._
-        1 * delegateCompiler.execute(spec) >> new SimpleWorkResult(false)
-
-        and:
-        result.didWork
-        outputFile.assertDoesNotExist()
-    }
-}
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompilerTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompilerTest.groovy
index 893069028007..99d9570292b8 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompilerTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/IncrementalNativeCompilerTest.groovy
@@ -15,6 +15,10 @@
  */
 package org.gradle.nativebinaries.language.c.internal.incremental
 
+import org.gradle.api.internal.TaskInternal
+import org.gradle.api.internal.TaskOutputsInternal
+import org.gradle.api.internal.file.collections.SimpleFileCollection
+import org.gradle.api.internal.tasks.SimpleWorkResult
 import org.gradle.nativebinaries.toolchain.internal.NativeCompileSpec
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
@@ -24,31 +28,59 @@ class IncrementalNativeCompilerTest extends Specification {
     @Rule final TestNameTestDirectoryProvider temporaryFolder = new TestNameTestDirectoryProvider()
 
     def delegateCompiler = Mock(org.gradle.api.internal.tasks.compile.Compiler)
-    def incrementalCompileProcessor = Mock(IncrementalCompileProcessor)
-    def includesParser = Mock(SourceIncludesParser);
-    def compiler = new IncrementalNativeCompiler(null, includesParser, null, null, null, delegateCompiler)
+    def task = Mock(TaskInternal)
+    def compiler = new IncrementalNativeCompiler(task, null, null, delegateCompiler)
+
+    def outputs = Mock(TaskOutputsInternal)
 
     def "updates spec for incremental compilation"() {
         def spec = Mock(NativeCompileSpec)
-        def existingSource = temporaryFolder.file("existing")
         def newSource = temporaryFolder.file("new")
         def removedSource = temporaryFolder.file("removed")
 
-        def sources = [existingSource, newSource]
         def compilation = Mock(IncrementalCompilation)
 
         when:
-        spec.getSourceFiles() >> sources
-        incrementalCompileProcessor.processSourceFiles(_) >> compilation
         compilation.getRecompile() >> [newSource]
         compilation.getRemoved() >> [removedSource]
 
         and:
-        compiler.doIncrementalCompile(incrementalCompileProcessor, spec)
+        compiler.doIncrementalCompile(compilation, spec)
 
         then:
         1 * spec.setSourceFiles([newSource])
         1 * spec.setRemovedSourceFiles([removedSource])
         1 * delegateCompiler.execute(spec)
     }
+
+    def "cleans outputs and delegates spec for clean compilation"() {
+        def spec = Mock(NativeCompileSpec)
+        def existingSource = temporaryFolder.file("existing")
+        def newSource = temporaryFolder.file("new")
+        def outputFile = temporaryFolder.createFile("output", "previous")
+
+        def sources = [existingSource, newSource]
+
+        when:
+        outputFile.assertExists()
+
+        and:
+        spec.incrementalCompile >> false
+        task.outputs >> outputs
+        spec.getSourceFiles() >> sources
+
+        and:
+        def result = compiler.doCleanIncrementalCompile(spec)
+
+        then:
+        1 * spec.getObjectFileDir() >> outputFile.parentFile
+        1 * outputs.previousFiles >> new SimpleFileCollection(outputFile)
+        0 * spec._
+        1 * delegateCompiler.execute(spec) >> new SimpleWorkResult(false)
+
+        and:
+        result.didWork
+        outputFile.assertDoesNotExist()
+    }
+
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParserTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParserTest.groovy
index c0a0a3d68f30..2edc47d756da 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParserTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/internal/incremental/sourceparser/RegexBackedCSourceParserTest.groovy
@@ -367,6 +367,38 @@ class RegexBackedCSourceParserTest extends Specification {
         directive << ["include", "import"]
     }
 
+    def "ignores badly formed directives"() {
+        when:
+        sourceFile << """
+include
+#
+# include
+# import
+
+void # include <thing>
+
+#import <
+
+# inklude <thing.h>
+
+#import thing.h
+#import thing.h"
+#import "thing.h>
+#include <thing.h
+#include "thing.h
+
+#include
+<thing.h>
+
+#include 'thing.h' extra stuff
+
+"""
+
+        then:
+        noIncludes()
+        noImports()
+    }
+
     def "detects imports with line=continuation"() {
         when:
         sourceFile << """
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/plugins/CPluginTest.groovy
similarity index 83%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPluginTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/plugins/CPluginTest.groovy
index 08e28c38f381..02c0bf53f7f8 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/plugins/CNativeBinariesPluginTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/plugins/CPluginTest.groovy
@@ -17,18 +17,19 @@
 package org.gradle.nativebinaries.language.c.plugins
 
 import org.gradle.api.Plugin
+import org.gradle.api.Task
 import org.gradle.language.base.LanguageSourceSet
 import org.gradle.language.c.CSourceSet
-import org.gradle.nativebinaries.language.AbstractNativeBinariesPluginTest
+import org.gradle.nativebinaries.language.AbstractNativeComponentPluginTest
 import org.gradle.nativebinaries.language.c.tasks.CCompile
 import org.gradle.util.TestUtil
 
-class CNativeBinariesPluginTest extends AbstractNativeBinariesPluginTest{
+class CPluginTest extends AbstractNativeComponentPluginTest{
     final def project = TestUtil.createRootProject()
 
     @Override
     Class<? extends Plugin> getPluginClass() {
-        return CNativeBinariesPlugin
+        return CPlugin
     }
 
     @Override
@@ -37,7 +38,7 @@ class CNativeBinariesPluginTest extends AbstractNativeBinariesPluginTest{
     }
 
     @Override
-    Class<? extends Plugin> getCompileTaskClass() {
+    Class<? extends Task> getCompileTaskClass() {
         return CCompile
     }
 
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/tasks/CCompileTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/tasks/CCompileTest.groovy
index 5524eb0b4083..4412b566728a 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/tasks/CCompileTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/c/tasks/CCompileTest.groovy
@@ -49,7 +49,7 @@ class CCompileTest extends Specification {
         then:
         _ * toolChain.outputType >> "c"
         _ * platform.compatibilityString >> "p"
-        1 * toolChain.target(platform) >> platformToolChain
+        1 * toolChain.select(platform) >> platformToolChain
         1 * platformToolChain.createCCompiler() >> cCompiler
         1 * cCompiler.execute({ CCompileSpec spec ->
             assert spec.sourceFiles*.name== ["sourceFile"]
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/internal/DefaultCppSourceSetTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/internal/DefaultCppSourceSetTest.groovy
index 96f12fee4769..f6e354f6eb81 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/internal/DefaultCppSourceSetTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/internal/DefaultCppSourceSetTest.groovy
@@ -17,8 +17,8 @@
 package org.gradle.nativebinaries.language.cpp.internal
 import org.gradle.language.base.FunctionalSourceSet
 import org.gradle.language.cpp.internal.DefaultCppSourceSet
-import org.gradle.nativebinaries.Library
-import org.gradle.nativebinaries.LibraryBinary
+import org.gradle.nativebinaries.NativeLibrary
+import org.gradle.nativebinaries.NativeLibraryBinary
 import org.gradle.nativebinaries.NativeDependencySet
 import org.gradle.util.TestUtil
 import spock.lang.Specification
@@ -35,7 +35,7 @@ class DefaultCppSourceSetTest extends Specification {
     }
 
     def "can add a library as a dependency of the source set"() {
-        def library = Mock(Library)
+        def library = Mock(NativeLibrary)
 
         when:
         sourceSet.lib(library)
@@ -45,7 +45,7 @@ class DefaultCppSourceSetTest extends Specification {
     }
 
     def "can add a library binary as a dependency of the binary"() {
-        def library = Mock(LibraryBinary)
+        def library = Mock(NativeLibraryBinary)
 
         when:
         sourceSet.lib(library)
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPluginTest.groovy
deleted file mode 100644
index 4f010a7a357c..000000000000
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppNativeBinariesPluginTest.groovy
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.nativebinaries.language.cpp.plugins
-
-import org.gradle.api.tasks.TaskDependencyMatchers
-import org.gradle.language.base.FunctionalSourceSet
-import org.gradle.language.cpp.CppSourceSet
-import org.gradle.nativebinaries.ExecutableBinary
-import org.gradle.nativebinaries.NativeBinary
-import org.gradle.nativebinaries.SharedLibraryBinary
-import org.gradle.nativebinaries.StaticLibraryBinary
-import org.gradle.nativebinaries.language.cpp.tasks.CppCompile
-import org.gradle.util.GFileUtils
-import org.gradle.util.TestUtil
-import spock.lang.Specification
-
-class CppNativeBinariesPluginTest extends Specification {
-    final def project = TestUtil.createRootProject()
-
-    def "creates cpp source set with conventional locations for components"() {
-        when:
-        dsl {
-            apply plugin: CppNativeBinariesPlugin
-            executables {
-                exe {}
-            }
-            libraries {
-                lib {}
-            }
-        }
-
-        then:
-        def sourceSets = project.sources
-        sourceSets.size() == 2
-        sourceSets*.name == ["exe", "lib"]
-
-        and:
-        sourceSets.exe instanceof FunctionalSourceSet
-        sourceSets.exe.cpp instanceof CppSourceSet
-        sourceSets.exe.cpp.source.srcDirs == [project.file("src/exe/cpp")] as Set
-        sourceSets.exe.cpp.exportedHeaders.srcDirs == [project.file("src/exe/headers")] as Set
-        project.executables.exe.source == [sourceSets.exe.cpp] as Set
-
-        and:
-        sourceSets.lib instanceof FunctionalSourceSet
-        sourceSets.lib.cpp instanceof CppSourceSet
-        sourceSets.lib.cpp.source.srcDirs == [project.file("src/lib/cpp")] as Set
-        sourceSets.lib.cpp.exportedHeaders.srcDirs == [project.file("src/lib/headers")] as Set
-        project.libraries.lib.source == [sourceSets.lib.cpp] as Set
-    }
-
-    def "can configure source set locations"() {
-        given:
-        dsl {
-            apply plugin: CppNativeBinariesPlugin
-            sources {
-                exe {
-                    cpp {
-                        source {
-                            srcDirs "d1", "d2"
-                        }
-                        exportedHeaders {
-                            srcDirs "h1", "h2"
-                        }
-                    }
-                }
-                lib {
-                    cpp {
-                        source {
-                            srcDirs "d3"
-                        }
-                        exportedHeaders {
-                            srcDirs "h3"
-                        }
-                    }
-                }
-            }
-        }
-
-        expect:
-        def sourceSets = project.sources
-        with (sourceSets.exe.cpp) {
-            source.srcDirs*.name == ["d1", "d2"]
-            exportedHeaders.srcDirs*.name == ["h1", "h2"]
-        }
-
-        with (sourceSets.lib.cpp) {
-            source.srcDirs*.name == ["d3"]
-            exportedHeaders.srcDirs*.name == ["h3"]
-        }
-    }
-
-    def "creates compile tasks for each non-empty executable source set"() {
-        when:
-        touch("src/test/cpp/file.cpp")
-        touch("src/test/anotherCpp/file.cpp")
-        dsl {
-            apply plugin: CppNativeBinariesPlugin
-            sources {
-                test {
-                    anotherCpp(CppSourceSet) {}
-                    emptyOne(CppSourceSet) {}
-                }
-            }
-            executables {
-                test {
-                    binaries.all { NativeBinary binary ->
-                        binary.cppCompiler.define "NDEBUG"
-                        binary.cppCompiler.define "LEVEL", "1"
-                        binary.cppCompiler.args "ARG1", "ARG2"
-                    }
-                }
-            }
-        }
-
-        then:
-        ExecutableBinary binary = project.binaries.testExecutable
-        binary.tasks.withType(CppCompile)*.name == ["compileTestExecutableTestAnotherCpp", "compileTestExecutableTestCpp"]
-
-        and:
-        binary.tasks.withType(CppCompile).each { compile ->
-            compile.toolChain == binary.toolChain
-            compile.macros == [NDEBUG:null, LEVEL:"1"]
-            compile.compilerArgs == ["ARG1", "ARG2"]
-        }
-
-        and:
-        def linkTask = binary.tasks.link
-        linkTask TaskDependencyMatchers.dependsOn("compileTestExecutableTestAnotherCpp", "compileTestExecutableTestCpp")
-    }
-
-    def "creates compile task for each library source set"() {
-        when:
-        touch("src/test/cpp/file.cpp")
-        touch("src/test/anotherCpp/file.cpp")
-        dsl {
-            apply plugin: CppNativeBinariesPlugin
-            sources {
-                test {
-                    anotherCpp(CppSourceSet) {}
-                }
-            }
-            libraries {
-                test {
-                    binaries.all {
-                        cppCompiler.define "NDEBUG"
-                        cppCompiler.define "LEVEL", "1"
-                        cppCompiler.args "ARG1", "ARG2"
-                    }
-                    binaries.withType(SharedLibraryBinary) {
-                        cppCompiler.args "SHARED1", "SHARED2"
-                    }
-                    binaries.withType(StaticLibraryBinary) {
-                        cppCompiler.args "STATIC1", "STATIC2"
-                    }
-                }
-            }
-        }
-
-        then:
-        SharedLibraryBinary sharedLib = project.binaries.testSharedLibrary
-        sharedLib.tasks.withType(CppCompile)*.name == ["compileTestSharedLibraryTestAnotherCpp", "compileTestSharedLibraryTestCpp"]
-        sharedLib.tasks.withType(CppCompile).each { compile ->
-            compile.toolChain == sharedLib.toolChain
-            compile.macros == [NDEBUG:null, LEVEL:"1"]
-            compile.compilerArgs == ["ARG1", "ARG2", "SHARED1", "SHARED2"]
-        }
-        def sharedLinkTask = sharedLib.tasks.link
-        sharedLinkTask TaskDependencyMatchers.dependsOn("compileTestSharedLibraryTestAnotherCpp", "compileTestSharedLibraryTestCpp")
-
-        and:
-        StaticLibraryBinary staticLib = project.binaries.testStaticLibrary
-        staticLib.tasks.withType(CppCompile)*.name == ["compileTestStaticLibraryTestAnotherCpp", "compileTestStaticLibraryTestCpp"]
-        staticLib.tasks.withType(CppCompile).each { compile ->
-            compile.toolChain == sharedLib.toolChain
-            compile.macros == [NDEBUG:null, LEVEL:"1"]
-            compile.compilerArgs == ["ARG1", "ARG2", "STATIC1", "STATIC2"]
-        }
-        def staticLibTask = staticLib.tasks.createStaticLib
-        staticLibTask TaskDependencyMatchers.dependsOn("compileTestStaticLibraryTestAnotherCpp", "compileTestStaticLibraryTestCpp")
-    }
-
-    def touch(String filePath) {
-        GFileUtils.touch(project.file(filePath))
-    }
-
-    def dsl(Closure closure) {
-        closure.delegate = project
-        closure()
-        project.evaluate()
-    }
-}
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPluginTest.groovy
new file mode 100644
index 000000000000..679b2d839944
--- /dev/null
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/plugins/CppPluginTest.groovy
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries.language.cpp.plugins
+import org.gradle.api.Plugin
+import org.gradle.api.Task
+import org.gradle.language.base.LanguageSourceSet
+import org.gradle.language.cpp.CppSourceSet
+import org.gradle.nativebinaries.language.AbstractNativeComponentPluginTest
+import org.gradle.nativebinaries.language.cpp.tasks.CppCompile
+import org.gradle.util.TestUtil
+
+class CppPluginTest extends AbstractNativeComponentPluginTest {
+    final def project = TestUtil.createRootProject()
+
+    @Override
+    Class<? extends Plugin> getPluginClass() {
+        return CppPlugin
+    }
+
+    @Override
+    Class<? extends Task> getCompileTaskClass() {
+        return CppCompile
+    }
+
+    @Override
+    Class<? extends LanguageSourceSet> getSourceSetClass() {
+        return CppSourceSet
+    }
+
+    @Override
+    String getPluginName() {
+        return "cpp"
+    }
+}
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/tasks/CppCompileTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/tasks/CppCompileTest.groovy
index ae50f01adfcb..3be30e6754f3 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/tasks/CppCompileTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/cpp/tasks/CppCompileTest.groovy
@@ -48,7 +48,7 @@ class CppCompileTest extends Specification {
         then:
         _ * toolChain.outputType >> "cpp"
         _ * platform.compatibilityString >> "p"
-        1 * toolChain.target(platform) >> platformToolChain
+        1 * toolChain.select(platform) >> platformToolChain
         1 * platformToolChain.createCppCompiler() >> cppCompiler
         1 * cppCompiler.execute({ CppCompileSpec spec ->
             assert spec.sourceFiles*.name == ["sourceFile"]
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPluginTest.groovy
similarity index 82%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPluginTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPluginTest.groovy
index e3a5264fe652..b87d2f38e789 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCNativeBinariesPluginTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivec/plugins/ObjectiveCPluginTest.groovy
@@ -17,15 +17,16 @@
 package org.gradle.nativebinaries.language.objectivec.plugins
 
 import org.gradle.api.Plugin
+import org.gradle.api.Task
 import org.gradle.language.base.LanguageSourceSet
 import org.gradle.language.objectivec.ObjectiveCSourceSet
-import org.gradle.nativebinaries.language.AbstractNativeBinariesPluginTest
+import org.gradle.nativebinaries.language.AbstractNativeComponentPluginTest
 import org.gradle.nativebinaries.language.objectivec.tasks.ObjectiveCCompile
 
-class ObjectiveCNativeBinariesPluginTest extends AbstractNativeBinariesPluginTest{
+class ObjectiveCPluginTest extends AbstractNativeComponentPluginTest {
     @Override
     Class<? extends Plugin> getPluginClass() {
-        return ObjectiveCNativeBinariesPlugin
+        return ObjectiveCPlugin
     }
 
     @Override
@@ -34,7 +35,7 @@ class ObjectiveCNativeBinariesPluginTest extends AbstractNativeBinariesPluginTes
     }
 
     @Override
-    Class<? extends Plugin> getCompileTaskClass() {
+    Class<? extends Task> getCompileTaskClass() {
         return ObjectiveCCompile
     }
 
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPluginTest.groovy
similarity index 82%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPluginTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPluginTest.groovy
index 148a65e7bebd..925e9fa7fcec 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppNativeBinariesPluginTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/objectivecpp/plugins/ObjectiveCppPluginTest.groovy
@@ -17,15 +17,16 @@
 package org.gradle.nativebinaries.language.objectivecpp.plugins
 
 import org.gradle.api.Plugin
+import org.gradle.api.Task
 import org.gradle.language.base.LanguageSourceSet
 import org.gradle.language.objectivecpp.ObjectiveCppSourceSet
-import org.gradle.nativebinaries.language.AbstractNativeBinariesPluginTest
+import org.gradle.nativebinaries.language.AbstractNativeComponentPluginTest
 import org.gradle.nativebinaries.language.objectivecpp.tasks.ObjectiveCppCompile
 
-class ObjectiveCppNativeBinariesPluginTest extends AbstractNativeBinariesPluginTest{
+class ObjectiveCppPluginTest extends AbstractNativeComponentPluginTest {
     @Override
     Class<? extends Plugin> getPluginClass() {
-        return ObjectiveCppNativeBinariesPlugin
+        return ObjectiveCppPlugin
     }
 
     @Override
@@ -34,7 +35,7 @@ class ObjectiveCppNativeBinariesPluginTest extends AbstractNativeBinariesPluginT
     }
 
     @Override
-    Class<? extends Plugin> getCompileTaskClass() {
+    Class<? extends Task> getCompileTaskClass() {
         return ObjectiveCppCompile
     }
 
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPluginTest.groovy
new file mode 100644
index 000000000000..afee20cd1743
--- /dev/null
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/language/rc/plugins/WindowsResourcesPluginTest.groovy
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.nativebinaries.language.rc.plugins
+
+import org.gradle.nativebinaries.toolchain.Clang
+import org.gradle.nativebinaries.toolchain.Gcc
+import org.gradle.nativebinaries.toolchain.ToolChainRegistry
+import org.gradle.nativebinaries.toolchain.VisualCpp
+import org.gradle.util.TestUtil
+import spock.lang.Specification
+
+/**
+ * Created by Rene on 28/04/14.
+ */
+class WindowsResourcesPluginTest extends Specification {
+
+    final def project = TestUtil.createRootProject()
+
+    def "registers rcCompiler tool to visualcpp"() {
+        when:
+        project.configure(project){
+            apply plugin: WindowsResourcesPlugin
+            executables {
+                exe {}
+            }
+            libraries {
+                lib {}
+            }
+        }
+        then:
+        ToolChainRegistry toolChains = project.modelRegistry.get("toolChains", ToolChainRegistry)
+        toolChains.withType(VisualCpp){ VisualCpp visualCpp ->
+            visualCpp.getByName("rcCompiler") != null
+        }
+        toolChains.withType(Gcc){ Gcc gcc ->
+            gcc.findByName("rcCompiler") == null
+        }
+        toolChains.withType(Clang){ Clang clang ->
+            clang.findByName("rcCompiler") == null
+        }
+    }
+}
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeComponentModelPluginTest.groovy
similarity index 85%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPluginTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeComponentModelPluginTest.groovy
index ca33573c3724..e96ae5e61b28 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesModelPluginTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeComponentModelPluginTest.groovy
@@ -31,17 +31,17 @@ import org.gradle.nativebinaries.toolchain.internal.ToolChainInternal
 import org.gradle.util.TestUtil
 import spock.lang.Specification
 
-class NativeBinariesModelPluginTest extends Specification {
+class NativeComponentModelPluginTest extends Specification {
     final def project = TestUtil.createRootProject()
 
     def setup() {
-        project.plugins.apply(NativeBinariesModelPlugin)
+        project.plugins.apply(NativeComponentModelPlugin)
     }
 
     def "adds model extensions"() {
         expect:
-        project.executables instanceof NamedDomainObjectContainer
-        project.libraries instanceof NamedDomainObjectContainer
+        project.nativeCode.executables instanceof NamedDomainObjectContainer
+        project.nativeCode.libraries instanceof NamedDomainObjectContainer
         project.modelRegistry.get("toolChains", ToolChainRegistry) != null
         project.modelRegistry.get("platforms", PlatformContainer) != null
         project.modelRegistry.get("buildTypes", BuildTypeContainer) != null
@@ -65,12 +65,12 @@ class NativeBinariesModelPluginTest extends Specification {
 
     def "adds default flavor to every binary"() {
         when:
-        project.executables.create "exe"
-        project.libraries.create "lib"
+        project.nativeCode.executables.create "exe"
+        project.nativeCode.libraries.create "lib"
         project.evaluate()
 
         then:
-        one(project.binaries.withType(ExecutableBinary)).flavor.name == DefaultFlavor.DEFAULT
+        one(project.binaries.withType(NativeExecutableBinary)).flavor.name == DefaultFlavor.DEFAULT
         one(project.binaries.withType(SharedLibraryBinary)).flavor.name == DefaultFlavor.DEFAULT
     }
 
@@ -103,7 +103,7 @@ class NativeBinariesModelPluginTest extends Specification {
 
     def "creates binaries for executable"() {
         when:
-        project.plugins.apply(NativeBinariesModelPlugin)
+        project.plugins.apply(NativeComponentModelPlugin)
         project.model {
             toolChains {
                 add toolChain("tc")
@@ -118,11 +118,11 @@ class NativeBinariesModelPluginTest extends Specification {
                 add named(Flavor, "flavor1")
             }
         }
-        def executable = project.executables.create "test"
+        def executable = project.nativeCode.executables.create "test"
         project.evaluate()
 
         then:
-        ExecutableBinary executableBinary = one(project.binaries) as ExecutableBinary
+        NativeExecutableBinary executableBinary = one(project.binaries) as NativeExecutableBinary
         with (executableBinary) {
             name == 'testExecutable'
             component == executable
@@ -138,7 +138,7 @@ class NativeBinariesModelPluginTest extends Specification {
 
     def "creates binaries for library"() {
         when:
-        project.plugins.apply(NativeBinariesModelPlugin)
+        project.plugins.apply(NativeComponentModelPlugin)
         project.model {
             toolChains {
                 add toolChain("tc")
@@ -153,7 +153,7 @@ class NativeBinariesModelPluginTest extends Specification {
                 add named(Flavor, "flavor1")
             }
         }
-        def library = project.libraries.create "test"
+        def library = project.nativeCode.libraries.create "test"
         project.evaluate()
 
         then:
@@ -187,13 +187,13 @@ class NativeBinariesModelPluginTest extends Specification {
 
     def "creates lifecycle task for each binary"() {
         when:
-        project.plugins.apply(NativeBinariesModelPlugin)
-        def executable = project.executables.create "exe"
-        def library = project.libraries.create "lib"
+        project.plugins.apply(NativeComponentModelPlugin)
+        def executable = project.nativeCode.executables.create "exe"
+        def library = project.nativeCode.libraries.create "lib"
         project.evaluate()
 
         then:
-        ExecutableBinary executableBinary = project.binaries.exeExecutable as ExecutableBinary
+        NativeExecutableBinary executableBinary = project.binaries.exeExecutable as NativeExecutableBinary
         with (oneTask(executableBinary.buildDependencies)) {
             name == executableBinary.name
             group == BasePlugin.BUILD_GROUP
@@ -224,7 +224,7 @@ class NativeBinariesModelPluginTest extends Specification {
     def toolChain(def name) {
         Stub(ToolChainInternal) {
             getName() >> name
-            target(_) >> Stub(PlatformToolChain) {
+            select(_) >> Stub(PlatformToolChain) {
                 isAvailable() >> true
             }
         }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeComponentPluginTest.groovy
similarity index 89%
rename from subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginTest.groovy
rename to subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeComponentPluginTest.groovy
index 5a509b055fb1..f5c4495f7a0a 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeBinariesPluginTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/plugins/NativeComponentPluginTest.groovy
@@ -25,16 +25,16 @@ import org.gradle.nativebinaries.tasks.LinkSharedLibrary
 import org.gradle.util.TestUtil
 import spock.lang.Specification
 
-class NativeBinariesPluginTest extends Specification {
+class NativeComponentPluginTest extends Specification {
     final def project = TestUtil.createRootProject()
 
     def setup() {
-        project.plugins.apply(NativeBinariesPlugin)
+        project.plugins.apply(NativeComponentPlugin)
     }
 
     def "creates link and install task for executable"() {
         when:
-        project.executables.create "test"
+        project.nativeCode.executables.create "test"
         project.evaluate()
 
         then:
@@ -58,7 +58,7 @@ class NativeBinariesPluginTest extends Specification {
 
     def "creates link task and static archive task for library"() {
         when:
-        project.libraries.create "test"
+        project.nativeCode.libraries.create "test"
         project.evaluate()
 
         then:
@@ -101,10 +101,10 @@ class NativeBinariesPluginTest extends Specification {
         project.sources.create "testExe"
         project.sources.testExe.add languageSourceSet
 
-        project.executables.create "testExe"
+        project.nativeCode.executables.create "testExe"
 
         then:
-        project.executables.testExe.source == [languageSourceSet] as Set
+        project.nativeCode.executables.testExe.source == [languageSourceSet] as Set
     }
 
     def "creates and attaches functional source set with same name to component"() {
@@ -118,9 +118,9 @@ class NativeBinariesPluginTest extends Specification {
             functionalSourceSet.add languageSourceSet
         }
 
-        project.executables.create "testExe"
+        project.nativeCode.executables.create "testExe"
 
         then:
-        project.executables.testExe.source == [languageSourceSet] as Set
+        project.nativeCode.executables.testExe.source == [languageSourceSet] as Set
     }
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultCommandLineToolInvocationTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultCommandLineToolInvocationTest.groovy
new file mode 100644
index 000000000000..d598d9e85321
--- /dev/null
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultCommandLineToolInvocationTest.groovy
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.nativebinaries.toolchain.internal
+
+import org.gradle.api.Action
+import spock.lang.Specification
+
+public class DefaultCommandLineToolInvocationTest extends Specification {
+
+    def "copies and dereferences all fields"() {
+        def pathEntry = Mock(File)
+        def workDirectory = Mock(File)
+        def invocation = new DefaultCommandLineToolInvocation();
+        invocation.addEnvironmentVar("var", "value");
+        invocation.addPath(pathEntry)
+        invocation.workDirectory = workDirectory
+        invocation.args = ["one", "two"]
+
+        when:
+        def copy = invocation.copy()
+
+        and:
+        invocation.workDirectory = pathEntry
+        invocation.addPath(workDirectory)
+        invocation.getEnvironment().put("var", "different")
+        invocation.addEnvironmentVar("var2", "value2")
+        invocation.args = ["two", "three"]
+
+        then:
+        copy.environment == [var: "value"]
+        copy.path == [pathEntry]
+        copy.workDirectory == workDirectory
+        copy.args == ["one", "two"]
+    }
+
+    def "actions are applied to args in order"() {
+        when:
+        def invocation = new DefaultCommandLineToolInvocation()
+        invocation.addPostArgsAction({ List<String> vals ->
+            vals << "first"
+        } as Action<List<String>>)
+
+        and:
+        invocation.args = ["invocation1"]
+
+        then:
+        invocation.args == ["invocation1", "first"]
+
+        when:
+        def copy = invocation.copy()
+        copy.addPostArgsAction({ List<String> vals ->
+            vals << "second"
+        } as Action<List<String>>)
+
+        and:
+        copy.args = ["copy1"]
+
+        then:
+        copy.args == ["copy1", "first", "second"]
+
+    }
+}
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistryTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistryTest.groovy
index 9ffa628dce8c..cb6b15a471e9 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistryTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/DefaultToolChainRegistryTest.groovy
@@ -81,7 +81,7 @@ class DefaultToolChainRegistryTest extends Specification {
 
         and:
         def tc = registry.getForPlatform(platform)
-        def result = tc.target(platform)
+        def result = tc.select(platform)
 
         when:
         result.createCCompiler()
@@ -154,7 +154,7 @@ class DefaultToolChainRegistryTest extends Specification {
         }
         TestToolChain testToolChain = Mock(TestToolChain) {
             _ * getName() >> name
-            _ * target(platform) >> platformToolChain
+            _ * select(platform) >> platformToolChain
         }
         factory.create(name) >> testToolChain
         return testToolChain
@@ -168,7 +168,7 @@ class DefaultToolChainRegistryTest extends Specification {
         TestToolChain testToolChain = Mock(TestToolChain) {
             _ * getName() >> name
             _ * getDisplayName() >> "Tool chain '$name'"
-            _ * target(platform) >> platformToolChain
+            _ * select(platform) >> platformToolChain
         }
         factory.create(name) >> testToolChain
         return testToolChain
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChainTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChainTest.groovy
index 2191f033c0cc..8e785cecb5b1 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChainTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AbstractGccCompatibleToolChainTest.groovy
@@ -15,16 +15,23 @@
  */
 package org.gradle.nativebinaries.toolchain.internal.gcc
 
+import org.gradle.api.Action
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.internal.os.OperatingSystem
+import org.gradle.internal.reflect.Instantiator
 import org.gradle.internal.text.TreeFormatter
+import org.gradle.nativebinaries.toolchain.ConfigurableToolChain
+import org.gradle.nativebinaries.toolchain.CommandLineToolConfiguration
+import org.gradle.nativebinaries.toolchain.internal.PlatformToolChain
+import org.gradle.nativebinaries.toolchain.internal.tools.DefaultGccCommandLineToolConfiguration
 import org.gradle.nativebinaries.platform.Platform
 import org.gradle.nativebinaries.platform.internal.ArchitectureInternal
 import org.gradle.nativebinaries.platform.internal.DefaultArchitecture
 import org.gradle.nativebinaries.platform.internal.DefaultOperatingSystem
-import org.gradle.nativebinaries.toolchain.TargetPlatformConfiguration
+
 import org.gradle.nativebinaries.toolchain.internal.ToolSearchResult
 import org.gradle.nativebinaries.toolchain.internal.ToolType
+
 import org.gradle.nativebinaries.toolchain.internal.tools.ToolSearchPath
 import org.gradle.process.internal.ExecActionFactory
 import org.gradle.util.Requires
@@ -41,15 +48,23 @@ class AbstractGccCompatibleToolChainTest extends Specification {
     def tool = Stub(CommandLineToolSearchResult) {
         isAvailable() >> true
     }
-    def toolChain = new TestToolChain("test", fileResolver, execActionFactory, toolSearchPath)
+
+    def instantiator = Mock(Instantiator)
+    def toolChain = new TestToolChain("test", fileResolver, execActionFactory, toolSearchPath, instantiator)
     def platform = Stub(Platform)
 
+    def setup() {
+        instantiator.newInstance(DefaultGccConfigurableToolChain.class, _) >> { args ->
+            new DefaultGccConfigurableToolChain(args[1][0], args[1][1], args[1][2], args[1][3], args[1][4])
+        }
+    }
+
     def "is unavailable when platform is not known and is not the default platform"() {
         given:
         platform.name >> 'unknown'
 
         expect:
-        def platformToolChain = toolChain.target(platform)
+        def platformToolChain = toolChain.select(platform)
         !platformToolChain.available
         getMessage(platformToolChain) == "Don't know how to build for platform 'unknown'."
     }
@@ -71,7 +86,7 @@ class AbstractGccCompatibleToolChainTest extends Specification {
         toolSearchPath.locate(ToolType.OBJECTIVECPP_COMPILER, "g++") >> missing
 
         expect:
-        def platformToolChain = toolChain.target(platform)
+        def platformToolChain = toolChain.select(platform)
         !platformToolChain.available
         getMessage(platformToolChain) == "c compiler not found"
     }
@@ -90,39 +105,101 @@ class AbstractGccCompatibleToolChainTest extends Specification {
         toolSearchPath.locate(_, _) >> tool
 
         expect:
-        toolChain.target(platform).available
+        toolChain.select(platform).available
     }
 
     def "is available when any language tool can be found and platform configuration registered for platform"() {
-        def platformConfig = Mock(TargetPlatformConfiguration)
-
         given:
         toolSearchPath.locate(_, _) >> tool
-        platformConfig.supportsPlatform(platform) >> true
-
-        and:
-        toolChain.addPlatformConfiguration(platformConfig)
+        toolChain.target(platform, Mock(Action))
 
         expect:
-        toolChain.target(platform).available
+        toolChain.select(platform).available
+    }
+
+    def "selected toolChain applies platform configuration action"() {
+        Platform platform1 = Mock(Platform)
+        Platform platform2 = Mock(Platform)
+        platform1.getName() >> "platform1"
+
+        platform1.getOperatingSystem() >> DefaultOperatingSystem.TOOL_CHAIN_DEFAULT
+        platform2.getOperatingSystem() >> DefaultOperatingSystem.TOOL_CHAIN_DEFAULT
+        platform2.getName() >> "platform2"
+        when:
+        toolSearchPath.locate(_, _) >> tool
+
+        int platformActionApplied = 0
+        toolChain.target([platform1.getName(), platform2.getName()], new Action<ConfigurableToolChain>() {
+            void execute(ConfigurableToolChain configurableToolChain) {
+                platformActionApplied++;
+            }
+        });
+        PlatformToolChain selected = toolChain.select(platform1)
+        then:
+        selected.isAvailable();
+        assert platformActionApplied == 1
+        when:
+
+        selected = toolChain.select(platform2)
+        then:
+        selected.isAvailable()
+        assert platformActionApplied == 2
     }
 
+
+    def "selected toolChain uses objectfile suffix based on targetplatform"() {
+        Platform platform1 = Mock(Platform)
+        Platform platform2 = Mock(Platform)
+        platform1.getName() >> "platform1"
+        def  platformOSWin = Mock(org.gradle.nativebinaries.platform.OperatingSystem)
+        platformOSWin.isWindows() >> true
+        def  platformOSNonWin = Mock(org.gradle.nativebinaries.platform.OperatingSystem)
+        platformOSNonWin.isWindows() >> false
+        platform1.getOperatingSystem() >> platformOSWin
+        platform2.getOperatingSystem() >> platformOSNonWin
+        platform2.getName() >> "platform2"
+        when:
+        toolSearchPath.locate(_, _) >> tool
+
+        toolChain.target([platform1.getName(), platform2.getName()])
+        PlatformToolChain selected = toolChain.select(platform1)
+        then:
+        selected.outputFileSuffix == ".obj"
+        when:
+
+        selected = toolChain.select(platform2)
+        then:
+        selected.outputFileSuffix == ".o"
+    }
+
+
     def "supplies no additional arguments to target native binary for tool chain default"() {
         when:
         toolSearchPath.locate(_, _) >> tool
         platform.getOperatingSystem() >> DefaultOperatingSystem.TOOL_CHAIN_DEFAULT
         platform.getArchitecture() >> ArchitectureInternal.TOOL_CHAIN_DEFAULT
 
+        ConfigurableToolChain configurableToolChain = newConfigurableToolChain()
         then:
-        with(toolChain.getPlatformConfiguration(platform)) {
-            linkerArgs == []
-            cppCompilerArgs == []
-            CCompilerArgs == []
-            assemblerArgs == []
-            staticLibraryArchiverArgs == []
+
+        with(toolChain.getPlatformConfiguration(platform).apply(configurableToolChain)) {
+            def args = []
+            configurableToolChain.getByName("linker").getArgAction().execute(args)
+            args == []
+            configurableToolChain.getByName("cppCompiler").getArgAction().execute(args)
+            args == []
+            configurableToolChain.getByName("cCompiler").getArgAction().execute(args)
+            args == []
+            configurableToolChain.getByName("assembler").getArgAction().execute(args)
+            args == []
+            configurableToolChain.getByName("staticLibArchiver").getArgAction().execute(args)
+            args == []
+            configurableToolChain.getByName("objcCompiler").getArgAction().execute(args)
+            args == []
         }
     }
 
+
     @Requires(TestPrecondition.NOT_WINDOWS)
     def "supplies args for supported architecture"() {
         when:
@@ -131,18 +208,20 @@ class AbstractGccCompatibleToolChainTest extends Specification {
         platform.architecture >> new DefaultArchitecture(arch, instructionSet, registerSize)
 
         then:
-        toolChain.target(platform).available
+        toolChain.select(platform).available
+
+        with(toolChain.getPlatformConfiguration(platform).apply(newConfigurableToolChain())) {
+            argsFor(getByName("linker")) == [linkerArg]
+
+            argsFor(getByName("cppCompiler")) == [compilerArg]
+            argsFor(getByName("cCompiler")) == [compilerArg]
 
-        with(toolChain.getPlatformConfiguration(platform)) {
-            linkerArgs == [linkerArg]
-            cppCompilerArgs == [compilerArg]
-            CCompilerArgs == [compilerArg]
             if (OperatingSystem.current().isMacOsX()) {
-                assemblerArgs == osxAssemblerArgs
+                argsFor(getByName("assembler")) == osxAssemblerArgs
             } else {
-                assemblerArgs == [assemblerArg]
+                argsFor(getByName("assembler")) == [assemblerArg]
             }
-            staticLibraryArchiverArgs == []
+            argsFor(getByName("staticLibArchiver")) == []
         }
 
         where:
@@ -159,14 +238,14 @@ class AbstractGccCompatibleToolChainTest extends Specification {
         platform.architecture >> new DefaultArchitecture("i386", X86, 32)
 
         then:
-        toolChain.target(platform).available
-
-        with(toolChain.getPlatformConfiguration(platform)) {
-            linkerArgs == ["-m32"]
-            cppCompilerArgs == ["-m32"]
-            CCompilerArgs == ["-m32"]
-            assemblerArgs == ["--32"]
-            staticLibraryArchiverArgs == []
+        toolChain.select(platform).available
+
+        with(toolChain.getPlatformConfiguration(platform).apply(newConfigurableToolChain())) {
+            argsFor(getByName("cppCompiler")) == ["-m32"]
+            argsFor(getByName("cCompiler")) == ["-m32"]
+            argsFor(getByName("linker")) == ["-m32"]
+            argsFor(getByName("assembler")) == ["--32"]
+            argsFor(getByName("staticLibArchiver")) == []
         }
     }
 
@@ -181,7 +260,7 @@ class AbstractGccCompatibleToolChainTest extends Specification {
         platform.architecture >> new DefaultArchitecture("x64", X86, 64)
 
         when:
-        def platformToolChain = toolChain.target(platform)
+        def platformToolChain = toolChain.select(platform)
 
         then:
         !platformToolChain.available
@@ -189,25 +268,44 @@ class AbstractGccCompatibleToolChainTest extends Specification {
     }
 
     def "uses supplied platform configurations in order to target binary"() {
-        def platformConfig1 = Mock(TargetPlatformConfiguration)
-        def platformConfig2 = Mock(TargetPlatformConfiguration)
+        setup:
+        _ * platform.getName() >> "platform2"
+        def platformConfig1 = Mock(Action)
+        def platformConfig2 = Mock(Action)
+
         when:
         toolSearchPath.locate(_, _) >> tool
         platform.getOperatingSystem() >> new DefaultOperatingSystem("other", OperatingSystem.SOLARIS)
+        toolChain.target("platform1", platformConfig1)
+        toolChain.target("platform2", platformConfig2)
 
-        and:
-        toolChain.addPlatformConfiguration(platformConfig1)
-        toolChain.addPlatformConfiguration(platformConfig2)
+        PlatformToolChain platformToolChain = toolChain.select(platform)
+
+        then:
+        platformToolChain.available
 
         and:
-        platformConfig1.supportsPlatform(platform) >> false
-        platformConfig2.supportsPlatform(platform) >> true
+        1 * platformConfig2.execute(_)
+    }
 
-        then:
-        toolChain.target(platform).available
+    def "uses platform specific toolchain configuration"() {
+        given:
+        boolean configurationApplied = false
+        _ * platform.getName() >> "testPlatform"
+        when:
+        toolSearchPath.locate(_, _) >> tool
+        platform.getOperatingSystem() >> new DefaultOperatingSystem("other", OperatingSystem.SOLARIS)
 
         and:
-        toolChain.getPlatformConfiguration(platform) == platformConfig2
+        toolChain.target(platform, new Action<ConfigurableToolChain>() {
+            void execute(ConfigurableToolChain configurableToolChain) {
+                configurationApplied = true;
+            }
+        })
+
+        then:
+        toolChain.select(platform).available
+        configurationApplied
     }
 
     def getMessage(ToolSearchResult result) {
@@ -217,16 +315,14 @@ class AbstractGccCompatibleToolChainTest extends Specification {
     }
 
     static class TestToolChain extends AbstractGccCompatibleToolChain {
-        TestToolChain(String name, FileResolver fileResolver, ExecActionFactory execActionFactory, ToolSearchPath tools) {
-            super(name, OperatingSystem.current(), fileResolver, execActionFactory, tools)
-
-            registerTool(ToolType.CPP_COMPILER, "g++");
-            registerTool(ToolType.C_COMPILER, "gcc");
-            registerTool(ToolType.OBJECTIVECPP_COMPILER, "g++");
-            registerTool(ToolType.OBJECTIVEC_COMPILER, "gcc");
-            registerTool(ToolType.ASSEMBLER, "as");
-            registerTool(ToolType.LINKER, "ld");
-            registerTool(ToolType.STATIC_LIB_ARCHIVER, "ar");
+        TestToolChain(String name, FileResolver fileResolver, ExecActionFactory execActionFactory, ToolSearchPath tools, Instantiator instantiator) {
+            super(name, org.gradle.internal.os.OperatingSystem.current(), fileResolver, execActionFactory, tools, instantiator)
+            add(new DefaultGccCommandLineToolConfiguration("cppCompiler", ToolType.CPP_COMPILER, "g++"));
+            add(new DefaultGccCommandLineToolConfiguration("objcCompiler", ToolType.OBJECTIVEC_COMPILER, "gcc"));
+            add(new DefaultGccCommandLineToolConfiguration("objcppCompiler", ToolType.OBJECTIVECPP_COMPILER, "g++"));
+            add(new DefaultGccCommandLineToolConfiguration("assembler", ToolType.ASSEMBLER, "as"));
+            add(new DefaultGccCommandLineToolConfiguration("linker", ToolType.LINKER, "ld"));
+            add(new DefaultGccCommandLineToolConfiguration("staticLibArchiver", ToolType.STATIC_LIB_ARCHIVER, "ar"));
         }
 
         @Override
@@ -234,4 +330,30 @@ class AbstractGccCompatibleToolChainTest extends Specification {
             return "Test"
         }
     }
+
+
+    ConfigurableToolChain newConfigurableToolChain() {
+        def tools = [:]
+        tools.put("assembler", new DefaultGccCommandLineToolConfiguration("assembler", ToolType.ASSEMBLER, ""))
+        tools.put("cCompiler", new DefaultGccCommandLineToolConfiguration("cCompiler", ToolType.C_COMPILER, ""))
+        tools.put("cppCompiler", new DefaultGccCommandLineToolConfiguration("cppCompiler", ToolType.CPP_COMPILER, ""))
+        tools.put("objcCompiler", new DefaultGccCommandLineToolConfiguration("objcCompiler", ToolType.OBJECTIVEC_COMPILER, ""))
+        tools.put("objcppCompiler", new DefaultGccCommandLineToolConfiguration("objcppCompiler", ToolType.OBJECTIVECPP_COMPILER, ""))
+        tools.put("linker", new DefaultGccCommandLineToolConfiguration("linker", ToolType.LINKER, ""))
+        tools.put("staticLibArchiver", new DefaultGccCommandLineToolConfiguration("staticLibArchiver", ToolType.STATIC_LIB_ARCHIVER, ""))
+
+        ConfigurableToolChain configurableToolChain = new DefaultGccConfigurableToolChain(CommandLineToolConfiguration.class,
+                tools,
+                instantiator,
+                "PlatformTestToolChain",
+                "Platform specific toolchain")
+
+        return configurableToolChain;
+    }
+
+    def argsFor(def tool) {
+        def args = []
+        tool.getArgAction().execute(args)
+        args
+    }
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AssemblerTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AssemblerTest.groovy
index 41292f5c5087..5360e9e739e7 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AssemblerTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/AssemblerTest.groovy
@@ -16,12 +16,11 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc
 
-import org.gradle.api.Action
 import org.gradle.internal.hash.HashUtil
 import org.gradle.nativebinaries.language.assembler.internal.AssembleSpec
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool
-import org.gradle.process.internal.ExecAction
-import org.gradle.process.internal.ExecActionFactory
+import org.gradle.nativebinaries.toolchain.internal.CommandLineToolInvocation
+import org.gradle.nativebinaries.toolchain.internal.MutableCommandLineToolInvocation
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
@@ -30,19 +29,16 @@ class AssemblerTest extends Specification {
     @Rule final TestNameTestDirectoryProvider tmpDirProvider = new TestNameTestDirectoryProvider()
 
     def executable = new File("executable")
-    def execActionFactory = Mock(ExecActionFactory)
-    Action<List<String>> argAction = Mock(Action)
-    CommandLineTool<AssembleSpec> commandLineTool = new CommandLineTool<AssembleSpec>("assembler", executable, execActionFactory)
-    Assembler assembler = new Assembler(commandLineTool, argAction, ".o");
+    def baseInvocation = Mock(CommandLineToolInvocation)
+    def invocation = Mock(MutableCommandLineToolInvocation)
+    def commandLineTool = Mock(CommandLineTool)
+    def assembler = new Assembler(commandLineTool, baseInvocation, ".o");
 
     def "assembles each source file independently"() {
         given:
         def testDir = tmpDirProvider.testDirectory
         def objectFileDir = testDir.file("output/objects")
 
-        def execAction1 = Mock(ExecAction)
-        def execAction2 = Mock(ExecAction)
-
         def sourceOne = testDir.file("one.s")
         def sourceTwo = testDir.file("two.s")
 
@@ -56,23 +52,14 @@ class AssemblerTest extends Specification {
         assembler.execute(assembleSpec)
 
         then:
-        1 * argAction.execute(["-firstArg", "-secondArg", "-o", outputFilePathFor(objectFileDir, sourceOne), sourceOne.absolutePath])
-        1 * execActionFactory.newExecAction() >> execAction1
-        1 * execAction1.executable(executable)
-        1 * execAction1.workingDir(objectFileDir)
-        1 * execAction1.args(["-firstArg", "-secondArg", "-o", outputFilePathFor(objectFileDir, sourceOne), sourceOne.absolutePath])
-        1 * execAction1.environment([:])
-        1 * execAction1.execute()
-        0 * execAction1._
+        1 * baseInvocation.copy() >> invocation
+        1 * invocation.setWorkDirectory(objectFileDir)
+        1 * invocation.setArgs(["-firstArg", "-secondArg", "-o", outputFilePathFor(objectFileDir, sourceOne), sourceOne.absolutePath])
+        1 * commandLineTool.execute(invocation)
 
-        1 * argAction.execute(["-firstArg", "-secondArg", "-o", outputFilePathFor(objectFileDir, sourceTwo), sourceTwo.absolutePath])
-        1 * execActionFactory.newExecAction() >> execAction2
-        1 * execAction2.executable(executable)
-        1 * execAction2.workingDir(objectFileDir)
-        1 * execAction2.args(["-firstArg", "-secondArg", "-o", outputFilePathFor(objectFileDir, sourceTwo), sourceTwo.absolutePath])
-        1 * execAction2.environment([:])
-        1 * execAction2.execute()
-        0 * execAction2._
+        1 * invocation.setArgs(["-firstArg", "-secondArg", "-o", outputFilePathFor(objectFileDir, sourceTwo), sourceTwo.absolutePath])
+        1 * commandLineTool.execute(invocation)
+        0 * _
     }
 
     String outputFilePathFor(File objectFileRoot, File sourceFile) {
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompilerTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompilerTest.groovy
index 7b21b75184d6..200599ea6470 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompilerTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/CCompilerTest.groovy
@@ -16,83 +16,67 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc
 
-import org.gradle.api.Action
-import org.gradle.internal.hash.HashUtil
+import org.gradle.nativebinaries.internal.CompilerOutputFileNamingScheme
 import org.gradle.nativebinaries.language.c.internal.CCompileSpec
-import org.gradle.nativebinaries.language.c.internal.DefaultCCompileSpec
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool
-import org.gradle.process.internal.ExecAction
-import org.gradle.process.internal.ExecActionFactory
+import org.gradle.nativebinaries.toolchain.internal.MutableCommandLineToolInvocation
 import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
 
-import org.gradle.internal.os.OperatingSystem
-
 class CCompilerTest extends Specification {
     @Rule final TestNameTestDirectoryProvider tmpDirProvider = new TestNameTestDirectoryProvider()
 
     def executable = new File("executable")
-    def execActionFactory = Mock(ExecActionFactory)
-    Action<List<String>> argAction = Mock(Action)
-    CommandLineTool<CCompileSpec> commandLineTool = new CommandLineTool<CCompileSpec>("cCompiler", executable, execActionFactory)
-    CCompiler compiler = new CCompiler(commandLineTool, argAction, false);
-    String objectFileExtension = OperatingSystem.current().isWindows() ? ".obj" : ".o";
+    def invocation = Mock(MutableCommandLineToolInvocation)
+    CommandLineTool commandLineTool = Mock(CommandLineTool)
+    String objectFileExtension = ".o";
+    CCompiler compiler = new CCompiler(commandLineTool, invocation, objectFileExtension, false);
 
     def "compiles all source files in separate executions"() {
         given:
         def testDir = tmpDirProvider.testDirectory
         def objectFileDir = testDir.file("output/objects")
 
-        def execAction = Mock(ExecAction)
-
         when:
-        CCompileSpec compileSpec = Spy(DefaultCCompileSpec)
-        compileSpec.getMacros() >> [foo: "bar", empty: null]
-        compileSpec.getObjectFileDir() >> objectFileDir
-        compileSpec.getAllArgs() >> ["-firstArg", "-secondArg"]
-        compileSpec.getIncludeRoots() >> [testDir.file("include.h")]
-        compileSpec.setSourceFiles([testDir.file("one.c"), testDir.file("two.c")])
+        CCompileSpec compileSpec = Stub(CCompileSpec) {
+            getMacros() >> [foo: "bar", empty: null]
+            getObjectFileDir() >> objectFileDir
+            getAllArgs() >> ["-firstArg", "-secondArg"]
+            getIncludeRoots() >> [testDir.file("include.h")]
+            getSourceFiles() >> [testDir.file("one.c"), testDir.file("two.c")]
+        }
 
         and:
         compiler.execute(compileSpec)
 
         then:
-        2 * argAction.execute([
-                "-x", "c",
-                "-Dfoo=bar", "-Dempty",
-                "-firstArg", "-secondArg",
-                "-c",
-                "-I", testDir.file("include.h").absolutePath])
+        1 * invocation.copy() >> invocation
+        1 * invocation.setWorkDirectory(objectFileDir)
 
         ["one.c", "two.c"].each{ sourceFileName ->
 
             TestFile sourceFile = testDir.file(sourceFileName)
-            String objectOutputPath = outputFilePathFor(objectFileDir, sourceFile)
+            File outputFile = outputFile(objectFileDir, sourceFile)
 
-            1 * execAction.args([
+            1 * invocation.setArgs([
                     "-x", "c",
                     "-Dfoo=bar", "-Dempty",
                     "-firstArg", "-secondArg",
                     "-c",
                     "-I", testDir.file("include.h").absolutePath,
                     testDir.file(sourceFileName).absolutePath,
-                    "-o", objectOutputPath])
-
+                    "-o", outputFile.absolutePath])
+            1 * commandLineTool.execute(invocation)
         }
-        2 * execActionFactory.newExecAction() >> execAction
-        2 * execAction.executable(executable)
-        2 * execAction.workingDir(_)
-        2 * execAction.environment([:])
-        2 * execAction.execute()
-        0 * execAction._
-        0 * argAction._
+        0 * _
     }
 
-    String outputFilePathFor(File objectFileRoot, TestFile testFile) {
-        String relativeObjectFilePath = "${HashUtil.createCompactMD5(testFile.absolutePath)}/${testFile.name - ".c"}$objectFileExtension"
-        String outputFilePath = new File(objectFileRoot, relativeObjectFilePath).absolutePath;
-        outputFilePath
+    File outputFile(File outputRoot, TestFile inputFile) {
+        return new CompilerOutputFileNamingScheme()
+                .withOutputBaseFolder(outputRoot)
+                .withObjectFileNameSuffix(objectFileExtension)
+                .map(inputFile)
     }
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ClangToolChainTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ClangToolChainTest.groovy
index b2ef9a00e7f0..d060c2602257 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ClangToolChainTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/ClangToolChainTest.groovy
@@ -18,31 +18,37 @@ package org.gradle.nativebinaries.toolchain.internal.gcc
 
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.internal.os.OperatingSystem
+import org.gradle.internal.reflect.Instantiator
 import org.gradle.nativebinaries.toolchain.internal.clang.ClangToolChain
 import org.gradle.process.internal.ExecActionFactory
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
+import spock.lang.Unroll
 
 class ClangToolChainTest extends Specification {
     @Rule final TestNameTestDirectoryProvider tmpDirProvider = new TestNameTestDirectoryProvider()
     final FileResolver fileResolver = Mock(FileResolver)
-    final toolChain = new ClangToolChain("clang", OperatingSystem.current(), fileResolver, Stub(ExecActionFactory))
+    final Instantiator instantiator = Mock(Instantiator)
+    final toolChain = new ClangToolChain("clang", OperatingSystem.current(), fileResolver, Stub(ExecActionFactory), instantiator)
 
-    def "has default tool names"() {
+    @Unroll
+    def "has default #tool registered using #name"() {
         expect:
-        toolChain.cppCompiler.executable == "clang++"
-        toolChain.cCompiler.executable == "clang"
-        toolChain.assembler.executable == "as"
-        toolChain.linker.executable == "clang++"
-        toolChain.staticLibArchiver.executable == "ar"
+        toolChain.getByName(tool).executable == executable
+        where:
+        tool                | executable
+        "cCompiler"         | "clang"
+        "cppCompiler"       | "clang++"
+        "linker"            | "clang++"
+        "staticLibArchiver" | "ar"
     }
 
     def "can update tool names"() {
         when:
-        toolChain.assembler.executable = "foo"
+        toolChain.getByName("cCompiler").executable = "foo"
 
         then:
-        toolChain.assembler.executable == "foo"
+        toolChain.getByName("cCompiler").executable == "foo"
     }
 }
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinkerTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinkerTest.groovy
index 71a7bfd7099b..5ee9db1bf7a1 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinkerTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccLinkerTest.groovy
@@ -16,13 +16,11 @@
 
 package org.gradle.nativebinaries.toolchain.internal.gcc
 
-import org.gradle.api.Action
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.nativebinaries.internal.LinkerSpec
 import org.gradle.nativebinaries.internal.SharedLibraryLinkerSpec
 import org.gradle.nativebinaries.toolchain.internal.CommandLineTool
-import org.gradle.process.internal.ExecAction
-import org.gradle.process.internal.ExecActionFactory
+import org.gradle.nativebinaries.toolchain.internal.MutableCommandLineToolInvocation
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
@@ -31,17 +29,15 @@ class GccLinkerTest extends Specification {
     @Rule final TestNameTestDirectoryProvider tmpDirProvider = new TestNameTestDirectoryProvider()
 
     def executable = new File("executable")
-    def execActionFactory = Mock(ExecActionFactory)
-    Action<List<String>> argAction = Mock(Action)
-    CommandLineTool<LinkerSpec> commandLineTool = new CommandLineTool<LinkerSpec>("linker", executable, execActionFactory)
-    GccLinker linker = new GccLinker(commandLineTool, argAction, false);
+    def invocation = Mock(MutableCommandLineToolInvocation)
+    CommandLineTool commandLineTool = Mock(CommandLineTool)
+    GccLinker linker = new GccLinker(commandLineTool, invocation, false);
 
     def "compiles all source files in a single execution"() {
         given:
         def testDir = tmpDirProvider.testDirectory
         def outputFile = testDir.file("output/lib")
 
-        def execAction = Mock(ExecAction)
         final expectedArgs = [
                 "-sys1", "-sys2",
                 "-shared",
@@ -65,13 +61,10 @@ class GccLinkerTest extends Specification {
         linker.execute(spec)
 
         then:
-        1 * argAction.execute(expectedArgs)
-        1 * execActionFactory.newExecAction() >> execAction
-        1 * execAction.executable(executable)
-        1 * execAction.args(expectedArgs)
-        1 * execAction.environment([:])
-        1 * execAction.execute()
-        0 * execAction._
+        1 * invocation.copy() >> invocation
+        1 * invocation.setArgs(expectedArgs)
+        1 * commandLineTool.execute(invocation)
+        0 * _
     }
 
     List<String> getSoNameProp(def value) {
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChainTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChainTest.groovy
index e250b94234ff..db5313085eee 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChainTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/gcc/GccToolChainTest.groovy
@@ -18,36 +18,42 @@ package org.gradle.nativebinaries.toolchain.internal.gcc
 
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.internal.os.OperatingSystem
+import org.gradle.internal.reflect.Instantiator
 import org.gradle.process.internal.ExecActionFactory
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
+import spock.lang.Unroll
 
 class GccToolChainTest extends Specification {
     @Rule final TestNameTestDirectoryProvider tmpDirProvider = new TestNameTestDirectoryProvider()
     final FileResolver fileResolver = Mock(FileResolver)
-    final toolChain = new GccToolChain("gcc", OperatingSystem.current(), fileResolver, Stub(ExecActionFactory))
+    Instantiator instantiator = Mock(Instantiator)
+
+    final toolChain = new GccToolChain(instantiator , "gcc", OperatingSystem.current(), fileResolver, Stub(ExecActionFactory))
 
     def "uses shared library binary at link time"() {
         expect:
         toolChain.getSharedLibraryLinkFileName("test") == toolChain.getSharedLibraryName("test")
     }
 
-    def "has default tool names"() {
+    @Unroll
+    def "has default #tool registered"() {
         expect:
-        toolChain.cppCompiler.executable == "g++"
-        toolChain.cCompiler.executable == "gcc"
-        toolChain.assembler.executable == "as"
-        toolChain.linker.executable == "g++"
-        toolChain.staticLibArchiver.executable == "ar"
+        toolChain.getByName(tool).executable == executable
+        where:
+        tool                | executable
+        "cCompiler"         | "gcc"
+        "cppCompiler"       | "g++"
+        "linker"            | "g++"
+        "staticLibArchiver" | "ar"
     }
 
     def "can update tool names"() {
         when:
-        toolChain.assembler.executable = "foo"
-
+        toolChain.getByName("cCompiler").executable = "foo"
         then:
-        toolChain.assembler.executable == "foo"
+        toolChain.getByName("cCompiler").executable == "foo"
     }
 
     def "resolves path entries"() {
diff --git a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChainTest.groovy b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChainTest.groovy
index d926cf1f5f90..8e4dd04583e1 100644
--- a/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChainTest.groovy
+++ b/subprojects/cpp/src/test/groovy/org/gradle/nativebinaries/toolchain/internal/msvcpp/VisualCppToolChainTest.groovy
@@ -18,6 +18,7 @@ package org.gradle.nativebinaries.toolchain.internal.msvcpp
 
 import org.gradle.api.internal.file.FileResolver
 import org.gradle.internal.os.OperatingSystem
+import org.gradle.internal.reflect.Instantiator
 import org.gradle.internal.text.TreeFormatter
 import org.gradle.nativebinaries.platform.Platform
 import org.gradle.nativebinaries.toolchain.internal.ToolChainAvailability
@@ -27,6 +28,7 @@ import org.gradle.test.fixtures.file.TestDirectoryProvider
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.TreeVisitor
 import spock.lang.Specification
+import spock.lang.Unroll
 
 class VisualCppToolChainTest extends Specification {
     TestDirectoryProvider testDirectoryProvider = new TestNameTestDirectoryProvider()
@@ -34,6 +36,7 @@ class VisualCppToolChainTest extends Specification {
     final ExecActionFactory execActionFactory = Mock(ExecActionFactory)
     final VisualStudioLocator.SearchResult visualStudioLookup = Stub(VisualStudioLocator.SearchResult)
     final WindowsSdkLocator.SearchResult windowsSdkLookup = Stub(WindowsSdkLocator.SearchResult)
+    final Instantiator instantiator = Mock(Instantiator)
     final VisualStudioLocator visualStudioLocator = Stub(VisualStudioLocator) {
         locateVisualStudioInstalls(_) >> visualStudioLookup
     }
@@ -43,7 +46,7 @@ class VisualCppToolChainTest extends Specification {
     final OperatingSystem operatingSystem = Stub(OperatingSystem) {
         isWindows() >> true
     }
-    final toolChain = new VisualCppToolChain("visualCpp", operatingSystem, fileResolver, execActionFactory, visualStudioLocator, windowsSdkLocator)
+    final toolChain = new VisualCppToolChain("visualCpp", operatingSystem, fileResolver, execActionFactory, visualStudioLocator, windowsSdkLocator, instantiator)
 
     def "uses .lib file for shared library at link time"() {
         given:
@@ -65,7 +68,7 @@ class VisualCppToolChainTest extends Specification {
         given:
         def operatingSystem = Stub(OperatingSystem)
         operatingSystem.isWindows() >> false
-        def toolChain = new VisualCppToolChain("visualCpp", operatingSystem, fileResolver, execActionFactory, visualStudioLocator, windowsSdkLocator)
+        def toolChain = new VisualCppToolChain("visualCpp", operatingSystem, fileResolver, execActionFactory, visualStudioLocator, windowsSdkLocator, instantiator)
 
         when:
         def availability = new ToolChainAvailability()
@@ -83,7 +86,7 @@ class VisualCppToolChainTest extends Specification {
         windowsSdkLookup.available >> false
 
         and:
-        def result = toolChain.target(Stub(Platform))
+        def result = toolChain.select(Stub(Platform))
 
         then:
         !result.available
@@ -98,7 +101,7 @@ class VisualCppToolChainTest extends Specification {
         windowsSdkLookup.explain(_) >> { TreeVisitor<String> visitor -> visitor.node("sdk not found anywhere") }
 
         and:
-        def result = toolChain.target(Stub(Platform))
+        def result = toolChain.select(Stub(Platform))
 
         then:
         !result.available
@@ -118,7 +121,7 @@ class VisualCppToolChainTest extends Specification {
         visualCpp.isSupportedPlatform(platform) >> false
 
         and:
-        def result = toolChain.target(platform)
+        def result = toolChain.select(platform)
 
         then:
         !result.available
@@ -138,7 +141,7 @@ class VisualCppToolChainTest extends Specification {
         visualCpp.isSupportedPlatform(platform) >> true
 
         and:
-        def platformToolChain = toolChain.target(platform)
+        def platformToolChain = toolChain.select(platform)
 
         then:
         platformToolChain.available
@@ -190,6 +193,41 @@ class VisualCppToolChainTest extends Specification {
         toolChain.windowsSdkDir == file("one")
     }
 
+    @Unroll
+    def "registers default #toolConfigurationName"() {
+        expect:
+        toolChain.getByName(toolConfigurationName)
+        where:
+        toolConfigurationName << ["cCompiler", "cppCompiler", "linker", "staticLibArchiver"]
+    }
+
+    def "can configure args for commandlineTool"() {
+        setup:
+        def commandLineArgs = ["given", "args"]
+
+        def visualStudio = Stub(VisualStudioInstall)
+        def visualCpp = Stub(VisualCppInstall)
+        def platform = Stub(Platform)
+        visualStudioLookup.available >> true
+        windowsSdkLookup.available >> true
+        visualStudioLookup.visualStudio >> visualStudio
+        visualStudioLookup.visualStudio >> Stub(VisualStudioInstall)
+        visualStudio.visualCpp >> visualCpp
+        visualCpp.isSupportedPlatform(platform) >> true
+
+        when:
+        toolChain.getByName(toolConfigurationName).withArguments { args -> args.addAll(["custom", "args"])}
+        def  platformToolChain = toolChain.select(platform)
+        def commandLineToolConfigurationInternal = platformToolChain.commandLineToolConfigurations.get(toolConfigurationName)
+        commandLineToolConfigurationInternal.getArgAction().execute(commandLineArgs)
+
+        then:
+        commandLineArgs == ["given", "args", "custom", "args"]
+
+        where:
+        toolConfigurationName << ["cCompiler", "cppCompiler", "linker", "staticLibArchiver"]
+    }
+
     def file(String name) {
         testDirectoryProvider.testDirectory.file(name)
     }
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AvailableToolChains.java b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AvailableToolChains.java
index d7bec4169a2f..34b888ccfa63 100755
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AvailableToolChains.java
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/AvailableToolChains.java
@@ -47,20 +47,6 @@
 import java.util.List;
 
 public class AvailableToolChains {
-    /**
-     * @return A list of all tool chains installed on the system, with the default tool chain listed first (if installed).
-     */
-    public static List<InstalledToolChain> getAvailableToolChains() {
-        List<ToolChainCandidate> allToolChains = getToolChains();
-        List<InstalledToolChain> installedToolChains = new ArrayList<InstalledToolChain>();
-        for (ToolChainCandidate candidate : allToolChains) {
-            if (candidate.isAvailable()) {
-                installedToolChains.add((InstalledToolChain) candidate);
-            }
-        }
-        return installedToolChains;
-    }
-
     /**
      * @return The tool chain with the given name.
      */
@@ -87,10 +73,7 @@ public static List<ToolChainCandidate> getToolChains() {
             compilers.add(findGcc("4", null));
 
             // Clang must be on the path
-            // TODO:ADAM Also check on windows
             compilers.add(findClang());
-
-            // TODO:DAZ Make a GCC3 install available for testing
         }
         return compilers;
     }
@@ -440,7 +423,7 @@ public InstalledClang() {
 
         @Override
         public boolean meets(ToolChainRequirement requirement) {
-            return requirement == ToolChainRequirement.GccCompatible || requirement == ToolChainRequirement.Available;
+            return requirement == ToolChainRequirement.Clang || requirement == ToolChainRequirement.GccCompatible || requirement == ToolChainRequirement.Available;
         }
 
         @Override
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/ToolChainRequirement.java b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/ToolChainRequirement.java
index 525019938717..a6a74f3f7386 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/ToolChainRequirement.java
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/ToolChainRequirement.java
@@ -26,5 +26,7 @@ public enum ToolChainRequirement {
     // Any available GCC implementation (including mingw, cygwin, but not clang)
     Gcc,
     // Any available GCC compatible implementation (including mingw, cygwin, and clang)
-    GccCompatible
+    GccCompatible,
+    // Any available Clang
+    Clang
 }
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppHelloWorldApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppHelloWorldApp.groovy
index c0398a443acc..abcfb4e79897 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppHelloWorldApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/CppHelloWorldApp.groovy
@@ -25,7 +25,8 @@ class CppHelloWorldApp extends IncrementalHelloWorldApp {
             #include "hello.h"
 
             int main () {
-              sayHello();
+              Greeter greeter;
+              greeter.sayHello();
               std::cout << sum(5, 7);
               return 0;
             }
@@ -38,7 +39,8 @@ class CppHelloWorldApp extends IncrementalHelloWorldApp {
             #include "hello.h"
 
             int main () {
-              sayHello();
+              Greeter greeter;
+              greeter.sayHello();
               return 0;
             }
         """)
@@ -55,7 +57,11 @@ class CppHelloWorldApp extends IncrementalHelloWorldApp {
             #define DLL_FUNC
             #endif
 
-            void DLL_FUNC sayHello();
+            class Greeter {
+                public:
+                void DLL_FUNC sayHello();
+            };
+
             int DLL_FUNC sum(int a, int b);
         """);
     }
@@ -71,7 +77,7 @@ class CppHelloWorldApp extends IncrementalHelloWorldApp {
             }
             #endif
 
-            void DLL_FUNC sayHello() {
+            void DLL_FUNC Greeter::sayHello() {
                 #ifdef FRENCH
                 std::cout << greeting() << std::endl;
                 #else
@@ -93,7 +99,7 @@ class CppHelloWorldApp extends IncrementalHelloWorldApp {
             #include <iostream>
             #include "hello.h"
 
-            void DLL_FUNC sayHello() {
+            void DLL_FUNC Greeter::sayHello() {
                 std::cout << "[${HELLO_WORLD} - ${HELLO_WORLD_FRENCH}]" << std::endl;
             }
 
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateMixedSameBaseNamesTestApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateMixedSameBaseNamesTestApp.groovy
index 3d8c6f335d25..adb5e888aecd 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateMixedSameBaseNamesTestApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateMixedSameBaseNamesTestApp.groovy
@@ -31,6 +31,8 @@ public class DuplicateMixedSameBaseNamesTestApp extends TestComponent {
 
     def plugins = ["assembler", "c", "cpp"]
 
+    def functionalSourceSets = [asm:'**/*.s', c:'**/*.c', cpp:'**/*.cpp']
+
     @Override
     public List<SourceFile> getSourceFiles() {
         [sourceFile("c", "main.c", """
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCBaseNamesTestApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCBaseNamesTestApp.groovy
index 5fc23723bac8..7ed825059ca3 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCBaseNamesTestApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCBaseNamesTestApp.groovy
@@ -16,8 +16,6 @@
 
 package org.gradle.nativebinaries.language.cpp.fixtures.app
 
-import org.gradle.internal.os.OperatingSystem
-
 class DuplicateObjectiveCBaseNamesTestApp extends TestComponent{
 
     def plugins = ["objective-c"]
@@ -39,18 +37,14 @@ class DuplicateObjectiveCBaseNamesTestApp extends TestComponent{
     }
 
     public String getExtraConfiguration() {
-        def linkerArgs = OperatingSystem.current().isMacOsX() ? '"-framework", "Foundation"' : '"-lgnustep-base", "-lobjc"'
         return """
             binaries.all {
-                if (toolChain in Gcc) {
-                    objcCompiler.args "-I/usr/include/GNUstep", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
-                }
-
-                if (toolChain in Clang) {
+                if (targetPlatform.operatingSystem.macOsX) {
+                    linker.args "-framework", "Foundation"
+                } else {
                     objcCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
+                    linker.args "-lgnustep-base", "-lobjc"
                 }
-
-                linker.args $linkerArgs
             }
         """
     }
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCppBaseNamesTestApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCppBaseNamesTestApp.groovy
index d8be9c2a118e..084f279a8d8e 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCppBaseNamesTestApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateObjectiveCppBaseNamesTestApp.groovy
@@ -16,8 +16,6 @@
 
 package org.gradle.nativebinaries.language.cpp.fixtures.app
 
-import org.gradle.internal.os.OperatingSystem
-
 class DuplicateObjectiveCppBaseNamesTestApp extends TestComponent{
     def plugins = ["objective-cpp"]
     @Override
@@ -69,11 +67,14 @@ class DuplicateObjectiveCppBaseNamesTestApp extends TestComponent{
     }
 
     public String getExtraConfiguration() {
-        def linkerArgs = OperatingSystem.current().isMacOsX() ? '"-framework", "Foundation"' : '"-lgnustep-base", "-lobjc"'
         return """
             binaries.all {
-                objcppCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
-                linker.args $linkerArgs
+                if (targetPlatform.operatingSystem.macOsX) {
+                    linker.args "-framework", "Foundation"
+                } else {
+                    objcppCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
+                    linker.args "-lgnustep-base", "-lobjc"
+                }
             }
         """
     }
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateWindowsResourcesBaseNamesTestApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateWindowsResourcesBaseNamesTestApp.groovy
index 8d7d3b4f172b..a8dfc9341705 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateWindowsResourcesBaseNamesTestApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/DuplicateWindowsResourcesBaseNamesTestApp.groovy
@@ -45,7 +45,7 @@ std::string LoadStringFromResource(UINT stringID)
     return std::string(wide.begin(), wide.end());
 }
 
-void DLL_FUNC hello() {
+void hello() {
     std::string foo1 = LoadStringFromResource(IDS_FOO1);
     std::string foo2 = LoadStringFromResource(IDS_FOO2);
     std::cout << foo1;
@@ -77,15 +77,7 @@ STRINGTABLE
 #define IDS_FOO1    111
 #define IDS_FOO2    1000
 
-#ifdef DLL_EXPORT
-#define DLL_FUNC __declspec(dllexport)
-#define MODULE_HANDLE GetModuleHandle("hello")
-#else
-#define DLL_FUNC
-#define MODULE_HANDLE null
-#endif
-
-void DLL_FUNC hello();
+void hello();
 """)]
     }
 }
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedLanguageHelloWorldApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedLanguageHelloWorldApp.groovy
index 914ca88f1ed8..a470d55b5e70 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedLanguageHelloWorldApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedLanguageHelloWorldApp.groovy
@@ -130,7 +130,6 @@ _sumx:
     ret
 '''
 
-    // TODO:DAZ test 64 bit assembler generation (on all tool chains)
     private static String x64GnuAsmSource = '''
     .text
     .p2align 4,,15
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedObjectiveCHelloWorldApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedObjectiveCHelloWorldApp.groovy
index 865d7374179c..428f408cd3f5 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedObjectiveCHelloWorldApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/MixedObjectiveCHelloWorldApp.groovy
@@ -16,20 +16,20 @@
 
 package org.gradle.nativebinaries.language.cpp.fixtures.app
 
-import org.gradle.internal.os.OperatingSystem
-
 class MixedObjectiveCHelloWorldApp extends HelloWorldApp {
 
     List pluginList = ["objective-c", "objective-cpp", "c", "cpp"]
 
     public String getExtraConfiguration() {
-        def linkerArgs = OperatingSystem.current().isMacOsX() ? '"-framework", "Foundation"' : '"-lgnustep-base", "-lobjc"'
         return """
             binaries.all {
-                [objcCompiler, objcppCompiler].each{compiler ->
-                    compiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
+                if (targetPlatform.operatingSystem.macOsX) {
+                    linker.args "-framework", "Foundation"
+                } else {
+                    objcCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
+                    objcppCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
+                    linker.args "-lgnustep-base", "-lobjc"
                 }
-                linker.args $linkerArgs
             }
         """
     }
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCHelloWorldApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCHelloWorldApp.groovy
index a1a8cf2cb038..183697470898 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCHelloWorldApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCHelloWorldApp.groovy
@@ -16,20 +16,19 @@
 
 package org.gradle.nativebinaries.language.cpp.fixtures.app
 
-import org.gradle.internal.os.OperatingSystem
-
 class ObjectiveCHelloWorldApp extends IncrementalHelloWorldApp {
 
     @Override
     SourceFile getMainSource() {
         return sourceFile("objc", "main.m", """
             // Simple hello world app
-            #import <Foundation/Foundation.h>
             #include "hello.h"
 
-            int main (int argc, const char * argv[])
+            int main(int argc, const char * argv[])
             {
-                sayHello();
+                Greeter* greeter = [Greeter new];
+                [greeter sayHello];
+                [greeter release];
                 printf("%d", sum(7, 5));
                 return 0;
             }
@@ -39,12 +38,13 @@ class ObjectiveCHelloWorldApp extends IncrementalHelloWorldApp {
     @Override
     SourceFile getAlternateMainSource() {
         return sourceFile("objc", "main.m", """
-            #import <Foundation/Foundation.h>
             #import "hello.h"
 
             int main (int argc, const char * argv[])
             {
-                sayHello();
+                Greeter* greeter = [Greeter new];
+                [greeter sayHello];
+                [greeter release];
                 return 0;
             }
         """);
@@ -52,13 +52,16 @@ class ObjectiveCHelloWorldApp extends IncrementalHelloWorldApp {
 
     String alternateOutput = "$HELLO_WORLD\n"
 
-
     @Override
     SourceFile getLibraryHeader() {
         return sourceFile("headers", "hello.h", """
-            int main (int argc, const char * argv[]);
+            #import <Foundation/Foundation.h>
+
+            @interface Greeter : NSObject
+                - (void)sayHello;
+            @end
+
             int sum(int a, int b);
-            void sayHello();
         """);
     }
 
@@ -66,19 +69,17 @@ class ObjectiveCHelloWorldApp extends IncrementalHelloWorldApp {
     List<SourceFile> getLibrarySources() {
         return [
                 sourceFile("objc", "hello.m", """
-            #import <Foundation/Foundation.h>
             #import "hello.h"
 
-            void sayHello()
-            {
-                NSString *helloWorld = @"${HELLO_WORLD}\\n";
+            @implementation Greeter
+            - (void) sayHello {
+                NSString *helloWorld = @"${HELLO_WORLD}";
                 #ifdef FRENCH
-                helloWorld = @"${HELLO_WORLD_FRENCH}\\n";
+                helloWorld = @"${HELLO_WORLD_FRENCH}";
                 #endif
-                NSFileHandle *stdout = [NSFileHandle fileHandleWithStandardOutput];
-                NSData *strData = [helloWorld dataUsingEncoding: NSASCIIStringEncoding];
-                [stdout writeData: strData];
+                fprintf(stdout, "%s\\n", [helloWorld UTF8String]);
             }
+            @end
         """),
                 sourceFile("objc", "sum.m", """
             #import "hello.h"
@@ -94,16 +95,14 @@ class ObjectiveCHelloWorldApp extends IncrementalHelloWorldApp {
     List<SourceFile> getAlternateLibrarySources() {
         return [
                 sourceFile("objc", "hello.m", """
-            #import <Foundation/Foundation.h>
             #import "hello.h"
 
-            void sayHello()
-            {
-                NSString *helloWorld = @"${HELLO_WORLD} - ${HELLO_WORLD_FRENCH}\\n";
-                NSFileHandle *stdout = [NSFileHandle fileHandleWithStandardOutput];
-                NSData *strData = [helloWorld dataUsingEncoding: NSASCIIStringEncoding];
-                [stdout writeData: strData];
+            @implementation Greeter
+            - (void) sayHello {
+                NSString *helloWorld = @"${HELLO_WORLD} - ${HELLO_WORLD_FRENCH}";
+                fprintf(stdout, "%s\\n", [helloWorld UTF8String]);
             }
+            @end
 
             // Extra function to ensure library has different size
             int anotherFunction() {
@@ -123,11 +122,14 @@ class ObjectiveCHelloWorldApp extends IncrementalHelloWorldApp {
     String alternateLibraryOutput = "${HELLO_WORLD} - ${HELLO_WORLD_FRENCH}\n12"
 
     public String getExtraConfiguration() {
-        def linkerArgs = OperatingSystem.current().isMacOsX() ? '"-framework", "Foundation"' : '"-lgnustep-base", "-lobjc"'
         return """
             binaries.all {
-                objcCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
-                linker.args $linkerArgs
+                if (targetPlatform.operatingSystem.macOsX) {
+                    linker.args "-framework", "Foundation"
+                } else {
+                    objcCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
+                    linker.args "-lgnustep-base", "-lobjc"
+                }
             }
         """
     }
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCppHelloWorldApp.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCppHelloWorldApp.groovy
index 2ceb795f0028..48cd80423af5 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCppHelloWorldApp.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/language/cpp/fixtures/app/ObjectiveCppHelloWorldApp.groovy
@@ -16,9 +16,6 @@
 
 package org.gradle.nativebinaries.language.cpp.fixtures.app
 
-import org.gradle.internal.os.OperatingSystem
-
-
 class ObjectiveCppHelloWorldApp extends IncrementalHelloWorldApp {
     @Override
     SourceFile getMainSource() {
@@ -131,14 +128,18 @@ class ObjectiveCppHelloWorldApp extends IncrementalHelloWorldApp {
     String alternateLibraryOutput = "${HELLO_WORLD} - ${HELLO_WORLD_FRENCH}\n12"
 
     public String getExtraConfiguration() {
-        def linkerArgs = OperatingSystem.current().isMacOsX() ? '"-framework", "Foundation"' : '"-lgnustep-base", "-lobjc"'
         return """
             binaries.all {
-                objcppCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
-                linker.args $linkerArgs
+                if (targetPlatform.operatingSystem.macOsX) {
+                    linker.args "-framework", "Foundation"
+                } else {
+                    objcppCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
+                    linker.args "-lgnustep-base", "-lobjc"
+                }
             }
         """
     }
+
     @Override
     List<String> getPluginList() {
         ['objective-cpp']
diff --git a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestResults.groovy b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestResults.groovy
index ce4f3a3f450d..0469403cb6c8 100644
--- a/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestResults.groovy
+++ b/subprojects/cpp/src/testFixtures/groovy/org/gradle/nativebinaries/test/cunit/CUnitTestResults.groovy
@@ -29,6 +29,7 @@ class CUnitTestResults {
         final XmlParser parser = new XmlParser(false, false)
         parser.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
         parser.setFeature("http://xml.org/sax/features/namespaces", false)
+        parser.setFeature("http://apache.org/xml/features/disallow-doctype-decl", false)
         this.resultsNode = parser.parse(testResultsFile)
 
         suiteNames.each { String name ->
diff --git a/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTaskIntegrationTest.groovy b/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTaskIntegrationTest.groovy
index 6624d9b3e06b..0c121878ba9d 100644
--- a/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTaskIntegrationTest.groovy
+++ b/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTaskIntegrationTest.groovy
@@ -909,7 +909,8 @@ org:leaf2:1.0
         output.contains(toPlatformLineSeparators("""
 project :
 \\--- project :impl
-     \\--- project : (*)"""))
+     \\--- project : (*)
+"""))
     }
 
     def "selects a module component dependency with a given name"() {
@@ -1083,6 +1084,54 @@ org:leaf4:1.0
 project :api
 \\--- project :impl
      \\--- compile
+"""))
+    }
+
+    def "renders tree with a mix of project and external dependencies"() {
+        given:
+        mavenRepo.module("org", "leaf1").dependsOn("leaf2").publish()
+        mavenRepo.module("org", "leaf2").dependsOn("leaf3").publish()
+        mavenRepo.module("org", "leaf3").publish()
+
+        file("settings.gradle") << "include 'api', 'impl'; rootProject.name='root'"
+
+        file("build.gradle") << """
+            allprojects {
+                apply plugin: 'java'
+                group = 'org.foo'
+                version = '1.0-SNAPSHOT'
+                repositories {
+                    maven { url "${mavenRepo.uri}" }
+                }
+            }
+            dependencies {
+                compile project(':impl')
+            }
+            project(':api') {
+                dependencies {
+                    compile 'org:leaf2:1.0'
+                }
+            }
+            project(':impl') {
+                dependencies {
+                    compile project(':api')
+                    compile 'org:leaf1:1.0'
+                }
+            }
+        """
+
+        when:
+        run "dependencyInsight", "--dependency", "leaf3"
+
+        then:
+        output.contains(toPlatformLineSeparators("""
+org:leaf3:1.0
+\\--- org:leaf2:1.0
+     +--- project :api
+     |    \\--- project :impl
+     |         \\--- compile
+     \\--- org:leaf1:1.0
+          \\--- project :impl (*)
 """))
     }
 }
diff --git a/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyReportTaskIntegrationTest.groovy b/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyReportTaskIntegrationTest.groovy
index 48d38c4b276b..da57d881d42b 100644
--- a/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyReportTaskIntegrationTest.groovy
+++ b/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/DependencyReportTaskIntegrationTest.groovy
@@ -28,34 +28,39 @@ class DependencyReportTaskIntegrationTest extends AbstractIntegrationSpec {
         given:
         file("settings.gradle") << "include 'client', 'a', 'b', 'c'"
 
-        [a: "b", b: "c", c: "a"].each { module, dep ->
-            def upped = module.toUpperCase()
-            file(module, "build.gradle") << """
-                apply plugin: 'java'
-                group = "group"
-                version = 1.0
-
-                dependencies {
-                    compile project(":$dep")
-                }
-            """
-            file(module, "src", "main", "java", "${upped}.java") << "public class $upped {}"
-        }
+        buildFile << """
+allprojects {
+    configurations { compile; "default" { extendsFrom compile } }
+    group = "group"
+    version = 1.0
+}
+
+project(":a") {
+    dependencies { compile project(":b") }
+    dependencies { compile project(":c") }
+}
+
+project(":b") {
+    dependencies { compile project(":c") }
+}
+
+project(":c") {
+    dependencies { compile project(":a") }
+}
+"""
 
-        and:
-        file("client", "build.gradle") << """
-            apply plugin: 'java'
-            
-            dependencies {
-                compile project(":a")
-            }
-        """
-        
         when:
-        run ":client:dependencies"
-        
+        run ":c:dependencies"
+
         then:
-        output.contains "(*) - dependencies omitted (listed previously)"
+        output.contains(toPlatformLineSeparators("""
+compile
+\\--- project :a
+     +--- project :b
+     |    \\--- project :c (*)
+     \\--- project :c (*)
+"""))
+        output.contains '(*) - dependencies omitted (listed previously)'
     }
 
     def "marks modules that can't be resolved as 'FAILED'"() {
@@ -325,6 +330,7 @@ rootProject.name = 'root'
 
         then:
         output.contains(toPlatformLineSeparators("""
+conf
 \\--- org:toplevel:1.0
      +--- org:middle1:1.0
      |    +--- org:leaf1:1.0
@@ -366,6 +372,7 @@ rootProject.name = 'root'
 
         then:
         output.contains(toPlatformLineSeparators("""
+conf
 +--- bar:bar:5.0 -> 6.0
 |    \\--- foo:foo:3.0
 +--- bar:bar:6.0 (*)
@@ -402,6 +409,7 @@ rootProject.name = 'root'
 
         then:
         output.contains(toPlatformLineSeparators("""
+conf
 +--- foo:foo:1+ -> 2.5
 |    \\--- foo:bar:2.0
 \\--- foo:foo:2+ -> 2.5 (*)
@@ -436,7 +444,11 @@ rootProject.name = 'root'
         run ":dependencies"
 
         then:
-        output.contains "org:child:1.0"
+        output.contains(toPlatformLineSeparators("""
+conf
+\\--- org:parent:1.0
+     \\--- org:child:1.0
+"""))
     }
 
     def "renders the ivy tree with conflicts"() {
@@ -471,6 +483,7 @@ rootProject.name = 'root'
 
         then:
         output.contains(toPlatformLineSeparators("""
+conf
 +--- org:toplevel:1.0
 |    +--- org:middle1:1.0
 |    |    +--- org:leaf1:1.0
@@ -481,6 +494,7 @@ rootProject.name = 'root'
 \\--- org:leaf4:2.0
 """))
     }
+
     def "tells if there are no dependencies"() {
         given:
         buildFile << "configurations { foo }"
@@ -489,7 +503,10 @@ rootProject.name = 'root'
         run "dependencies"
 
         then:
-        output.contains "No dependencies"
+        output.contains(toPlatformLineSeparators("""
+foo
+No dependencies
+"""))
     }
 
     def "tells if there are no configurations"() {
@@ -585,7 +602,8 @@ conf2
         run "dependencies"
 
         then:
-        output.contains(toPlatformLineSeparators("""conf
+        output.contains(toPlatformLineSeparators("""
+conf
 \\--- org.utils:impl:1.3 FAILED
 """))
     }
@@ -650,6 +668,7 @@ rootProject.name = 'root'
         output.contains "compile - Compile classpath for source set 'main'."
 
         output.contains(toPlatformLineSeparators("""
+compile - Compile classpath for source set 'main'.
 +--- project :a
 |    \\--- foo:bar:1.0 -> 2.0
 +--- project :b
diff --git a/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest.groovy b/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest.groovy
index 693fcf3cdfd7..171111b09073 100644
--- a/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest.groovy
+++ b/subprojects/diagnostics/src/integTest/groovy/org/gradle/api/tasks/diagnostics/HelpTaskIntegrationTest.groovy
@@ -44,7 +44,6 @@ Options
 Description
      Displays all dependencies declared in root project '${testDirectory.getName()}'.
 
-
 BUILD SUCCESSFUL"""))
     }
 
@@ -62,12 +61,11 @@ Type
      Help (org.gradle.configuration.Help)
 
 Options
-     --task     The task, detailed help is requested for.
+     --task     The task to show help for.
 
 Description
      Displays a help message
 
-
 BUILD SUCCESSFUL"""))
     }
 
@@ -123,7 +121,6 @@ Type
 Description
      Assembles a jar archive containing the main classes.
 
-
 BUILD SUCCESSFUL"""))
 
         when:
@@ -141,7 +138,6 @@ Type
 Description
      Assembles a jar archive containing the main classes.
 
-
 BUILD SUCCESSFUL"""))
 
     }
diff --git a/subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/HtmlDependencyReportTask.java b/subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/HtmlDependencyReportTask.java
index 864654c336c0..635179332049 100644
--- a/subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/HtmlDependencyReportTask.java
+++ b/subprojects/diagnostics/src/main/groovy/org/gradle/api/reporting/dependencies/HtmlDependencyReportTask.java
@@ -30,6 +30,7 @@
 import org.gradle.api.reporting.dependencies.internal.HtmlDependencyReporter;
 import org.gradle.internal.reflect.Instantiator;
 
+import javax.inject.Inject;
 import java.io.IOException;
 import java.util.Set;
 
@@ -60,7 +61,7 @@ public class HtmlDependencyReportTask extends ConventionTask implements Reportin
     private final DefaultDependencyReportContainer reports;
 
     public HtmlDependencyReportTask() {
-        reports = getServices().get(Instantiator.class).newInstance(DefaultDependencyReportContainer.class, this);
+        reports = getInstantiator().newInstance(DefaultDependencyReportContainer.class, this);
         reports.getHtml().setEnabled(true);
         getOutputs().upToDateWhen(new Spec<Task>() {
             public boolean isSatisfiedBy(Task element) {
@@ -78,6 +79,16 @@ public DependencyReportContainer reports(Closure closure) {
         return reports;
     }
 
+    @Inject
+    protected Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected VersionMatcher getVersionMatcher() {
+        throw new UnsupportedOperationException();
+    }
+
     @TaskAction
     public void generate() {
         if (!reports.getHtml().isEnabled()) {
@@ -86,7 +97,7 @@ public void generate() {
         }
 
         try {
-            HtmlDependencyReporter reporter = new HtmlDependencyReporter(getServices().get(VersionMatcher.class));
+            HtmlDependencyReporter reporter = new HtmlDependencyReporter(getVersionMatcher());
             reporter.setOutputDirectory(reports.getHtml().getDestination());
             reporter.generate(getProjects());
         } catch (IOException e) {
diff --git a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/AbstractReportTask.java b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/AbstractReportTask.java
index 9f4926bc137e..52119810bc75 100644
--- a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/AbstractReportTask.java
+++ b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/AbstractReportTask.java
@@ -26,6 +26,7 @@
 import org.gradle.api.tasks.diagnostics.internal.ReportRenderer;
 import org.gradle.logging.StyledTextOutputFactory;
 
+import javax.inject.Inject;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashSet;
@@ -51,6 +52,11 @@ public boolean isSatisfiedBy(Task element) {
         projects.add(getProject());
     }
 
+    @Inject
+    protected StyledTextOutputFactory getTextOutputFactory() {
+        throw new UnsupportedOperationException();
+    }
+
     @TaskAction
     public void generate() {
         try {
@@ -59,7 +65,7 @@ public void generate() {
             if (outputFile != null) {
                 renderer.setOutputFile(outputFile);
             } else {
-                renderer.setOutput(getServices().get(StyledTextOutputFactory.class).create(getClass()));
+                renderer.setOutput(getTextOutputFactory().create(getClass()));
             }
             Set<Project> projects = new TreeSet<Project>(getProjects());
             for (Project project : projects) {
diff --git a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTask.groovy b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTask.groovy
index ea366d63d407..6c2577410ca4 100644
--- a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTask.groovy
+++ b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/DependencyInsightReportTask.groovy
@@ -80,15 +80,14 @@ public class DependencyInsightReportTask extends DefaultTask {
      */
     Spec<DependencyResult> dependencySpec;
 
-    private final StyledTextOutput output;
-    private final GraphRenderer renderer;
-    private final VersionMatcher versionMatcher;
+    @Inject
+    protected StyledTextOutputFactory getTextOutputFactory() {
+        throw new UnsupportedOperationException()
+    }
 
     @Inject
-    DependencyInsightReportTask(StyledTextOutputFactory outputFactory, VersionMatcher versionMatcher) {
-        output = outputFactory.create(getClass());
-        renderer = new GraphRenderer(output)
-        this.versionMatcher = versionMatcher
+    protected VersionMatcher getVersionMatcher() {
+        throw new UnsupportedOperationException()
     }
 
     /**
@@ -153,6 +152,9 @@ public class DependencyInsightReportTask extends DefaultTask {
                     + "\nIt can be specified from the command line, e.g: '$path --dependency someDep'")
         }
 
+        StyledTextOutput output = textOutputFactory.create(getClass())
+        GraphRenderer renderer = new GraphRenderer(output)
+
         ResolutionResult result = configuration.getIncoming().getResolutionResult();
 
         Set<DependencyResult> selectedDependencies = new LinkedHashSet<DependencyResult>()
@@ -170,11 +172,11 @@ public class DependencyInsightReportTask extends DefaultTask {
         def sortedDeps = new DependencyInsightReporter().prepare(selectedDependencies, versionMatcher)
 
         def nodeRenderer = new NodeRenderer() {
-            void renderNode(StyledTextOutput output, RenderableDependency node, boolean alreadyRendered) {
+            void renderNode(StyledTextOutput target, RenderableDependency node, boolean alreadyRendered) {
                 boolean leaf = node.children.empty
-                output.text(leaf ? DependencyInsightReportTask.this.configuration.name : node.name);
+                target.text(leaf ? DependencyInsightReportTask.this.configuration.name : node.name);
                 if (alreadyRendered && !leaf) {
-                    output.withStyle(Info).text(" (*)")
+                    target.withStyle(Info).text(" (*)")
                 }
             }
         }
diff --git a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/ProjectReportTask.java b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/ProjectReportTask.java
index 5c0ca6e7faad..c2a0bd51b481 100644
--- a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/ProjectReportTask.java
+++ b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/ProjectReportTask.java
@@ -26,6 +26,7 @@
 import org.gradle.util.CollectionUtils;
 import org.gradle.util.GUtil;
 
+import javax.inject.Inject;
 import java.io.IOException;
 import java.util.List;
 
@@ -43,9 +44,14 @@ protected TextReportRenderer getRenderer() {
         return renderer;
     }
 
+    @Inject
+    protected BuildClientMetaData getClientMetaData() {
+        throw new UnsupportedOperationException();
+    }
+
     @Override
     protected void generate(Project project) throws IOException {
-        BuildClientMetaData metaData = getServices().get(BuildClientMetaData.class);
+        BuildClientMetaData metaData = getClientMetaData();
 
         StyledTextOutput textOutput = getRenderer().getTextOutput();
 
diff --git a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/TaskReportTask.java b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/TaskReportTask.java
index ae2fef15afb8..dedbc5cf3bcc 100644
--- a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/TaskReportTask.java
+++ b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/TaskReportTask.java
@@ -15,14 +15,13 @@
  */
 package org.gradle.api.tasks.diagnostics;
 
-import com.google.common.collect.Sets;
 import org.gradle.api.Project;
 import org.gradle.api.Rule;
-import org.gradle.api.internal.project.ProjectInternal;
+import org.gradle.api.internal.project.ProjectTaskLister;
 import org.gradle.api.internal.tasks.options.Option;
-import org.gradle.api.internal.tasks.TaskContainerInternal;
 import org.gradle.api.tasks.diagnostics.internal.*;
 
+import javax.inject.Inject;
 import java.io.IOException;
 
 /**
@@ -59,18 +58,12 @@ public void generate(Project project) throws IOException {
         TaskDetailsFactory taskDetailsFactory = new TaskDetailsFactory(project);
 
         SingleProjectTaskReportModel projectTaskModel = new SingleProjectTaskReportModel(taskDetailsFactory);
-        ProjectInternal projectInternal = (ProjectInternal) project;
-        TaskContainerInternal tasks = projectInternal.getTasks();
-        tasks.actualize();
-        projectTaskModel.build(Sets.union(tasks, projectInternal.getImplicitTasks()));
+        projectTaskModel.build(getProjectTaskLister().listProjectTasks(project));
         aggregateModel.add(projectTaskModel);
 
         for (Project subproject : project.getSubprojects()) {
             SingleProjectTaskReportModel subprojectTaskModel = new SingleProjectTaskReportModel(taskDetailsFactory);
-            ProjectInternal subprojectInternal = (ProjectInternal) subproject;
-            TaskContainerInternal subprojectTasks = subprojectInternal.getTasks();
-            subprojectTasks.actualize();
-            subprojectTaskModel.build(subprojectTasks);
+            subprojectTaskModel.build(getProjectTaskLister().listProjectTasks(subproject));
             aggregateModel.add(subprojectTaskModel);
         }
 
@@ -94,4 +87,9 @@ public void generate(Project project) throws IOException {
             renderer.addRule(rule);
         }
     }
+
+    @Inject
+    protected ProjectTaskLister getProjectTaskLister() {
+        throw new UnsupportedOperationException();
+    }
 }
diff --git a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/DependencyGraphRenderer.groovy b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/DependencyGraphRenderer.groovy
index 28b70f2806a6..e911feee381a 100644
--- a/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/DependencyGraphRenderer.groovy
+++ b/subprojects/diagnostics/src/main/groovy/org/gradle/api/tasks/diagnostics/internal/graph/DependencyGraphRenderer.groovy
@@ -45,12 +45,12 @@ class DependencyGraphRenderer {
         def i = 0
         for (RenderableDependency child : children) {
             boolean last = i++ == children.size() - 1
-            render(child, last, visited)
+            doRender(child, last, visited)
         }
         renderer.completeChildren()
     }
 
-    private void render(final RenderableDependency node, boolean last, Set<ComponentIdentifier> visited) {
+    private void doRender(final RenderableDependency node, boolean last, Set<ComponentIdentifier> visited) {
         def children = node.getChildren()
         def alreadyRendered = !visited.add(node.getId())
         if (alreadyRendered) {
diff --git a/subprojects/diagnostics/src/main/groovy/org/gradle/configuration/Help.java b/subprojects/diagnostics/src/main/groovy/org/gradle/configuration/Help.java
index 60b875b9858d..33e04b2d7191 100644
--- a/subprojects/diagnostics/src/main/groovy/org/gradle/configuration/Help.java
+++ b/subprojects/diagnostics/src/main/groovy/org/gradle/configuration/Help.java
@@ -25,15 +25,37 @@
 import org.gradle.logging.StyledTextOutputFactory;
 import org.gradle.util.GradleVersion;
 
+import javax.inject.Inject;
+
 import static org.gradle.logging.StyledTextOutput.Style.UserInput;
 
 public class Help extends DefaultTask {
     private String taskPath;
 
+    @Inject
+    protected StyledTextOutputFactory getTextOutputFactory() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected BuildClientMetaData getClientMetaData() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected TaskSelector getTaskSelector() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected OptionReader getOptionReader() {
+        throw new UnsupportedOperationException();
+    }
+
     @TaskAction
     void displayHelp() {
-        StyledTextOutput output = getServices().get(StyledTextOutputFactory.class).create(Help.class);
-        BuildClientMetaData metaData = getServices().get(BuildClientMetaData.class);
+        StyledTextOutput output = getTextOutputFactory().create(Help.class);
+        BuildClientMetaData metaData = getClientMetaData();
         if (taskPath != null) {
             printTaskHelp(output);
         } else {
@@ -42,9 +64,9 @@ void displayHelp() {
     }
 
     private void printTaskHelp(StyledTextOutput output) {
-        TaskSelector selector = getServices().get(TaskSelector.class);
-        final TaskSelector.TaskSelection selection = selector.getSelection(taskPath);
-        final OptionReader optionReader = getServices().get(OptionReader.class);
+        TaskSelector selector = getTaskSelector();
+        TaskSelector.TaskSelection selection = selector.getSelection(taskPath);
+        OptionReader optionReader = getOptionReader();
         TaskDetailPrinter taskDetailPrinter = new TaskDetailPrinter(taskPath, selection, optionReader);
         taskDetailPrinter.print(output);
     }
@@ -66,7 +88,7 @@ private void printDefaultHelp(StyledTextOutput output, BuildClientMetaData metaD
         output.println();
     }
 
-    @Option(option = "task", description = "The task, detailed help is requested for.")
+    @Option(option = "task", description = "The task to show help for.")
     public void setTaskPath(String taskPath) {
         this.taskPath = taskPath;
     }
diff --git a/subprojects/diagnostics/src/main/groovy/org/gradle/configuration/TaskDetailPrinter.java b/subprojects/diagnostics/src/main/groovy/org/gradle/configuration/TaskDetailPrinter.java
index f7b0338a3d99..fcf83d32ec69 100644
--- a/subprojects/diagnostics/src/main/groovy/org/gradle/configuration/TaskDetailPrinter.java
+++ b/subprojects/diagnostics/src/main/groovy/org/gradle/configuration/TaskDetailPrinter.java
@@ -77,8 +77,8 @@ public int compare(Class o1, Class o2) {
 
             output.println();
             printTaskDescription(output, tasksByType);
-            output.println();
             if (multipleClasses) {
+                output.println();
                 output.println("----------------------");
             }
         }
diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle
index 892972def0d5..73f4a8ecb4f4 100755
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
@@ -317,6 +317,9 @@ task javadocAll(type: Javadoc) {
     options.encoding = 'utf-8'
     options.docEncoding = 'utf-8'
     options.charSet = 'utf-8'
+    if (JavaVersion.current().isJava8Compatible()) {
+        options.addStringOption 'Xdoclint:none', '-quiet'
+    }
     options.addStringOption "stylesheetfile", stylesheetFile.absolutePath
     source publicGroovyProjects.collect {project -> project.sourceSets.main.allJava }
     destinationDir = new File(docsDir, 'javadoc')
@@ -329,6 +332,7 @@ task javadocAll(type: Javadoc) {
     include 'org/gradle/nativebinaries/**'
     include 'org/gradle/process/**'
     include 'org/gradle/plugins/**'
+    include 'org/gradle/runtime/**'
     include 'org/gradle/testfixtures/**'
     include 'org/gradle/tooling/**'
     include 'org/gradle/testing/jacoco/**'
diff --git a/subprojects/docs/src/docs/dsl/dsl.xml b/subprojects/docs/src/docs/dsl/dsl.xml
index 767e49bb23a6..18f5bfdad8c4 100644
--- a/subprojects/docs/src/docs/dsl/dsl.xml
+++ b/subprojects/docs/src/docs/dsl/dsl.xml
@@ -279,9 +279,6 @@
             <tr>
                 <td>org.gradle.api.tasks.Delete</td>
             </tr>
-            <tr>
-                <td>org.gradle.api.tasks.Directory</td>
-            </tr>
             <tr>
                 <td>org.gradle.plugins.ear.Ear</td>
             </tr>
@@ -481,10 +478,10 @@
                 <td>org.gradle.nativebinaries.ProjectNativeComponent</td>
             </tr>
             <tr>
-                <td>org.gradle.nativebinaries.Executable</td>
+                <td>org.gradle.nativebinaries.NativeExecutable</td>
             </tr>
             <tr>
-                <td>org.gradle.nativebinaries.Library</td>
+                <td>org.gradle.nativebinaries.NativeLibrary</td>
             </tr>
             <tr>
                 <td>org.gradle.nativebinaries.NativeBinary</td>
@@ -493,7 +490,7 @@
                 <td>org.gradle.nativebinaries.ProjectNativeBinary</td>
             </tr>
             <tr>
-                <td>org.gradle.nativebinaries.ExecutableBinary</td>
+                <td>org.gradle.nativebinaries.NativeExecutableBinary</td>
             </tr>
             <tr>
                 <td>org.gradle.nativebinaries.SharedLibraryBinary</td>
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectCollection.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectCollection.xml
new file mode 100644
index 000000000000..791735e99fd8
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectCollection.xml
@@ -0,0 +1,44 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+            <tr>
+                <td>getByName</td>
+            </tr>
+            <tr>
+                <td>getAt</td>
+            </tr>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectContainer.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectContainer.xml
new file mode 100644
index 000000000000..4dddde4bd7ab
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectContainer.xml
@@ -0,0 +1,44 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+            <tr>
+                <td>create</td>
+            </tr>
+            <tr>
+                <td>maybeCreate</td>
+            </tr>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectList.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectList.xml
new file mode 100644
index 000000000000..85af316a2f93
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectList.xml
@@ -0,0 +1,38 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectSet.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectSet.xml
new file mode 100644
index 000000000000..85af316a2f93
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.NamedDomainObjectSet.xml
@@ -0,0 +1,38 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.Project.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.Project.xml
index fe765853f078..26c1d64677c9 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.api.Project.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.Project.xml
@@ -37,9 +37,6 @@
             <tr>
                 <td>dependencies</td>
             </tr>
-            <tr>
-                <td>dependsOnProjects</td>
-            </tr>
             <tr>
                 <td>defaultTasks</td>
             </tr>
@@ -200,18 +197,9 @@
             <tr>
                 <td>task</td>
             </tr>
-            <tr>
-                <td>dependsOn</td>
-            </tr>
             <tr>
                 <td>evaluationDependsOn</td>
             </tr>
-            <tr>
-                <td>childrenDependOnMe</td>
-            </tr>
-            <tr>
-                <td>dependsOnChildren</td>
-            </tr>
             <tr>
                 <td>findProject</td>
             </tr>
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.CheckstyleExtension.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.CheckstyleExtension.xml
index 79de687692a4..627e31ecc4b5 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.CheckstyleExtension.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.CheckstyleExtension.xml
@@ -6,33 +6,27 @@
                 <tr>
                     <td>Name</td>
                     <td>Default with <literal>checkstyle</literal> plugin</td>
-                    <td>Default with <literal>code-quality</literal> plugin</td>
                 </tr>
             </thead>
             <tr>
                 <td>toolVersion</td>
                 <td><literal>5.5</literal></td>
-                <td><literal>5.5</literal></td>
             </tr>
             <tr>
                 <td>reportsDir</td>
                 <td><literal><replaceable>${project.reporting.baseDir}</replaceable>/checkstyle</literal></td>
-                <td><literal>project.checkstyleResultsDir</literal></td>
             </tr>
             <tr>
                 <td>configFile</td>
                 <td><literal><replaceable>${project.projectDir}</replaceable>/config/checkstyle/checkstyle.xml</literal></td>
-                <td><literal>project.checkstyleConfigFile</literal></td>
             </tr>
             <tr>
                 <td>configProperties</td>
                 <td><literal>[:]</literal></td>
-                <td><literal>project.checkstyleProperties</literal></td>
             </tr>
             <tr>
                 <td>showViolations</td>
                 <td><literal>true</literal></td>
-                <td><literal>true</literal></td>
             </tr>
         </table>
     </section>
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.CodeNarcExtension.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.CodeNarcExtension.xml
index 9c22989b3199..9a0efb98c123 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.CodeNarcExtension.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.CodeNarcExtension.xml
@@ -6,43 +6,35 @@
                 <tr>
                     <td>Name</td>
                     <td>Default with <literal>codenarc</literal> plugin</td>
-                    <td>Default with <literal>code-quality</literal> plugin</td>
                 </tr>
             </thead>
             <tr>
                 <td>toolVersion</td>
                 <td><literal>0.16.1</literal></td>
-                <td><literal>0.16.1</literal></td>
             </tr>
             <tr>
                 <td>reportsDir</td>
                 <td><literal><replaceable>${project.reporting.baseDir}</replaceable>/codenarc</literal></td>
-                <td><literal>project.codeNarcReportsDir</literal></td>
             </tr>
             <tr>
                 <td>configFile</td>
                 <td><literal><replaceable>${project.projectDir}</replaceable>/config/codenarc/codenarc.xml</literal></td>
-                <td><literal>project.codeNarcConfigFile</literal></td>
             </tr>
             <tr>
                 <td>maxPriority1Violations</td>
                 <td><literal>0</literal></td>
-                <td><literal>0</literal></td>
             </tr>
             <tr>
                 <td>maxPriority2Violations</td>
                 <td><literal>0</literal></td>
-                <td><literal>0</literal></td>
             </tr>
             <tr>
                 <td>maxPriority3Violations</td>
                 <td><literal>0</literal></td>
-                <td><literal>0</literal></td>
             </tr>
             <tr>
                 <td>reportFormat</td>
                 <td><literal>html</literal></td>
-                <td><literal>project.codeNarcReportsFormat</literal></td>
             </tr>
         </table>
     </section>
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.GroovyCodeQualityPluginConvention.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.GroovyCodeQualityPluginConvention.xml
deleted file mode 100644
index 5ac5d1ee91e3..000000000000
--- a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.GroovyCodeQualityPluginConvention.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<section>
-    <section>
-        <title>Properties</title>
-        <table>
-            <thead>
-                <tr>
-                    <td>Name</td>
-                    <td>Default with <literal>code-quality</literal> and <literal>groovy</literal> plugin</td>
-                </tr>
-            </thead>
-            <tr>
-                <td>codeNarcConfigFileName</td>
-                <td><literal>'config/codenarc/codenarc.xml'</literal></td>
-            </tr>
-            <tr>
-                <td>codeNarcConfigFile</td>
-                <td><literal><replaceable>${project.projectDir}</replaceable>/<replaceable>${project.codeNarcConfigFileName}</replaceable></literal></td>
-            </tr>
-            <tr>
-                <td>codeNarcReportsDirName</td>
-                <td><literal>'codenarc'</literal></td>
-            </tr>
-            <tr>
-                <td>codeNarcReportsDir</td>
-                <td><literal><replaceable>${project.reporting.baseDir}</replaceable>/<replaceable>${project.codeNarcReportsDirName}</replaceable></literal></td>
-            </tr>
-        </table>
-    </section>
-    <section>
-        <title>Methods</title>
-        <table>
-            <thead>
-                <tr>
-                    <td>Name</td>
-                </tr>
-            </thead>
-        </table>
-    </section>
-</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.JavaCodeQualityPluginConvention.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.JavaCodeQualityPluginConvention.xml
deleted file mode 100644
index 65c965849d23..000000000000
--- a/subprojects/docs/src/docs/dsl/org.gradle.api.plugins.quality.JavaCodeQualityPluginConvention.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<section>
-    <section>
-        <title>Properties</title>
-        <table>
-            <thead>
-                <tr>
-                    <td>Name</td>
-                    <td>Default with <literal>code-quality</literal> and <literal>java</literal> plugin</td>
-                </tr>
-            </thead>
-            <tr>
-                <td>checkstyleConfigFileName</td>
-                <td><literal>'config/checkstyle/checkstyle.xml'</literal></td>
-            </tr>
-            <tr>
-                <td>checkstyleConfigFile</td>
-                <td><literal><replaceable>${project.projectDir}</replaceable>/<replaceable>${project.checkstyleConfigFileName}</replaceable></literal></td>
-            </tr>
-            <tr>
-                <td>checkstyleResultsDirName</td>
-                <td><literal>checkstyle</literal></td>
-            </tr>
-            <tr>
-                <td>checkstyleResultsDir</td>
-                <td><literal><replaceable>${project.buildDir}</replaceable>/<replaceable>${project.checkstyleResultsDirName}</replaceable></literal></td>
-            </tr>
-            <tr>
-                <td>checkstyleProperties</td>
-                <td><literal>[:]</literal></td>
-            </tr>
-        </table>
-    </section>
-    <section>
-        <title>Methods</title>
-        <table>
-            <thead>
-                <tr>
-                    <td>Name</td>
-                </tr>
-            </thead>
-        </table>
-    </section>
-</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.compile.CompileOptions.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.compile.CompileOptions.xml
index cbd9b35a596d..228cf03f7ab8 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.compile.CompileOptions.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.compile.CompileOptions.xml
@@ -32,10 +32,6 @@
                 <td>encoding</td>
                 <td><literal>null</literal></td>
             </tr>
-            <tr>
-                <td>optimize</td>
-                <td><literal>false</literal></td>
-            </tr>
             <tr>
                 <td>debug</td>
                 <td><literal>true</literal></td>
@@ -60,14 +56,6 @@
                 <td>dependOptions</td>
                 <td></td>
             </tr>
-            <tr>
-                <td>compiler</td>
-                <td><literal>null</literal></td>
-            </tr>
-            <tr>
-                <td>includeJavaRuntime</td>
-                <td><literal>false</literal></td>
-            </tr>
             <tr>
                 <td>bootClasspath</td>
                 <td><literal>null</literal></td>
@@ -80,10 +68,6 @@
                 <td>compilerArgs</td>
                 <td><literal>[]</literal></td>
             </tr>
-            <tr>
-                <td>useAnt</td>
-                <td><literal>false</literal></td>
-            </tr>
         </table>
     </section>
     <section>
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.compile.GroovyCompileOptions.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.compile.GroovyCompileOptions.xml
index 6a82a81adc71..ca7cce5ddb3f 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.compile.GroovyCompileOptions.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.compile.GroovyCompileOptions.xml
@@ -36,18 +36,6 @@
                 <td>optimizationOptions</td>
                 <td><literal>[:]</literal></td>
             </tr>
-            <tr>
-                <td>stacktrace</td>
-                <td><literal>false</literal></td>
-            </tr>
-            <tr>
-                <td>useAnt</td>
-                <td><literal>false</literal></td>
-            </tr>
-            <tr>
-                <td>includeJavaRuntime</td>
-                <td><literal>false</literal></td>
-            </tr>
             <tr>
                 <td>stubDir</td>
                 <td><literal>null</literal></td>
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.testing.Test.xml b/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.testing.Test.xml
index ecf3e509d817..a9b98d61d97f 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.testing.Test.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.api.tasks.testing.Test.xml
@@ -12,18 +12,10 @@
                 <td>testClassesDir</td>
                 <td><literal>project.sourceSets.test.output.classesDir</literal></td>
             </tr>
-            <tr>
-                <td>testResultsDir</td>
-                <td><literal>project.testResultsDir</literal></td>
-            </tr>
             <tr>
                 <td>binResultsDir</td>
                 <td><literal><replaceable>project.testResultsDir</replaceable>/binary/<replaceable>task.name</replaceable></literal></td>
             </tr>
-            <tr>
-                <td>testReportDir</td>
-                <td><literal>project.testReportDir</literal></td>
-            </tr>
             <tr>
                 <td>reports</td>
                 <td><literal>project.testReportDir</literal></td>
@@ -40,10 +32,6 @@
                 <td>workingDir</td>
                 <td><literal>project.projectDir</literal></td>
             </tr>
-            <tr>
-                <td>testReport</td>
-                <td><literal>true</literal></td>
-            </tr>
             <tr>
                 <td>scanForTestClasses</td>
                 <td><literal>true</literal></td>
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeComponentExtension.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeComponentExtension.xml
new file mode 100644
index 000000000000..57cc5f1d0cb1
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeComponentExtension.xml
@@ -0,0 +1,50 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+            <tr>
+                <td>executables</td>
+            </tr>
+            <tr>
+                <td>libraries</td>
+            </tr>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+            <tr>
+                <td>executables</td>
+            </tr>
+            <tr>
+                <td>libraries</td>
+            </tr>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.language.base.BinaryContainer.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeExecutable.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.language.base.BinaryContainer.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeExecutable.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.Executable.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeExecutableBinary.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.Executable.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeExecutableBinary.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.Library.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeLibrary.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.Library.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeLibrary.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ExecutableBinary.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeLibraryBinary.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ExecutableBinary.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.NativeLibraryBinary.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ProjectNativeBinary.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ProjectNativeBinary.xml
index 2fbfb606d8d8..d40755b05134 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ProjectNativeBinary.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ProjectNativeBinary.xml
@@ -26,9 +26,6 @@
             <tr>
                 <td>component</td>
             </tr>
-            <tr>
-                <td>buildable</td>
-            </tr>
             <tr>
                 <td>toolChain</td>
             </tr>
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ExecutableContainer.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.NativeTestSuite.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.ExecutableContainer.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.NativeTestSuite.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.LibraryBinary.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.NativeTestSuiteBinary.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.LibraryBinary.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.NativeTestSuiteBinary.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.ConfigurableToolChain.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.ConfigurableToolChain.xml
new file mode 100644
index 000000000000..afaf0d09709b
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.ConfigurableToolChain.xml
@@ -0,0 +1,45 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+            <!-- <tr><td>assembler</td></tr>
+            <tr><td>cCompiler</td></tr>
+            <tr><td>cppCompiler</td></tr>
+            <tr><td>linker</td></tr>
+            <tr><td>objcCompiler</td></tr>
+            <tr><td>objcppCompiler</td></tr>
+            <tr><td>staticLibArchiver</td></tr>-->
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.PlatformConfigurableToolChain.xml b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.PlatformConfigurableToolChain.xml
index 90075bd93d2b..ceb6d023ef41 100644
--- a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.PlatformConfigurableToolChain.xml
+++ b/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.toolchain.PlatformConfigurableToolChain.xml
@@ -23,11 +23,6 @@
                     <td>Name</td>
                 </tr>
             </thead>
-            <tr><td>assembler</td></tr>
-            <tr><td>cCompiler</td></tr>
-            <tr><td>cppCompiler</td></tr>
-            <tr><td>linker</td></tr>
-            <tr><td>staticLibArchiver</td></tr>
         </table>
     </section>
     <section>
@@ -38,7 +33,7 @@
                     <td>Name</td>
                 </tr>
             </thead>
-            <tr><td>addPlatformConfiguration</td></tr>
+            <tr><td>target</td></tr>
         </table>
     </section>
 </section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.LibraryContainer.xml b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.Application.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.LibraryContainer.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.runtime.base.Application.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.TestSuite.xml b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.Binary.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.TestSuite.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.runtime.base.Binary.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.TestSuiteExecutableBinary.xml b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.BinaryContainer.xml
similarity index 100%
rename from subprojects/docs/src/docs/dsl/org.gradle.nativebinaries.test.TestSuiteExecutableBinary.xml
rename to subprojects/docs/src/docs/dsl/org.gradle.runtime.base.BinaryContainer.xml
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.Library.xml b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.Library.xml
new file mode 100644
index 000000000000..659d719e58ec
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.Library.xml
@@ -0,0 +1,38 @@
+<!--
+  ~ Copyright 2013 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectBinary.xml b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectBinary.xml
new file mode 100644
index 000000000000..e6f5f6a52405
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectBinary.xml
@@ -0,0 +1,41 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+            <tr>
+                <td>buildable</td>
+            </tr>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectComponent.xml b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectComponent.xml
new file mode 100644
index 000000000000..659d719e58ec
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectComponent.xml
@@ -0,0 +1,38 @@
+<!--
+  ~ Copyright 2013 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectComponentContainer.xml b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectComponentContainer.xml
new file mode 100644
index 000000000000..85af316a2f93
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.runtime.base.ProjectComponentContainer.xml
@@ -0,0 +1,38 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/org.gradle.runtime.jvm.JvmComponentExtension.xml b/subprojects/docs/src/docs/dsl/org.gradle.runtime.jvm.JvmComponentExtension.xml
new file mode 100644
index 000000000000..511fa524a42c
--- /dev/null
+++ b/subprojects/docs/src/docs/dsl/org.gradle.runtime.jvm.JvmComponentExtension.xml
@@ -0,0 +1,44 @@
+<!--
+  ~ Copyright 2014 the original author or authors.
+  ~
+  ~ 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.
+  -->
+
+<section>
+    <section>
+        <title>Properties</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+            <tr>
+                <td>libraries</td>
+            </tr>
+        </table>
+    </section>
+    <section>
+        <title>Methods</title>
+        <table>
+            <thead>
+                <tr>
+                    <td>Name</td>
+                </tr>
+            </thead>
+            <tr>
+                <td>libraries</td>
+            </tr>
+        </table>
+    </section>
+</section>
\ No newline at end of file
diff --git a/subprojects/docs/src/docs/dsl/plugins.xml b/subprojects/docs/src/docs/dsl/plugins.xml
index e6121ad2746f..4a7b1758bd86 100755
--- a/subprojects/docs/src/docs/dsl/plugins.xml
+++ b/subprojects/docs/src/docs/dsl/plugins.xml
@@ -16,10 +16,6 @@
     <plugin id="antlr" description="Antlr Plugin">
         <extends targetClass="org.gradle.api.tasks.SourceSet" mixinClass="org.gradle.api.plugins.antlr.AntlrSourceVirtualDirectory"/>
     </plugin>
-    <plugin id="code-quality" description="Code Quality Plugin">
-        <extends targetClass="org.gradle.api.Project" mixinClass="org.gradle.api.plugins.quality.JavaCodeQualityPluginConvention"/>
-        <extends targetClass="org.gradle.api.Project" mixinClass="org.gradle.api.plugins.quality.GroovyCodeQualityPluginConvention"/>
-    </plugin>
     <plugin id="maven" description="Maven Plugin">
         <extends targetClass="org.gradle.api.Project" mixinClass="org.gradle.api.plugins.MavenPluginConvention"/>
         <extends targetClass="org.gradle.api.artifacts.dsl.RepositoryHandler" mixinClass="org.gradle.api.plugins.MavenRepositoryHandlerConvention"/>
@@ -78,13 +74,15 @@
         <extends targetClass="org.gradle.api.tasks.testing.Test" id="jacoco" extensionClass="org.gradle.testing.jacoco.plugins.JacocoTaskExtension"/>
     </plugin>
     <plugin id="LanguageBasePlugin" description="Language Base Plugin">
-        <extends targetClass="org.gradle.api.Project" id="binaries" extensionClass="org.gradle.language.base.BinaryContainer"/>
+        <extends targetClass="org.gradle.api.Project" id="softwareComponents" extensionClass="org.gradle.runtime.base.ProjectComponentContainer"/>
+        <extends targetClass="org.gradle.api.Project" id="binaries" extensionClass="org.gradle.runtime.base.BinaryContainer"/>
         <extends targetClass="org.gradle.api.Project" id="sources" extensionClass="org.gradle.language.base.ProjectSourceSet"/>
     </plugin>
-    <plugin id="native-binaries" description="Native Binaries Model Plugin">
-        <extends targetClass="org.gradle.api.Project" id="executables" extensionClass="org.gradle.nativebinaries.ExecutableContainer"/>
-        <extends targetClass="org.gradle.api.Project" id="libraries" extensionClass="org.gradle.nativebinaries.LibraryContainer"/>
-        <extends targetClass="org.gradle.api.Project" id="binaries" extensionClass="org.gradle.language.base.BinaryContainer"/>
+    <plugin id="jvm-component" description="JVM Component Model Plugin">
+        <extends targetClass="org.gradle.api.Project" id="jvm" extensionClass="org.gradle.runtime.jvm.JvmComponentExtension"/>
+    </plugin>
+    <plugin id="native-component" description="Native Component Model Plugin">
+        <extends targetClass="org.gradle.api.Project" id="nativeCode" extensionClass="org.gradle.nativebinaries.NativeComponentExtension"/>
         <extends targetClass="org.gradle.api.Project" id="toolChains" extensionClass="org.gradle.nativebinaries.toolchain.ToolChainRegistry"/>
         <extends targetClass="org.gradle.api.Project" id="buildTypes" extensionClass="org.gradle.nativebinaries.BuildTypeContainer"/>
         <extends targetClass="org.gradle.api.Project" id="platforms" extensionClass="org.gradle.nativebinaries.platform.PlatformContainer"/>
diff --git a/subprojects/docs/src/docs/release/notes-template.md b/subprojects/docs/src/docs/release/notes-template.md
index 438cd2968021..c42da2d4f4be 100644
--- a/subprojects/docs/src/docs/release/notes-template.md
+++ b/subprojects/docs/src/docs/release/notes-template.md
@@ -22,7 +22,7 @@ The following are the features that have been promoted in this Gradle release.
 ## Deprecations
 
 Features that have become superseded or irrelevant due to the natural evolution of Gradle become *deprecated*, and scheduled to be removed
-in the next major Gradle version (Gradle 2.0). See the User guide section on the “[Feature Lifecycle](userguide/feature_lifecycle.html)” for more information.
+in the next major Gradle version (Gradle 3.0). See the User guide section on the “[Feature Lifecycle](userguide/feature_lifecycle.html)” for more information.
 
 The following are the newly deprecated items in this Gradle release. If you have concerns about a deprecation, please raise it via the [Gradle Forums](http://forums.gradle.org).
 
diff --git a/subprojects/docs/src/docs/release/notes.md b/subprojects/docs/src/docs/release/notes.md
index c0189d8c510c..c3ee75a4d18a 100644
--- a/subprojects/docs/src/docs/release/notes.md
+++ b/subprojects/docs/src/docs/release/notes.md
@@ -1,311 +1,427 @@
-Gradle 1.12 brings some nice universal performance improvements, useful new features and a slew of bug and compatibility fixes.
-
-In the native space, improvements have been made to the Clang support as well as improved integration with Visual Studio.
-Gradle also now provides support for unit testing your native code via CUnit.
-
-A considerable amount of work in this release went in to the dependency management engine, preparing for new APIs that allow more control over the dependency resolution process.
-The visible result of this work in Gradle 1.12 is the ability to specify rules that identify _changing_ components (e.g. snapshots).
+## New and noteworthy
 
-Another significant area of investment in 1.12 is in the area of IDE integration, via the [Tooling API](userguide/embedding.html).
-Integration with IntelliJ IDEA in particular has been improved, along with general improvements that will offer tooling providers more integration capabilities.
-Optimizations have also been made to the parts of the codebase that deal with IDE import, making importing Gradle 1.12 projects into IDEs faster than any previous Gradle version.
+Here are the new features introduced in this Gradle release.
 
-Gradle 1.12 set a new high watermark for contributions.
-It includes contributions from 16 different people.
-Contributions range from documentation improvements, to Ant import improvements, to support for building large zips,
-to Sonar improvements, to test reporting improvements and more.
-Thank you to all of the contributors.
+### Groovy 2.2.2
 
-Gradle 1.12 will be the last release in the Gradle 1.x line.
-The next release will be Gradle 2.0.
-For information on what this means for you and for the future of Gradle, please see [the Gradle 2.0 announcement](http://forums.gradle.org/gradle/topics/after_1_12_comes_2_0).
+Gradle now uses Groovy 2.2.2 to compile and running build scripts and plugins.
 
-## New and noteworthy
+### New API for artifact resolution (i)
 
-Here are the new features introduced in this Gradle release.
+Gradle 2.0 introduces a new, incubating API for resolving component artifacts. With this addition, Gradle now offers separate dedicated APIs for resolving
+components and artifacts. (Component resolution is mainly concerned with computing the dependency graph, whereas artifact resolution is
+mainly concerned with locating and downloading artifacts.) The entry points to the component and artifact resolution APIs are `configuration.incoming` and
+`dependencies.createArtifactResolutionQuery()`, respectively.
 
-### CUnit integration (i)
+TODO: This API examples are out of date. Add new tested samples to the Javadoc or Userguide and link instead
 
-The new Gradle `cunit` plugin provides support for compiling and executing [CUnit](http://cunit.sourceforge.net) tests in your native-binary project.
+Here is an example usage of the new API:
 
-You simply need to include your CUnit test sources, and provide a hook for Gradle to register the suites and tests defined.
+    def query = dependencies.createArtifactResolutionQuery()
+        .forComponent("org.springframework", "spring-core", "3.2.3.RELEASE")
+        .forArtifacts(JvmLibrary)
 
-    #include <CUnit/Basic.h>
-    #include "gradle_cunit_register.h"
-    #include "operator_tests.h"
+    def result = query.execute() // artifacts are downloaded at this point
 
-    void gradle_cunit_register() {
-        CU_pSuite mySuite = CU_add_suite("operator tests", suite_init, suite_clean);
-        CU_add_test(mySuite, "test plus", test_plus);
-        CU_add_test(mySuite, "test minus", test_minus);
+    for (component in result.components) {
+        assert component instanceof JvmLibrary
+        println component.id
+        component.sourceArtifacts.each { println it.file }
+        component.javadocArtifacts.each { println it.file }
     }
 
-Gradle will then generate the required boiler-plate CUnit code, build a test executable, and run your tests.
+    assert result.unresolvedComponents.isEmpty()
 
-<pre><tt>> gradle -q runFailingOperatorsTest
+Artifact resolution can be limited to selected artifact types:
 
-There were test failures:
-  1. /home/user/gradle/samples/native-binaries/cunit/src/operatorsTest/cunit/test_plus.c:6  - plus(0, -2) == -2
-  2. /home/user/gradle/samples/native-binaries/cunit/src/operatorsTest/cunit/test_plus.c:7  - plus(2, 2) == 4
+    def query = dependencies.createArtifactResolutionQuery()
+        .forComponent("org.springframework", "spring-core", "3.2.3.RELEASE")
+        .forArtifacts(JvmLibrary, JvmLibrarySourcesArtifact)
 
-BUILD FAILED</tt></pre>
+    def result = query.execute()
 
-See the [user guide chapter](userguide/nativeBinaries.html#native_binaries:cunit) and the cunit sample (`samples/native-binaries/cunit`)
-in the distribution to learn more. Expect deeper integration with CUnit (and other native testing tools) in the future.
+    for (component in result.components) {
+        assert !component.sourceArtifacts.isEmpty()
+        assert component.javadocArtifacts.isEmpty()
+    }
+
+Artifacts for many components can be resolved together:
 
-### Component metadata rules can control whether a component version is considered changing (i)
+    def query = dependencies.createArtifactResolutionQuery()
+        .forComponents(setOfComponentIds)
+        .forArtifacts(JvmLibrary)
 
-Component metadata rules ([introduced in Gradle 1.8](http://www.gradle.org/docs/1.8/release-notes#component-metadata-rules)) can now be used to specify whether a component version is considered _changing_.
+So far, only one component type (`JvmLibrary`) is available, but others will follow, also for platforms other than the JVM.
 
-A _changing_ component is expected to change over time without a change to the version number.
-A commonly used and well understood example of a changing component is a “`-SNAPSHOT`” dependency from an Apache Maven repository (which Gradle implicitly considers to be changing).
+### Accessing Ivy extra info from component metadata rules
 
-This new feature makes it possible to implement custom strategies for deciding if a component version is changing.
-In the following example, every component version whose group is “`my.company`” and whose version number ends in “`-dev`” will be considered changing:
+It's now possible to access Ivy extra info from component metadata rules. Roughly speaking, Ivy extra info is a set of user-defined
+key-value pairs published in the Ivy module descriptor. Rules wishing to access the extra info need to specify a parameter of type
+`IvyModuleDescriptor`. Here is an example:
 
     dependencies {
         components {
-            eachComponent { ComponentMetadataDetails details ->
-                details.changing =
-                    details.id.group == "my.company" &&
-                        details.id.version.endsWith("-dev")
+            eachComponent { component, IvyModuleDescriptor descriptor ->
+                println descriptor.extraInfo["expired"] // TODO: what's a real-world use case?
             }
         }
     }
 
-This feature is especially useful when dealing with Ivy repositories, as it is a generalized form of Ivy's `changingPattern` concept.
-
-See [ComponentMetadataHandler](javadoc/org/gradle/api/artifacts/dsl/ComponentMetadataHandler.html) for more information.
-
-### Tooling API exposes information on a project's publications (i)
-
-The [Tooling API](userguide/embedding.html) is a mechanism for embedding Gradle and/or driving Gradle programmatically.
-The new [`ProjectPublications`](javadoc/org/gradle/tooling/model/gradle/ProjectPublications.html) Tooling API model type provides basic information about a project's publications.
-
-The following example demonstrates using the `ProjectPublications` model to print out the group/name/version of each publication.
-
-    def projectConnection = ...
-    def publications = projectConnection.getModel(ProjectPublications)
-    for (publication in project.publications) {
-        println publication.id.group
-        println publication.id.name
-        println publication.id.version
-    }
-
-Both publications declared in the old (`artifacts` block, `Upload` task) and new (`publishing.publications` block) way are reflected in the result.
+### Cleaner build scripts with `plugins.withId`
 
-### Tooling API exposes more information on how to launch a Gradle build (i)
+New <a href="javadoc/org/gradle/api/plugins/PluginContainer.html#withId(java.lang.String, org.gradle.api.Action)">plugins.withId()</a>
+enables referring to plugins more conveniently.
+In previous releases, some times it was necessary for the client of a custom plugin to know the fully qualified type of the plugin:
 
-The [Tooling API](userguide/embedding.html) is a mechanism for embedding Gradle and/or driving Gradle programmatically.
-The new [`BuildInvocations`](javadoc/org/gradle/tooling/model/gradle/BuildInvocations.html) Tooling API model type provides information about the possible ways to invoke the build.
+    import com.my.custom.InterestingPlugin
+    plugins.withType(InterestingPlugin) { ...
 
-It provides the invokable tasks of a project, and importantly also its applicable task _selectors_.
-A task selector effectively refers to all of the tasks with a given name in a project and its child projects.
-For example, it is common in a multi project build for all projects to have a `build` task.
-Invoking the build via the Tooling API with the `build` task _selector_ would run the `build` task in every project, effectively building the entire multi project build.
-In contrast, invoking the build with the `build` _task_ would only build the root project (or which ever project is being targeted).
+    //now possible, given InterestingPlugin uses "interesting-plugin" id:
+    plugins.withId("interesting-plugin") { ...
 
-This new capability makes it easier for integrators to provide more powerful interfaces for invoking Gradle builds.
+Benefits of the new API for the users:
 
-### Easier to identify ignored tests in HTML test report
+* less pressure to know the exact java class of the plugin
+* build scripts are more likely to be decoupled from the plugin types (e.g. it's easier for plugin author to refactor/change the type)
+* some build scripts are cleaner and more consistent because plugins are applied by 'id' and are also filtered by 'id'
 
-The HTML test report now has a dedicated tab for ignored tests, at the overview and package level.
-This makes it much easier to see which tests were ignored at a glance.
+### Support for Ivy and Maven repositories with SFTP scheme
 
-Thanks to [Paul Merlin](https://github.com/eskatos) for this improvement.
+In addition to `file`, `http` and `https`, Ivy and Maven repositories now also support the `sftp` transport scheme. Currently, authentication with the SFTP server only works based on
+providing username and password credentials.
 
-### Support for building large zips
+Here is an example usage of resolving dependencies from a SFTP server with Ivy:
 
-It is now possible to build zips with the [Zip64 extension](http://en.wikipedia.org/wiki/Zip_\(file_format\)#ZIP64), enabling the building of large zip files.
+    apply plugin: 'java'
 
-    task largeZip(type: Zip) {
-        from 'lotsOfLargeFiles'
-        zip64 = true
+    repositories {
+        ivy {
+            url 'sftp://127.0.0.1:22/repo'
+            credentials {
+                username 'sftp'
+                password 'sftp'
+            }
+            layout 'maven'
+        }
     }
 
-The zip standard does not support containing more than 65535 files, containing any file greater than 4GB or being greater than 4GB compressed.
-If your zip file meets any of these criteria, then the zip must be built with the
-[`zip64` property](dsl/org.gradle.api.tasks.bundling.Zip.html#org.gradle.api.tasks.bundling.Zip:zip64) set to `true` (it is `false` by default).
-This flag also applies to all JARs, WARs, EARs and anything else that uses the Zip format.
-
-However, not all Zip readers support the Zip64 extensions.
-Notably, the `ZipInputStream` JDK class does not support Zip64 for versions earlier than Java 7.
-This means you should not enable this property if you are building JARs to be used with Java 6 and earlier runtimes.
-
-Thanks to [Jason Gauci](https://github.com/MisterTea) for this improvement.
-
-### Support for consuming Apache Maven POMs with active profiles
+    dependencies {
+        compile 'org.apache.commons:commons-lang3:3.3.1'
+    }
 
-Gradle now respects POM profiles that are [active by default](https://maven.apache.org/pom.html#Activation), during dependency resolution.
-More specifically, the properties, dependencies and dependency management information is now respected.
+Resolving dependencies from a SFTP server with Maven works accordingly. Publishing is not supported yet. The following example demonstrates the use case:
 
-### Customise Clang compiler tool chain (i)
+    apply plugin: 'java'
 
-In earlier Gradle versions, it was possible to customize the GCC compiler tool chain in various ways. For example, you could use the `cCompiler.executable` property
-to specify a custom C compiler to use.
+    repositories {
+        maven {
+            url 'sftp://127.0.0.1:22/repo'
+            credentials {
+                username 'sftp'
+                password 'sftp'
+            }
+        }
+    }
 
-Now you can customize the Clang tool chain in exactly the same way as the GCC tool chain.
+    dependencies {
+        compile 'org.apache.commons:commons-lang3:3.3.1'
+    }
 
-For more details see [Clang](dsl/org.gradle.nativebinaries.toolchain.Clang.html) and [GCC](dsl/org.gradle.nativebinaries.toolchain.Gcc.html).
+Here is an example usage of publishing an artifact to an Ivy repository hosted on a SFTP server:
 
-### Improved Visual Studio project file generation (i)
+    apply plugin: 'java'
+    apply plugin: 'ivy-publish'
 
-Gradle 1.11 added support for [generating Visual Studio configuration files](http://www.gradle.org/docs/current/release-notes#generate-visual-studio-configuration-for-a-native-binary-project).
-This feature has been improved in the following ways in Gradle 1.12:
+    version = '2'
+    group = 'org.group.name'
 
-* Visual studio log files are generated into `.vs` instead of the project directory
-* Project files are named by `ProjectNativeComponent.name` instead of `ProjectNativeComponent.baseName`
-* Header files co-located with source files are now include in the generated project
+    publishing {
+        repositories {
+            ivy {
+                url 'sftp://127.0.0.1:22/repo'
+                credentials {
+                    username 'sftp'
+                    password 'sftp'
+                }
+                layout 'maven'
+            }
+        }
+        publications {
+            ivy(IvyPublication) {
+                from components.java
+            }
+        }
+    }
 
-### Updated mapping of dependencies to IDEA classpath scopes
 
-There were changes in IDEA project mapping related to bug reports [GRADLE-2017] and [GRADLE-2231]. Projects generated by the [IDEA plugin](userguide/idea_plugin.html) now
-better map project dependencies to classpath scopes in IDEA modules.
+### Consumed Apache Maven POM profile activation through absence of system property
 
-### Easier debugging of JVM `Test` and `JavaExec` processes (i)
+On top of the support for POM profiles that [are active by default](http://books.sonatype.com/mvnref-book/reference/profiles-sect-activation.html), a profile also becomes active if the
+corresponding system property is _not_ set. The following POM file demonstrates such a use case:
 
-The [`Test`](dsl/org.gradle.api.tasks.testing.Test.html) and [`JavaExec`](dsl/org.gradle.api.tasks.JavaExec.html) tasks both now support a `--debug-jvm` invocation time switch, which is equivalent
-to setting the `debug` property of these tasks to `true`.
+    <project>
+        ...
+        <profiles>
+            <profile>
+                <id>profile-1</id>
+                <property>
+                    <name>!env</name>
+                </property>
+            </profile>
+        </profiles>
+    </project>
 
-This makes it easy, for example, to launch the application in debug mode when using the [Application plugin](userguide/application_plugin.html)…
+### Allow control of the exact set of arguments passed to a toolchain executable
 
-<pre><tt>gradle run --debug-jvm</tt></pre>
+Gradle now provides a 'hook' allowing the build author to control the exact set of arguments passed a toolchain executable.
+This will allow a build author to work around any limitations in Gradle, or incorrect assumptions that Gradle makes.
 
-This starts the JVM process in debug mode, and halts the process until a debugger attaches on port 5005.
-The same can be done for any [`Test`](dsl/org.gradle.api.tasks.testing.Test.html) task.
+    apply plugin:'cpp'
 
-### Source and Javadoc artifacts declared in ivy.xml are recognised by IDE plugins
+    model {
+        toolChains {
+            visualCpp(VisualCpp) {
+                cppCompiler.withArguments { args ->
+                    args << "-DFRENCH"
+                }
+            }
+            clang(Clang){
+                cCompiler.withArguments { args ->
+                    Collections.replaceAll(args, "CUSTOM", "-DFRENCH")
+                }
+                linker.withArguments { args ->
+                    args.remove "CUSTOM"
+                }
+                staticLibArchiver.withArguments { args ->
+                    args.remove "CUSTOM"
+                }
+            }
 
-The Gradle `eclipse` and `idea` plugins are able to find and download the source artifacts for external dependencies, and link
-these artifacts into the generated IDE files.
+        }
+    }
 
-In addition to the conventional classifier-based scheme for locating source and javadoc artifacts, Gradle will now recognise
-artifacts declared in a specific configuration of an `ivy.xml` file.
+### Support for adding target platform specific configurations in native binary projects (Gcc based toolchains)
+
+When declaring a toolchain, the targetted platforms can be configured directly in the toolChain model. Furthermore target platform specific configurations
+can be declared:
+
+	model {
+	    toolChains {
+	        gcc(Gcc) {
+	            target("arm"){
+	                cppCompiler.executable = "custom-gcc"
+	                cppCompiler.withArguments { args ->
+	                    args << "-m32"
+	                }
+	                linker.withArguments { args ->
+	                    args << "-m32"
+	                }
+	            }
+	            target("sparc")
+	        }
+	    }
+		platforms {
+			arm {
+		    	architecture "arm"
+			}
+			sparc {
+		    	architecture "sparc"
+			}
+		}
+
+### New 'ivy' layout support for Ivy repositories
+
+When defining an 'ivy' repository, you can provide a named layout to describe how artifacts are organised within that repository.
+
+In addition to the 'gradle' (default) and 'maven' layouts, you can now specify the 'ivy' layout which tells Gradle that your repository
+is configured with the default ivy artifact and metadata patterns.
+
+    repositories {
+        ivy {
+            url 'http://my.server/repo'
+            layout 'ivy'
+        }
+    }
 
-For an IDE project that references an external module located in an `ivy` repository, Gradle will now include:
+See the [User Guide](userguide/dependency_management.html#N150B8) and the
+<a href="dsl/org.gradle.api.artifacts.repositories.IvyArtifactRepository.html#org.gradle.api.artifacts.repositories.IvyArtifactRepository:layout(java.lang.String, groovy.lang.Closure)">
+DSL Reference</a> for more detail on how to use named layouts.
 
-* Source artifacts declared in a `sources` configuration in `ivy.xml`
-* Javadoc artifacts declared in a `javadoc` configuration in `ivy.xml`
-* Source artifacts conventionally named with a `sources` classifier: eg. `module-1.0-sources.jar`
-* Javadoc artifacts conventionally named with a `javadoc` classifier: eg. `module-1.0-javadoc.jar`
+## Promoted features
 
-### HTTPS wrapper downloads
+Promoted features are features that were incubating in previous versions of Gradle but are now supported and subject to backwards compatibility.
+See the User guide section on the “[Feature Lifecycle](userguide/feature_lifecycle.html)” for more information.
 
-The [Gradle Wrapper](userguide/gradle_wrapper.html) is now downloaded over HTTPS.
-The `gradle-wrapper.properties` file created by the `wrapper` task will now specify a HTTPS URL as the location of the Gradle distribution to download.
+The following are the features that have been promoted in this Gradle release.
 
-Existing projects should consider updating the `gradle/wrapper/gradle-wrapper.properties` file to use `https` instead of `http` for the `distributionUrl` property value.
-No other change to the URL is necessary.
+<!--
+### Example promoted
+-->
 
 ## Fixed issues
 
 ## Deprecations
 
 Features that have become superseded or irrelevant due to the natural evolution of Gradle become *deprecated*, and scheduled to be removed
-in the next major Gradle version (Gradle 2.0). See the User guide section on the “[Feature Lifecycle](userguide/feature_lifecycle.html)” for more information.
+in the next major Gradle version (Gradle 3.0). See the User guide section on the “[Feature Lifecycle](userguide/feature_lifecycle.html)” for more information.
 
 The following are the newly deprecated items in this Gradle release. If you have concerns about a deprecation, please raise it via the [Gradle Forums](http://forums.gradle.org).
 
-### Tooling API version compatibility
+<!--
+### Example deprecation
+-->
 
-The [Tooling API](userguide/embedding.html) is a mechanism for embedding Gradle and/or driving Gradle programmatically.
-It is used by IDEs and other _tooling_ to integrate with Gradle.
+## Potential breaking changes
 
-* Connecting to 1.0-milestone-8 and earlier providers is now deprecated and will not be supported in Gradle 2.0. This means that the Gradle 2.0 Tooling API client will
-not be able to run builds that use Gradle 1.0-milestone-8 and earlier.
-* Client versions older than 1.2 are now deprecated and will not be supported in Gradle 2.0. This means that the Gradle 1.2 and earlier Tooling API clients will not
-be able to run builds that use Gradle 2.0 and later.
+### Upgraded to Groovy 2.2.2
 
-If your project is building with Gradle 1.0-milestone-8 or earlier, you are __strongly__ encouraged to upgrade to a more recent Gradle version.
-All versions of integrating tools released since the release of Gradle 1.2 (September 2012) should be using a Tooling API client newer than version 1.2.
+Gradle now uses Groovy 2.2.2 to compile and run scripts and plugins. Generally, this should be backwards compatible. However, this change may require
+that you recompile some plugins and may also require some source changes.
 
-### Deprecated method in Tooling API
+### Custom TestNG listeners are applied before Gradle's listeners
 
-The <a href="javadoc/org/gradle/tooling/model/Task.html#getProject()">`org.gradle.tooling.model.Task.getProject()`</a> method is now deprecated and
-can throw `UnsupportedMethodException`. There is no replacement as it is expected that the caller has a reference to project prior calling to this method.
+This way the custom listeners are more robust because they can affect the test status.
+There should be no impact of this change because majority of users do not employ custom listeners
+and even if they do healthy listeners will work correctly regardless of the listeners' order.
 
-## Potential breaking changes
+### Support for reading or changing file permissions on certain platforms with Java 5 or 6
+
+Gradle previously supported file permissions on Solaris and Linux ia-64 using Java 5 and Java 6. This support has
+been removed. You will receive a warning when attempting to use file permissions on these platforms.
+
+Note that file permissions are supported on these platforms when you use Java 7 and later, and is supported for all Java
+versions on Linux, OS X, Windows and FreeBSD for x86 and amd64 architectures.
+
+If you wish to have support for file permissions on other platforms and architectures, please help us out with porting our
+native integration to these platforms.
 
-### Incremental Scala compilation
+### Support for terminal integration on certain platforms
 
-The version of the Scala incremental compiler, Zinc, that Gradle uses has been upgraded to a version 0.3.0.
-This might be a breaking change for users who explicitly configured an early version of zinc in their build scripts.
-There should be very few such users, if any.
+Gradle previously supported terminal integration on Solaris and Linux ia-64. This support has been removed. When you use Gradle on these
+platforms, Gradle will fall back to using plain text output.
 
-### Changes to incubating native support
+Note that terminal integration is supported on Linux, OS X, Windows and FreeBSD for x86 and amd64 architectures.
 
-* '-Xlinker' is no longer automatically added to linker args for GCC or Clang. If you want to pass an argument directly to 'ld' you need to add this escape yourself.
-* Tasks for Windows resource compilation are now named 'compileXXXX' instead of 'resourceCompileXXX'.
+If you wish to have terminal integration on other platforms and architectures, please help us out with porting our
+native integration to these platforms.
 
-### Change to JUnit XML file for skipped tests
+### Build scripts must be encoded using UTF-8
 
-The way that skipped/ignored tests are represented in the JUnit XML output file produced by the `Test` task.
-Gradle now produces the same output, with regard to skipped tests, as Apache Ant and Apache Maven.
-This format is accepted, and expected, by all major Continuous Integration servers.
+Gradle now assumes that all Gradle scripts are encoded using UTF-8. Previously, Gradle assumed the system encoding. This change
+affects all build scripts, settings scripts and init scripts.
 
-This change is described as follows:
+### Native binaries model changes
 
-1. The `testsuite` element now contains a `skipped` attribute, indicating the number of skipped tests (may be 0)
-2. The element representing a test case is now always named `testcase` (previously it was named `ignored-testcase` if it was a skipped test)
-3. If a test case was skipped, a child `<skipped/>` element will be present
+A bunch of changes and renames have been made to the incubating 'native binaries' support.
+For certain common usages, a backward-compatible api has been maintained.
 
-No changes are necessary to build scripts or Continuous Integration server configuration to accommodate this change.
+- Package structure has changed, with many public classes being moved.
+- `Library`, `Executable` and `TestSuite` renamed to `NativeLibrary`, `NativeExecutable` and `NativeTestSuite`
+    - Related binary types have also been renamed
+    - Kept `StaticLibraryBinary`, `SharedLibraryBinary`, `ExecutableBinary` and `TestSuiteExecutableBinary` for compatibility
+- `NativeBinariesPlugin` has been renamed to `NativeComponentPlugin` with id `'native-component'`
+- `NativeBinariesModelPlugin` renamed to `NativeComponentModelPlugin`
+- `BuildableModelElement.lifecycleTask` renamed to `buildTask`
+- `NativeBinaryTasks.getBuilder()` renamed to `getCreateOrLink()`
+- `NativeBinaryTasks.getLifecycle()` renamed to `getBuild()`
+- `BuildBinaryTask` renamed to `ObjectFilesToBinary`
 
-### Ordering of dependencies in imported Ant builds
+### New Java component model changes
 
-The ordering of Ant target dependencies is now respected when possible.
-This may cause tasks of imported Ant builds to executed in a different order from this version of Gradle on.
+A bunch of changes and renames have been made to the new, incubating 'java component' support.
 
-Given…
+- Package structure has changed, with many public classes being moved.
 
-    <target name='a' depends='d,c,b'/>
+### Support for the Gradle Open API removed
 
-A shouldRunAfter [task ordering](userguide/more_about_tasks.html#sec:ordering_tasks) will be applied to the dependencies so that,
-`c.shouldRunAfter d` and `b.shouldRunAfter c`.
+- `GradleRunnerFactory` removed.
+- `UIFactory` removed.
+- `ExternalUtility` removed.
 
-This is in alignment with Ant's ordering of target dependencies and resolves a long standing Gradle enhancement request [GRADLE-1102].
+### Removed Deprecated Plugins
 
-### Invalid large zip files now fail the build
+- `code-quality` plugin replaced by `checkstyle` and `codenarc`.
 
-If a zip file is built without the `zip64` flag (new in this release) set to true that surpasses the file size and count limits
-of the zip format, Gradle will now fail the build.
-Previously, it may have silently created an invalid zip.
+### Removed Deprecated Classes
 
-To allow the large zip to be correctly built, set the `zip64` property of the task to `true`.
+- `GradleLauncher` replaced by the tooling API.
+- `Compile` replaced by `JavaCompile`.
+- `org.gradle.api.tasks.Directory` with no replacement.
+- `CodeQualityPlugin` replaced by the `checkstyle` and `codenarc` plugins.
+- `GroovyCodeQualityPluginConvention` with no replacement.
+- `JavaCodeQualityPluginConvention` with no replacement.
+- `IllegalOperationAtExecutionTimeException` with no replacement.
+- `AntJavadoc` with no replacement.
 
-### Change to signature of `Test.filter(Closure)`
+### Removed Deprecated Methods
 
-The incubating `Test.filter(Closure)` method introduced in 1.10 for configuring the `TestFilter` has been changed to be more consistent with other configuration methods.
-This method now accepts an `Action` and no longer returns the `TestFilter`.
-This change should not require any adjustments to build scripts as this method can still be called with a `Closure`, upon which it will be implicitly converted into an `Action`.
+- `Project.dir()` replaced with `mkdir()`
+- `Project.dependsOn()` replaced with task dependencies.
+- `Project.childrenDependOnMe()` replaced with task dependencies.
+- `Project.dependsOnChildren()` replaced with task dependencies.
+- `Project.getDependsOnProjects()` with no replacement.
+- `Test.isTestReport()` replaced with `getReports().getHtml().isEnabled()`.
+- `Test.disableTestReport()` replaced with `getReports().getHtml().setEnabled()`.
+- `Test.enableTestReport()` replaced with `getReports().getHtml().setEnabled()`.
+- `Test.setTestReport()` replaced with `getReports().getHtml().setEnabled()`.
+- `Test.getTestResultsDir()` replaced with `getReports().getJunitXml().getDestination()`.
+- `Test.setTestResultsDir()` replaced with `getReports().getJunitXml().setDestination()`.
+- `Test.getTestReportDir()` replaced with `getReports().getHtml().getDestination()`.
+- `Test.setTestReportDir()` replaced with `getReports().getHtml().setDestination()`.
+- `CompileOptions.getFailOnError()` replaced with `isFailOnError()`
+- `CompileOptions.getDebug()` replaced with `isDebug()`
+- `StartParameter.getMergedSystemProperties()` with no replacement.
+- `Specs.filterIterable()` with no replacement.
 
-### Change to signature of `IdeaModule.singleEntryLibraries`
+### Removed Deprecated Properties
 
-The property `IdeaModule.singleEntryLibraries` was previously declared as a `Map` with values of type `Collection<File>`. The values are in fact `Iterable<File>` and
-the type signature has been updated.
+- `CompileOptions.compiler` replaced with `CompileOptions.fork` and `CompileOptions.forkOptions.executable`
+- `CompileOptions.useAnt` with no replacement.
+- `CompileOptions.optimize` with no replacement.
+- `CompileOptions.includeJavaRuntime` with no replacement.
+- `GroovyCompileOptions.useAnt` with no replacement.
+- `GroovyCompileOptions.stacktrace` with no replacement.
+- `GroovyCompileOptions.includeJavaRuntime` with no replacement.
+- `Checkstyle.properties` replaced with `Checkstyle.configProperties`.
+- `Checkstyle.resultFile` replaced with `Checkstyle.reports.xml.destination`.
+- `CodeNarc.reportFormat` replaced with `CodeNarc.reports.<type>.enabled`.
+- `CodeNarc.reportFile` replaced with `CodeNarc.reports.<type>.destination`.
+- `ResolvedArtifact.resolvedDependency` with `ResolvedArtifact.moduleVersion` as a partial replacement.
+
+### Removed incubating method
+
+- `StartParameter.setProjectPath` and `StartParameter.getProjectPath` were replaced with `TaskParameter`.
+
+### Task constructor changes
+
+All task types now have a zero args constructor. The following types are affected:
+
+- `org.gradle.api.tasks.testing.Test`
+- `org.gradle.api.tasks.Upload`
+- `org.gradle.api.plugins.quality.Checkstyle`
+- `org.gradle.api.plugins.quality.CodeNarc`
+- `org.gradle.api.plugins.quality.FindBugs`
+- `org.gradle.api.plugins.quality.Pmd`
+- `org.gradle.api.plugins.quality.JDepend`
+- `org.gradle.testing.jacoco.tasks.JacocoReport`
+- `org.gradle.api.tasks.GradleBuild`
+- `org.gradle.api.tasks.diagnostics.DependencyInsightReportTask`
+- `org.gradle.api.reporting.GenerateBuildDashboard`
+- `org.gradle.api.publish.ivy.tasks.GenerateIvyDescriptor`
+- `org.gradle.api.publish.maven.tasks.GenerateMavenPom`
+- `org.gradle.api.publish.maven.tasks.PublishToMavenRepository`
+- `org.gradle.api.publish.maven.tasks.PublishToMavenLocal`
+- `org.gradle.nativebinaries.tasks.InstallExecutable`
+- `org.gradle.api.plugins.buildcomparison.gradle.CompareGradleBuilds`
 
 ## External contributions
 
 We would like to thank the following community members for making contributions to this release of Gradle.
 
-* [Marcin Erdmann](https://github.com/erdi)
-    * dependency ordering of imported Ant targets [GRADLE-1102]
-    * fixes for excluding tasks [GRADLE-2974] & [GRADLE-3031]
-* [Jesse Glick](https://github.com/jglick) - enabling newlines in option values passed to build
-* [Zeeke](https://github.com/zeeke) - documentation improvements
-* [Kamil Szymański](https://github.com/kamilszymanski) - documentation improvements
-* [Jakub Kubryński](https://github.com/jkubrynski) - handling of empty string proxy system property values
-* [Lee Symes](https://github.com/leesdolphin) & [Greg Temchenko](https://github.com/soid) - fix skipped test representation in JUnit XML result files [GRADLE-2731]
-* [Ivan Vyshnevskyi](https://github.com/sainaen) - Fixes to HTML test report
-* [Vincent Cantin](https://github.com/green-coder) - documentation improvements
-* [Sterling Greene](https://github.com/big-guy) - Support for developing Gradle in Eclipse
-* [Matthew Michihara](https://github.com/matthewmichihara) - Documentation improvements
-* [Andrew Oberstar](https://github.com/ajoberstar) - Improved Sonar support on Java 1.5 [GRADLE-3005]
-* [Mark Johnson](https://github.com/elucify) - documentation improvements
-* [Paul Merlin](https://github.com/eskatos) - ignored tests tab for HTML test report
-* [Jason Gauci](https://github.com/MisterTea) - Support for large zips
-* [Zsolt Kúti](https://github.com/tinca) - Fixes for Gradle on FreeBSD
-* [Rich Jones](https://github.com/Miserlou) - HTTPS URLs for wrapper downloads
+* [Marcin Erdmann](https://github.com/erdi) - Support an ivy repository declared with 'sftp' as the URL scheme
+* [Lukasz Kryger](https://github.com/kryger) - Documentation improvements
+* [Ben McCann](https://github.com/benmccann) - Added named 'ivy' layout to 'ivy' repositories
+* [Alex Selesse](https://github.com/selesse) - Fixed announce plugin in headless mode on OS X
 
 We love getting contributions from the Gradle community. For information on contributing, please see [gradle.org/contribute](http://gradle.org/contribute).
 
diff --git a/subprojects/docs/src/docs/userguide/commandLineTutorial.xml b/subprojects/docs/src/docs/userguide/commandLineTutorial.xml
index 733ea45f0fcd..809e9e835007 100644
--- a/subprojects/docs/src/docs/userguide/commandLineTutorial.xml
+++ b/subprojects/docs/src/docs/userguide/commandLineTutorial.xml
@@ -157,7 +157,7 @@
         <section id="sec:show_task_details">
             <title>Show task usage details</title>
             <para>Running <userinput>gradle help --task someTask</userinput> gives you detailed information about a specific task or multiple
-                tasks matching the given task name in your multiproject build <!--TODO RG ref multiproject-->
+                tasks matching the given task name in your multiproject build.
                 Below is an example of this detailed information:
             </para>
             <sample id="taskHelp" dir="userguide/tutorial/projectReports" title="Obtaining detailed help for tasks">
diff --git a/subprojects/docs/src/docs/userguide/depMngmt.xml b/subprojects/docs/src/docs/userguide/depMngmt.xml
index 7fe1cf6ed6f5..d1807dce4dbe 100644
--- a/subprojects/docs/src/docs/userguide/depMngmt.xml
+++ b/subprojects/docs/src/docs/userguide/depMngmt.xml
@@ -683,6 +683,50 @@
             </tr>
         </table>
 
+        <section id='sub:supported_transport_protocols'>
+            <title>Supported repository transport protocols</title>
+            <para>Maven and Ivy repositories support the use of various transport protocols. At the moment the following protocols are supported:
+            </para>
+            <table>
+                <title>Repository transport protocols</title>
+                <thead>
+                    <tr>
+                        <td>Type</td>
+                        <td>Authentication schemes</td>
+                    </tr>
+                </thead>
+                <tr>
+                    <td><literal>file</literal></td>
+                    <td>none</td>
+                </tr>
+                <tr>
+                    <td><literal>http</literal></td>
+                    <td>username/password</td>
+                </tr>
+                <tr>
+                    <td><literal>https</literal></td>
+                    <td>username/password</td>
+                </tr>
+                <tr>
+                    <td><literal>sftp</literal></td>
+                    <td>username/password</td>
+                </tr>
+            </table>
+            <para>To define a repository use the <literal>repositories</literal> configuration block. Within the <literal>repositories</literal> closure,
+                a Maven repository is declared with <literal>maven</literal>. An Ivy repository is declared with <literal>ivy</literal>. The transport protocol
+                is part of the URL definition for a repository. The following build script demonstrates how to create a HTTP-based Maven and Ivy repository:
+            </para>
+            <sample id="mavenIvyRepositoriesNoAuth" dir="userguide/artifacts/defineRepository" title="Declaring a Maven and Ivy repository">
+                <sourcefile file="build.gradle" snippet="maven-ivy-repository-no-auth"/>
+            </sample>
+            <para>If authentication is required for a repository, the relevant credentials can be provided. The following example shows how to provide
+                username/password-based authentication for SFTP repositories:
+            </para>
+            <sample id="mavenIvyRepositoriesAuth" dir="userguide/artifacts/defineRepository" title="Providing credentials to a Maven and Ivy repository">
+                <sourcefile file="build.gradle" snippet="maven-ivy-repository-auth"/>
+            </sample>
+        </section>
+
         <section id='sub:maven_central'>
             <title>Maven central repository</title>
             <para>To add the central Maven 2 repository (<ulink url='http://repo1.maven.org/maven2'/>) simply add this to your build script:
@@ -764,43 +808,48 @@
 
         <section id="sec:ivy_repositories">
             <title>Ivy repositories</title>
-            <para>To use an Ivy repository with a standard layout:</para>
-            <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository">
-                <sourcefile file="build.gradle" snippet="ivy-repo-with-maven-layout"/>
-            </sample>
-            <para>See
-                <apilink class="org.gradle.api.artifacts.repositories.IvyArtifactRepository"/>
-                for details.
-            </para>
             <section>
-                <title>Defining custom patterns for an Ivy repository</title>
-                <para>To define an Ivy repository with a non-standard layout, you can define a pattern layout for the repository:
-                </para>
-                <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository with pattern layout">
-                    <sourcefile file="build.gradle" snippet="ivy-repo-with-pattern-layout"/>
+                <title>Defining an Ivy repository with a standard layout</title>
+                <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository">
+                    <sourcefile file="build.gradle" snippet="ivy-repo"/>
                 </sample>
             </section>
             <section>
-                <title>Ivy repository with Maven compatible layout</title>
-                <para>Optionally, a repository with pattern layout can have its 'organisation' part laid out in Maven style, with
-                    forward slashes replacing dots as separators. For example, the organisation <literal>my.company</literal> would then be represented as <literal>my/company</literal>.
+                <title>Defining a named layout for an Ivy repository</title>
+                <para>
+                    You can specify that your repository conforms to the Ivy or Maven default layout by using a named layout.
                 </para>
-                <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository with Maven compatible layout">
-                    <sourcefile file="build.gradle" snippet="ivy-repo-with-m2compatible-layout"/>
+                <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository with named layout">
+                    <sourcefile file="build.gradle" snippet="ivy-repo-with-maven-layout"/>
                 </sample>
+                <para>
+                    Valid named layout values are <literal>'gradle'</literal> (the default), <literal>'maven'</literal> and <literal>'ivy'</literal>.
+                    See <apilink class="org.gradle.api.artifacts.repositories.IvyArtifactRepository" method="layout(java.lang.String, groovy.lang.Closure)"/> for details of these named layouts.
+                </para>
             </section>
             <section>
-                <title>Defining different artifact and Ivy file locations for an Ivy repository</title>
-                <para>To define an Ivy repository which fetches Ivy files and artifacts from different locations, you can use the pattern layout with separate patterns to use to locate
-                    the Ivy files and artifacts:
+                <title>Defining custom pattern layout for an Ivy repository</title>
+                <para>To define an Ivy repository with a non-standard layout, you can define a 'pattern' layout for the repository:
                 </para>
-                <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository with custom patterns">
-                    <sourcefile file="build.gradle" snippet="ivy-repo-with-custom-pattern"/>
+                <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository with pattern layout">
+                    <sourcefile file="build.gradle" snippet="ivy-repo-with-pattern-layout"/>
                 </sample>
+                <para>To define an Ivy repository which fetches Ivy files and artifacts from different locations,
+                    you can define separate patterns to use to locate the Ivy files and artifacts:
+                </para>
                 <para>
-                    Each <literal>artifact</literal> or <literal>ivy</literal> specified for a repository adds an <emphasis>additional</emphasis> pattern to use. The patterns are used in the order
-                    that they are defined.
+                    Each <literal>artifact</literal> or <literal>ivy</literal> specified for a repository adds an <emphasis>additional</emphasis> pattern to use.
+                    The patterns are used in the order that they are defined.
                 </para>
+                <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository with multiple custom patterns">
+                    <sourcefile file="build.gradle" snippet="ivy-repo-with-custom-pattern"/>
+                </sample>
+                <para>Optionally, a repository with pattern layout can have its 'organisation' part laid out in Maven style, with
+                    forward slashes replacing dots as separators. For example, the organisation <literal>my.company</literal> would then be represented as <literal>my/company</literal>.
+                </para>
+                <sample id="ivyRepository" dir="userguide/artifacts/defineRepository" title="Ivy repository with Maven compatible layout">
+                    <sourcefile file="build.gradle" snippet="ivy-repo-with-m2compatible-layout"/>
+                </sample>
             </section>
             <section>
                 <title>Accessing password protected Ivy repositories</title>
@@ -829,7 +878,11 @@
             </para>
             <itemizedlist>
                 <listitem>
-                    <para>There are many options for the protocol to communicate with the repository (e.g. filesystem, http, ssh, ...)
+                    <para>There are many options for the protocol to communicate with the repository (e.g. filesystem, http, ssh, sftp ...)
+                    </para>
+                </listitem>
+                <listitem>
+                    <para>The protocol sftp currently only supports username/password-based authentication.
                     </para>
                 </listitem>
                 <listitem>
diff --git a/subprojects/docs/src/docs/userguide/embedding.xml b/subprojects/docs/src/docs/userguide/embedding.xml
index 32f6591d8688..0b349a08d118 100644
--- a/subprojects/docs/src/docs/userguide/embedding.xml
+++ b/subprojects/docs/src/docs/userguide/embedding.xml
@@ -68,13 +68,6 @@
                 </listitem>
             </itemizedlist>
         </para>
-
-        <para>The Tooling API is the official and recommended way to embed Gradle.
-            This means that the existing APIs, namely <apilink class="org.gradle.GradleLauncher"/>
-            and the open API (the UIFactory and friends),
-            are deprecated and will be removed in some future version of Gradle.
-            If you happen to use one of the above APIs, please consider changing your application to use the tooling API instead.
-        </para>
     </section>
 
     <section id='sec:embedding_daemon'>
diff --git a/subprojects/docs/src/docs/userguide/gradleWrapper.xml b/subprojects/docs/src/docs/userguide/gradleWrapper.xml
index 3c1b51996d69..bbda510dfbff 100644
--- a/subprojects/docs/src/docs/userguide/gradleWrapper.xml
+++ b/subprojects/docs/src/docs/userguide/gradleWrapper.xml
@@ -16,7 +16,7 @@
 <chapter id='gradle_wrapper'>
     <title>The Gradle Wrapper</title>
     <para>
-        The Gradle Wrapper (henceforth referred to as the “wrapper) is the preferred way of starting a Gradle build. The wrapper
+        The Gradle Wrapper (henceforth referred to as the “wrapper”) is the preferred way of starting a Gradle build. The wrapper
         is a batch script on Windows, and a shell script for other operating systems. When you start a Gradle build via the wrapper,
         Gradle will be automatically downloaded and used to run the build. 
     </para>
diff --git a/subprojects/docs/src/docs/userguide/groovyPlugin.xml b/subprojects/docs/src/docs/userguide/groovyPlugin.xml
index 8754dab61406..8176c37278b7 100644
--- a/subprojects/docs/src/docs/userguide/groovyPlugin.xml
+++ b/subprojects/docs/src/docs/userguide/groovyPlugin.xml
@@ -312,8 +312,7 @@
         <title>GroovyCompile</title>
         <para>The Groovy plugin adds a <apilink class="org.gradle.api.tasks.compile.GroovyCompile"/> task for
             each source set in the project. The task type extends the <literal>JavaCompile</literal>
-            task (see <xref linkend='sec:compile'/>). Unless <literal>groovyOptions.useAnt</literal> is set to <literal>true</literal>,
-            Gradle's native Groovy compiler integration is used. For most projects, this is the better choice than the Ant-based compiler.
+            task (see <xref linkend='sec:compile'/>).
             The <literal>GroovyCompile</literal> task supports most configuration options of the official Groovy compiler.
         </para>
         <table>
diff --git a/subprojects/docs/src/docs/userguide/javaPlugin.xml b/subprojects/docs/src/docs/userguide/javaPlugin.xml
index 7c79347c3c8b..7db71c880be2 100644
--- a/subprojects/docs/src/docs/userguide/javaPlugin.xml
+++ b/subprojects/docs/src/docs/userguide/javaPlugin.xml
@@ -1092,10 +1092,6 @@
             </tr>
         </table>
 
-        <para>The compile task delegates to Ant's javac task. Setting <literal>options.useAnt</literal> to <literal>false</literal>
-            activates Gradle's direct compiler integration, bypassing the Ant task. In a future Gradle release, this will become the default.
-        </para>
-
         <para>By default, the Java compiler runs in the Gradle process. Setting <literal>options.fork</literal> to <literal>true</literal>
             causes compilation to occur in a separate process. In the case of the Ant javac task, this means that a new process will be
             forked for each compile task, which can slow down compilation. Conversely, Gradle's direct compiler integration (see above) will
@@ -1339,10 +1335,6 @@
                 <listitem><para>Results in an efficient binary format. The task generates the other results from these binary results.</para></listitem>
             </itemizedlist>
 
-            <para>You can disable the HTML test report using the <apilink class="org.gradle.api.tasks.testing.Test" method="setTestReport"/> method. The other
-                results currently cannot be disabled.
-            </para>
-
             <para>There is also a stand-alone <apilink class="org.gradle.api.tasks.testing.TestReport"/> task type which can generate the HTML test
                 report from the binary results generated by one or more <classname>Test</classname> task instances. To use this task type, you need
                 to define a <literal>destinationDir</literal> and the test results to include in the report. Here is a sample which generates a
diff --git a/subprojects/docs/src/docs/userguide/javaTutorial.xml b/subprojects/docs/src/docs/userguide/javaTutorial.xml
index d1e7c98f4a5b..cd8fdc30c066 100644
--- a/subprojects/docs/src/docs/userguide/javaTutorial.xml
+++ b/subprojects/docs/src/docs/userguide/javaTutorial.xml
@@ -101,7 +101,7 @@
                     <term>check</term>
                     <listitem>
                         <para>Compiles and tests your code. Other plugins add more checks to this task. For example, if
-                            you use the Code-quality plugin, this task will also run Checkstyle against your source
+                            you use the <literal>checkstyle</literal> plugin, this task will also run Checkstyle against your source
                             code.
                         </para>
                     </listitem>
diff --git a/subprojects/docs/src/docs/userguide/nativeBinaries.xml b/subprojects/docs/src/docs/userguide/nativeBinaries.xml
index d42f5eb7f96a..1a5910f7f839 100755
--- a/subprojects/docs/src/docs/userguide/nativeBinaries.xml
+++ b/subprojects/docs/src/docs/userguide/nativeBinaries.xml
@@ -24,17 +24,32 @@
     </note>
 
     <para>
-        The various native binary plugins add support for building native software components from C++, C, Objective-C, Objective-C++ and Assembler sources.
+        The various native binary plugins add support for building native software components, such as executables or shared libraries, from C++, C and other languages.
         While many excellent build tools exist for this space of software development, Gradle offers developers it's trademark power and flexibility
         together with the dependency management practices more traditionally found in the JVM development space.
     </para>
 
+    <section>
+        <title>Supported languages</title>
+        <para>
+            The following source languages are currently supported:
+        </para>
+        <itemizedlist>
+            <listitem><para>C</para></listitem>
+            <listitem><para>C++</para></listitem>
+            <listitem><para>Objective-C</para></listitem>
+            <listitem><para>Objective-C++</para></listitem>
+            <listitem><para>Assembly</para></listitem>
+            <listitem><para>Windows resources</para></listitem>
+        </itemizedlist>
+    </section>
+
     <section id="native-binaries:tool-chain-support">
         <title>Tool chain support</title>
         <para>
             Gradle offers the ability to execute the same build using different tool chains. You can control which tool chain will be used to build
             by changing the operating system PATH to include the desired tool chain compiler. Alternatively, you can configure the tool chains directly,
-            as described in the `Native Binary Variants` section, below.
+            as described in <xref linkend="native_binaries:tool_chain"/>.
         </para>
         <para>
             The following tool chains are supported:
@@ -50,34 +65,40 @@
                 <td>Linux</td><td><ulink url="http://clang.llvm.org">Clang</ulink></td><td></td>
             </tr>
             <tr>
-                <td>Mac OS X</td><td><ulink url="http://gcc.gnu.org/">GCC</ulink></td><td>Using GCC distributed with XCode.</td>
+                <td>Mac OS X</td><td>XCode</td><td>Uses the Clang tool chain bundled with XCode.</td>
+            </tr>
+            <tr>
+                <td>Mac OS X</td><td><ulink url="http://gcc.gnu.org/">GCC</ulink></td><td></td>
             </tr>
             <tr>
-                <td>Mac OS X</td><td><ulink url="http://clang.llvm.org">Clang</ulink></td><td>Using Clang distributed with XCode.</td>
+                <td>Mac OS X</td><td><ulink url="http://clang.llvm.org">Clang</ulink></td><td></td>
             </tr>
             <tr>
                 <td>Windows</td><td><ulink url="http://www.microsoft.com/visualstudio/en-us">Visual C++</ulink></td><td>Windows XP and later, Visual C++ 2010 and later.</td>
             </tr>
             <tr>
-                <td>Windows</td><td><ulink url="http://gcc.gnu.org/">GCC</ulink></td><td>Windows XP and later, using GCC distributed with Cygwin.</td>
+                <td>Windows</td><td><ulink url="http://gcc.gnu.org/">GCC</ulink> with <ulink url="http://cygwin.com">Cywin 32</ulink></td><td>Windows XP and later. Cygwin 64 is currently not supported.</td>
             </tr>
             <tr>
-                <td>Windows</td><td><ulink url="http://www.mingw.org/">MinGW</ulink></td><td>Windows XP and later.</td>
+                <td>Windows</td><td><ulink url="http://gcc.gnu.org/">GCC</ulink> with <ulink url="http://www.mingw.org/">MinGW</ulink></td><td>Windows XP and later. <ulink url="http://mingw-w64.sourceforge.net">Mingw-w64</ulink> is currently not supported.</td>
             </tr>
         </table>
+        <para>
+            The native plugins should generally work on other UNIX-like platforms, but are currently officially supported on the above platforms only.
+        </para>
     </section>
 
     <section>
         <title>Component model</title>
         <para>
-            A native binary project defines a set of <apilink class="org.gradle.nativebinaries.Executable"/> and <apilink class="org.gradle.nativebinaries.Library"/> components,
+            A native binary project defines a set of <apilink class="org.gradle.nativebinaries.NativeExecutable"/> and <apilink class="org.gradle.nativebinaries.NativeLibrary"/> components,
             each of which Gradle maps to a number of <apilink class="org.gradle.nativebinaries.NativeBinary"/> outputs.
             For each <literal>executable</literal> or <literal>library</literal> defined, Gradle adds a <apilink class="org.gradle.language.base.FunctionalSourceSet"/> with the same name.
             Each of these functional source sets will contain a language-specific source set for each of the languages supported by the project.
         </para>
         <para>
             To build either a static or shared native library binary,
-            a <apilink class="org.gradle.nativebinaries.Library"/> component is added to the <literal>libraries</literal> container.
+            a <apilink class="org.gradle.nativebinaries.NativeLibrary"/> component is added to the <literal>libraries</literal> container.
             Each <literal>library</literal> component can produce at least one <apilink class="org.gradle.nativebinaries.SharedLibraryBinary"/>
             and at least one <apilink class="org.gradle.nativebinaries.StaticLibraryBinary"/>.
         </para>
@@ -86,7 +107,7 @@
         </sample>
         <para>
             To build an executable binary,
-            an <apilink class="org.gradle.nativebinaries.Executable"/> component is added to the <literal>executables</literal> container
+            an <apilink class="org.gradle.nativebinaries.NativeExecutable"/> component is added to the <literal>executables</literal> container
             and associated with a set of sources.
         </para>
         <sample id="cppExecutables" dir="native-binaries/c" title="Defining executable components">
@@ -112,13 +133,13 @@
                 <tr><td>Component Type</td><td>Native Binary Type</td><td>Lifecycle task</td><td>Location of created binary</td></tr>
             </thread>
             <tr>
-                <td><apilink class="org.gradle.nativebinaries.Executable"/></td><td><apilink class="org.gradle.nativebinaries.ExecutableBinary"/></td><td><literal><replaceable>$component.name</replaceable>Executable</literal></td><td><filename><replaceable>$buildDir</replaceable>/binaries/<replaceable>$binary.name</replaceable>/<replaceable>$component.name</replaceable></filename></td>
+                <td><apilink class="org.gradle.nativebinaries.NativeExecutable"/></td><td><apilink class="org.gradle.nativebinaries.ExecutableBinary"/></td><td><literal><replaceable>$component.name</replaceable>Executable</literal></td><td><filename><replaceable>$buildDir</replaceable>/binaries/<replaceable>$binary.name</replaceable>/<replaceable>$component.name</replaceable></filename></td>
             </tr>
             <tr>
-                <td><apilink class="org.gradle.nativebinaries.Library"/></td><td><apilink class="org.gradle.nativebinaries.SharedLibraryBinary"/></td><td><literal><replaceable>$component.name</replaceable>SharedLibrary</literal></td><td><filename><replaceable>$buildDir</replaceable>/binaries/<replaceable>$binary.name</replaceable>/lib<replaceable>$component.name</replaceable>.so</filename></td>
+                <td><apilink class="org.gradle.nativebinaries.NativeLibrary"/></td><td><apilink class="org.gradle.nativebinaries.SharedLibraryBinary"/></td><td><literal><replaceable>$component.name</replaceable>SharedLibrary</literal></td><td><filename><replaceable>$buildDir</replaceable>/binaries/<replaceable>$binary.name</replaceable>/lib<replaceable>$component.name</replaceable>.so</filename></td>
             </tr>
             <tr>
-                <td><apilink class="org.gradle.nativebinaries.Library"/></td><td><apilink class="org.gradle.nativebinaries.StaticLibraryBinary"/></td><td><literal><replaceable>$component.name</replaceable>StaticLibrary</literal></td><td><filename><replaceable>$buildDir</replaceable>/binaries/<replaceable>$binary.name</replaceable>/<replaceable>$component.name</replaceable>.a</filename></td>
+                <td><apilink class="org.gradle.nativebinaries.NativeLibrary"/></td><td><apilink class="org.gradle.nativebinaries.StaticLibraryBinary"/></td><td><literal><replaceable>$component.name</replaceable>StaticLibrary</literal></td><td><filename><replaceable>$buildDir</replaceable>/binaries/<replaceable>$binary.name</replaceable>/<replaceable>$component.name</replaceable>.a</filename></td>
             </tr>
         </table>
 
@@ -133,12 +154,20 @@
     </section>
 
     <section id="native_binaries:languages">
-        <title>Core language support: C, C++, Assembler, Objective-C and Objective-C++ </title>
+        <title>Language support</title>
         <para>
-            Presently, Gradle supports building native binaries from any combination of C++, C, Assembler, Objective-C and Objective-C++ sources.
+            Presently, Gradle supports building native binaries from any combination of source languages listed below.
             A native binary project will contain one or more named <literal>FunctionalSourceSet</literal> instances (eg 'main', 'test', etc),
-            each of which can contain <literal>LanguageSourceSet</literal>s containing C++, C, Assembler, Objective-C or Objective-C++ source files.
+            each of which can contain <literal>LanguageSourceSet</literal>s containing source files, one for each language.
         </para>
+        <itemizedlist>
+            <listitem><para>C</para></listitem>
+            <listitem><para>C++</para></listitem>
+            <listitem><para>Objective-C</para></listitem>
+            <listitem><para>Objective-C++</para></listitem>
+            <listitem><para>Assembly</para></listitem>
+            <listitem><para>Windows resources</para></listitem>
+        </itemizedlist>
 
         <section>
             <title>C++ sources</title>
@@ -322,8 +351,8 @@
     <section>
         <title>Library Dependencies</title>
         <para>
-            Dependencies for C++ projects are binary libraries that export header files. The header files are used during compilation, with the compiled
-            binary dependency being used during the linking.
+            Dependencies for native components are binary libraries that export header files. The header files are used during compilation, with the compiled
+            binary dependency being used during linking and execution.
         </para>
         <section>
            <title>Dependencies within the same project</title>
@@ -512,6 +541,7 @@
             <para>
                 Each tool chain implementation allows for a certain degree of configuration (see the API documentation for more details).
             </para>
+
         </section>
 
         <section>
@@ -547,24 +577,33 @@
             <para>
                 So for GCC running on linux, the supported target platforms are 'linux/x86' and 'linux/x86_64'.
                 For GCC running on Windows via Cygwin, platforms 'windows/x86' and 'windows/x86_64' are supported.
-                (The Cygwin runtime is not yet modelled as part of the Platform, but will be in the future.)
+                (The Cygwin POSIX runtime is not yet modelled as part of the platform, but will be in the future.)
             </para>
             <para>
                 If no target platforms are defined for a project, then all binaries are built to target a default platform named 'current'.
                 This default platform does not specify any <literal>architecture</literal> or <literal>operatingSystem</literal> value,
                 hence using the default values of the first available tool chain.
             </para>
+            <para>
+                Gradle provides a <firstterm>hook</firstterm> that allows the build author to control the exact set of arguments passed to a tool chain executable.
+                This enables the build author to work around any limitations in Gradle, or assumptions that Gradle makes.
+                The arguments hook should be seen as a 'last-resort' mechanism, with preference given to truly modelling the underlying domain.
+            </para>
+            <sample id="withArguments" dir="native-binaries/tool-chains" title="Reconfigure tool arguments">
+                <sourcefile file="build.gradle" snippet="withArguments"/>
+            </sample>
         </section>
 
         <section>
             <title>Cross-compiling with GCC</title>
             <para>
                 Cross-compiling is possible with the <apilink class="org.gradle.nativebinaries.toolchain.Gcc"/> and <apilink class="org.gradle.nativebinaries.toolchain.Clang"/> tool chains,
-                by programmatically adding support for additional target platforms.
-                This is done using the <apilink class="org.gradle.nativebinaries.toolchain.PlatformConfigurableToolChain"/> API.
-                Each added <apilink class="org.gradle.nativebinaries.toolchain.TargetPlatformConfiguration"/> defines support for a particular target platform,
-                and supplies additional tool arguments that are required to target this platform.
+                by adding support for additional target platforms.
+                This is done by specifying a target platform for a toolchain. For each targetted platform a custom configuration can be specified.
             </para>
+            <sample id="targetPlatforms" dir="native-binaries/target-platforms" title="Defining target platforms">
+                <sourcefile file="build.gradle" snippet="targetplatforms"/>
+            </sample>
         </section>
     </section>
     <section id="native_binaries:visual_studio">
@@ -589,7 +628,7 @@
         <title>CUnit support</title>
         <para>
             The Gradle <literal>cunit</literal> plugin provides support for compiling and executing CUnit tests in your native-binary project.
-            For each <apilink class="org.gradle.nativebinaries.Executable"/> and <apilink class="org.gradle.nativebinaries.Library"/>
+            For each <apilink class="org.gradle.nativebinaries.NativeExecutable"/> and <apilink class="org.gradle.nativebinaries.NativeLibrary"/>
             defined in your project, Gradle will create a matching <apilink class="org.gradle.nativebinaries.test.cunit.CUnitTestSuite"/> component,
             named <literal>${component.name}Test</literal>.
         </para>
@@ -617,7 +656,7 @@
             <title>Building CUnit executables</title>
             <para>
                 A <apilink class="org.gradle.nativebinaries.test.cunit.CUnitTestSuite"/> component has an associated
-                <apilink class="org.gradle.nativebinaries.Executable"/> or <apilink class="org.gradle.nativebinaries.Library"/> component.
+                <apilink class="org.gradle.nativebinaries.NativeExecutable"/> or <apilink class="org.gradle.nativebinaries.NativeLibrary"/> component.
                 For each <apilink class="org.gradle.nativebinaries.ProjectNativeBinary"/> configured for the main component, a matching
                 <apilink class="org.gradle.nativebinaries.test.TestSuiteExecutableBinary"/> will be configured on the test suite component.
                 These test suite binaries can be configured in a similar way to any other binary instance:
diff --git a/subprojects/docs/src/samples/groovy/customizedLayout/build.gradle b/subprojects/docs/src/samples/groovy/customizedLayout/build.gradle
index 1c528d2411ba..fe3cd5b36619 100644
--- a/subprojects/docs/src/samples/groovy/customizedLayout/build.gradle
+++ b/subprojects/docs/src/samples/groovy/customizedLayout/build.gradle
@@ -5,7 +5,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.2.0'
+    compile 'org.codehaus.groovy:groovy:2.2.2'
     testCompile 'junit:junit:4.11'
 }
 
diff --git a/subprojects/docs/src/samples/groovy/mixedJavaAndGroovy/build.gradle b/subprojects/docs/src/samples/groovy/mixedJavaAndGroovy/build.gradle
index 518482646f70..4ab88f53be8d 100644
--- a/subprojects/docs/src/samples/groovy/mixedJavaAndGroovy/build.gradle
+++ b/subprojects/docs/src/samples/groovy/mixedJavaAndGroovy/build.gradle
@@ -6,6 +6,6 @@ repositories {
 }
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.2.0'
+    compile 'org.codehaus.groovy:groovy-all:2.2.2'
     testCompile 'junit:junit:4.11'
 }
diff --git a/subprojects/docs/src/samples/groovy/multiproject/groovycDetector/build.gradle b/subprojects/docs/src/samples/groovy/multiproject/groovycDetector/build.gradle
index e671acf7a3ba..c8a9605e0e1c 100644
--- a/subprojects/docs/src/samples/groovy/multiproject/groovycDetector/build.gradle
+++ b/subprojects/docs/src/samples/groovy/multiproject/groovycDetector/build.gradle
@@ -3,5 +3,5 @@ apply plugin: 'java'
 version = 'SNAPSHOT'
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.2.0'
+    compile 'org.codehaus.groovy:groovy-all:2.2.2'
 }
diff --git a/subprojects/docs/src/samples/groovy/multiproject/testproject/build.gradle b/subprojects/docs/src/samples/groovy/multiproject/testproject/build.gradle
index eb281c8f4660..0bf33af42a1c 100644
--- a/subprojects/docs/src/samples/groovy/multiproject/testproject/build.gradle
+++ b/subprojects/docs/src/samples/groovy/multiproject/testproject/build.gradle
@@ -4,7 +4,7 @@ group = 'org.gradle'
 version = '1.0'
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.2.0'
+    compile 'org.codehaus.groovy:groovy-all:2.2.2'
     compile project(':groovycDetector')
     testCompile 'junit:junit:4.11'
 }
diff --git a/subprojects/docs/src/samples/groovy/multiproject/testproject/src/test/groovy/org/gradle/VersionTest.groovy b/subprojects/docs/src/samples/groovy/multiproject/testproject/src/test/groovy/org/gradle/VersionTest.groovy
index f1f0573c72b6..e987a1bf1c14 100644
--- a/subprojects/docs/src/samples/groovy/multiproject/testproject/src/test/groovy/org/gradle/VersionTest.groovy
+++ b/subprojects/docs/src/samples/groovy/multiproject/testproject/src/test/groovy/org/gradle/VersionTest.groovy
@@ -7,7 +7,7 @@ class GroovycVersionTest {
   def groovycVersion
 
   @Test
-  void versionShouldBe2_2_0() {
-    assertEquals("2.2.0", groovycVersion)
+  void versionShouldBe2_2_2() {
+    assertEquals("2.2.2", groovycVersion)
   }
 }
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/groovy/quickstart/build.gradle b/subprojects/docs/src/samples/groovy/quickstart/build.gradle
index efc14c706d93..8470eec07372 100644
--- a/subprojects/docs/src/samples/groovy/quickstart/build.gradle
+++ b/subprojects/docs/src/samples/groovy/quickstart/build.gradle
@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.2.0'
+    compile 'org.codehaus.groovy:groovy-all:2.2.2'
 // END SNIPPET groovy-dependency
     testCompile 'junit:junit:4.11'
 // START SNIPPET groovy-dependency
diff --git a/subprojects/docs/src/samples/groovy/quickstart/src/test/groovy/org/gradle/PersonTest.groovy b/subprojects/docs/src/samples/groovy/quickstart/src/test/groovy/org/gradle/PersonTest.groovy
index ad7ce48fec6d..0f3b57d00563 100644
--- a/subprojects/docs/src/samples/groovy/quickstart/src/test/groovy/org/gradle/PersonTest.groovy
+++ b/subprojects/docs/src/samples/groovy/quickstart/src/test/groovy/org/gradle/PersonTest.groovy
@@ -15,7 +15,7 @@ class PersonTest {
     }
 
     @Test public void usingCorrectVersionOfGroovy() {
-        assertEquals('2.2.0', GroovySystem.version)
+        assertEquals('2.2.2', GroovySystem.version)
     }
     
     @Test public void testResourcesAreAvailable() {
diff --git a/subprojects/docs/src/samples/maven/pomGeneration/build.gradle b/subprojects/docs/src/samples/maven/pomGeneration/build.gradle
index 5675d65b2d16..ba3cddff5272 100644
--- a/subprojects/docs/src/samples/maven/pomGeneration/build.gradle
+++ b/subprojects/docs/src/samples/maven/pomGeneration/build.gradle
@@ -58,8 +58,14 @@ uploadArchives {
 
 // Customize the contents of the pom
 
-ext.installer = install.repositories.mavenInstaller
-ext.deployer = uploadArchives.repositories.mavenDeployer
+// START SNIPPET when-configured
+def installer = install.repositories.mavenInstaller
+def deployer = uploadArchives.repositories.mavenDeployer
+
+[installer, deployer]*.pom*.whenConfigured {pom ->
+    pom.dependencies.find {dep -> dep.groupId == 'group3' && dep.artifactId == 'runtime' }.optional = true
+}
+// END SNIPPET when-configured
 
 [installer, deployer]*.pom*.version = '1.0MVN'
 installer.pom.project {
@@ -84,12 +90,6 @@ task writeNewPom << {
 }
 // END SNIPPET new-pom
 
-// START SNIPPET when-configured
-[installer, deployer]*.pom*.whenConfigured {pom ->
-    pom.dependencies.find {dep -> dep.groupId == 'group3' && dep.artifactId == 'runtime' }.optional = true
-}
-// END SNIPPET when-configured
-
 task writeDeployerPom(dependsOn: uploadArchives) << {
     deployer.pom.writeTo("$buildDir/deployerpom.xml")
 }
diff --git a/subprojects/docs/src/samples/native-binaries/c/src/hello/headers/hello.h b/subprojects/docs/src/samples/native-binaries/c/src/hello/headers/hello.h
index b4a1ec232523..164b66e9e497 100755
--- a/subprojects/docs/src/samples/native-binaries/c/src/hello/headers/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/c/src/hello/headers/hello.h
@@ -1,4 +1,4 @@
-#ifdef DLL_EXPORT
+#if defined(_WIN32) && defined(DLL_EXPORT)
 #define LIB_FUNC __declspec(dllexport)
 #else
 #define LIB_FUNC
diff --git a/subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/cpp/hello.cpp b/subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/cpp/hello.cpp
index b849636b9ff0..ae2e33790884 100644
--- a/subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/cpp/hello.cpp
+++ b/subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/cpp/hello.cpp
@@ -1,13 +1,5 @@
 #include <iostream>
-#ifdef _WIN32
-#ifdef DLL_EXPORT
-#define LIB_FUNC __declspec(dllexport)
-#endif
-#endif
-#ifndef LIB_FUNC
-#define LIB_FUNC
-#endif
-
+#include "hello.h"
 
 void LIB_FUNC hello () {
   std::cout << "Hello, World!\n";
diff --git a/subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/headers/hello.h b/subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/headers/hello.h
index 1d3f35d6b1d7..da8bebf468ce 100755
--- a/subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/headers/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/cpp-lib/src/main/headers/hello.h
@@ -1,5 +1,5 @@
-#ifdef _WIN32
-#define LIB_FUNC __declspec(dllimport)
+#if defined(_WIN32) && defined(DLL_EXPORT)
+#define LIB_FUNC __declspec(dllexport)
 #else
 #define LIB_FUNC
 #endif
diff --git a/subprojects/docs/src/samples/native-binaries/cpp/src/hello/cpp/hello.cpp b/subprojects/docs/src/samples/native-binaries/cpp/src/hello/cpp/hello.cpp
index dc7b045e620f..26a050ad67d6 100755
--- a/subprojects/docs/src/samples/native-binaries/cpp/src/hello/cpp/hello.cpp
+++ b/subprojects/docs/src/samples/native-binaries/cpp/src/hello/cpp/hello.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include "hello.h"
 
-void LIB_FUNC hello () {
-  std::cout << "Hello world!" << std::endl;
+void LIB_FUNC Greeter::hello () {
+    std::cout << "Hello world!" << std::endl;
 }
diff --git a/subprojects/docs/src/samples/native-binaries/cpp/src/hello/headers/hello.h b/subprojects/docs/src/samples/native-binaries/cpp/src/hello/headers/hello.h
index 51b48fd22020..e8e3ee6a491b 100755
--- a/subprojects/docs/src/samples/native-binaries/cpp/src/hello/headers/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/cpp/src/hello/headers/hello.h
@@ -1,7 +1,10 @@
-#ifdef DLL_EXPORT
+#if defined(_WIN32) && defined(DLL_EXPORT)
 #define LIB_FUNC __declspec(dllexport)
 #else
 #define LIB_FUNC
 #endif
 
-void LIB_FUNC hello();
+class Greeter {
+    public:
+    void LIB_FUNC hello();
+};
diff --git a/subprojects/docs/src/samples/native-binaries/cpp/src/main/cpp/main.cpp b/subprojects/docs/src/samples/native-binaries/cpp/src/main/cpp/main.cpp
index 09f8ace1d27d..e35c88f2a1f0 100644
--- a/subprojects/docs/src/samples/native-binaries/cpp/src/main/cpp/main.cpp
+++ b/subprojects/docs/src/samples/native-binaries/cpp/src/main/cpp/main.cpp
@@ -1,6 +1,7 @@
 #include "hello.h"
 
 int main () {
-  hello();
-  return 0;
+    Greeter greeter;
+    greeter.hello();
+    return 0;
 }
diff --git a/subprojects/docs/src/samples/native-binaries/custom-layout/src/include/hello.h b/subprojects/docs/src/samples/native-binaries/custom-layout/src/include/hello.h
index 51b48fd22020..da8bebf468ce 100755
--- a/subprojects/docs/src/samples/native-binaries/custom-layout/src/include/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/custom-layout/src/include/hello.h
@@ -1,4 +1,4 @@
-#ifdef DLL_EXPORT
+#if defined(_WIN32) && defined(DLL_EXPORT)
 #define LIB_FUNC __declspec(dllexport)
 #else
 #define LIB_FUNC
diff --git a/subprojects/docs/src/samples/native-binaries/flavors/src/lib/headers/hello.h b/subprojects/docs/src/samples/native-binaries/flavors/src/lib/headers/hello.h
index 79b608b09ab7..da8bebf468ce 100755
--- a/subprojects/docs/src/samples/native-binaries/flavors/src/lib/headers/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/flavors/src/lib/headers/hello.h
@@ -1,9 +1,6 @@
-#ifdef _WIN32
-#ifdef DLL_EXPORT
+#if defined(_WIN32) && defined(DLL_EXPORT)
 #define LIB_FUNC __declspec(dllexport)
-#endif
-#endif
-#ifndef LIB_FUNC
+#else
 #define LIB_FUNC
 #endif
 
diff --git a/subprojects/docs/src/samples/native-binaries/multi-project/build.gradle b/subprojects/docs/src/samples/native-binaries/multi-project/build.gradle
index 2a3964cff922..c2f2943652f3 100644
--- a/subprojects/docs/src/samples/native-binaries/multi-project/build.gradle
+++ b/subprojects/docs/src/samples/native-binaries/multi-project/build.gradle
@@ -4,6 +4,12 @@ project(":lib") {
     libraries {
         main {}
     }
+    // For any shared library binaries built with Visual C++, define the DLL_EXPORT macro
+    binaries.withType(SharedLibraryBinary) {
+        if (toolChain in VisualCpp) {
+            cppCompiler.define "DLL_EXPORT"
+        }
+    }
 }
 
 project(":exe") {
diff --git a/subprojects/docs/src/samples/native-binaries/multi-project/lib/src/main/cpp/hello.cpp b/subprojects/docs/src/samples/native-binaries/multi-project/lib/src/main/cpp/hello.cpp
index 5d79bcef6a72..ae2e33790884 100755
--- a/subprojects/docs/src/samples/native-binaries/multi-project/lib/src/main/cpp/hello.cpp
+++ b/subprojects/docs/src/samples/native-binaries/multi-project/lib/src/main/cpp/hello.cpp
@@ -1,9 +1,5 @@
 #include <iostream>
-#ifdef _WIN32
-#define LIB_FUNC __declspec(dllexport)
-#else
-#define LIB_FUNC
-#endif
+#include "hello.h"
 
 void LIB_FUNC hello () {
   std::cout << "Hello, World!\n";
diff --git a/subprojects/docs/src/samples/native-binaries/multi-project/lib/src/main/headers/hello.h b/subprojects/docs/src/samples/native-binaries/multi-project/lib/src/main/headers/hello.h
index 1d3f35d6b1d7..da8bebf468ce 100755
--- a/subprojects/docs/src/samples/native-binaries/multi-project/lib/src/main/headers/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/multi-project/lib/src/main/headers/hello.h
@@ -1,5 +1,5 @@
-#ifdef _WIN32
-#define LIB_FUNC __declspec(dllimport)
+#if defined(_WIN32) && defined(DLL_EXPORT)
+#define LIB_FUNC __declspec(dllexport)
 #else
 #define LIB_FUNC
 #endif
diff --git a/subprojects/docs/src/samples/native-binaries/objective-c/build.gradle b/subprojects/docs/src/samples/native-binaries/objective-c/build.gradle
index 51d7e9b78af4..ef89022ac1c8 100644
--- a/subprojects/docs/src/samples/native-binaries/objective-c/build.gradle
+++ b/subprojects/docs/src/samples/native-binaries/objective-c/build.gradle
@@ -8,15 +8,13 @@ executables {
 }
 // END SNIPPET executables
 
-
 // START SNIPPET all-binaries
 binaries.all {
-    objcCompiler.args "-I/usr/include/GNUstep", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
-
-    //on osx we need different settings than on linux or windows
-    if(targetPlatform.operatingSystem.isMacOsX()){
+    //on OS X we need different settings than on Linux or Windows
+    if (targetPlatform.operatingSystem.macOsX) {
         linker.args "-framework", "Foundation"
-    }else{
+    } else {
+        objcCompiler.args "-I/usr/include/GNUstep", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
         linker.args "-lgnustep-base", "-lobjc"
     }
 }
diff --git a/subprojects/docs/src/samples/native-binaries/objective-c/src/main/headers/greeter.h b/subprojects/docs/src/samples/native-binaries/objective-c/src/main/headers/greeter.h
new file mode 100644
index 000000000000..37e2aec9f5bf
--- /dev/null
+++ b/subprojects/docs/src/samples/native-binaries/objective-c/src/main/headers/greeter.h
@@ -0,0 +1,5 @@
+#import <Foundation/Foundation.h>
+
+@interface Greeter : NSObject
+    - (void)sayHello;
+@end
diff --git a/subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/greeter.m b/subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/greeter.m
new file mode 100644
index 000000000000..edc9be178a85
--- /dev/null
+++ b/subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/greeter.m
@@ -0,0 +1,10 @@
+#import "greeter.h"
+
+@implementation Greeter
+
+- (void) sayHello {
+    NSString *helloWorld = @"Hello world!";
+    fprintf(stdout, "%s\n", [helloWorld UTF8String]);
+}
+
+@end
diff --git a/subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/main.m b/subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/main.m
index 18d5703ed6c9..20f06052f63a 100644
--- a/subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/main.m
+++ b/subprojects/docs/src/samples/native-binaries/objective-c/src/main/objc/main.m
@@ -1,10 +1,14 @@
-#import <Foundation/Foundation.h>
+#import "greeter.h"
 
 int main (int argc, const char * argv[])
 {
-    NSString *helloWorld = @"Hello world!\n";
-    NSFileHandle *stdout = [NSFileHandle fileHandleWithStandardOutput];
-    NSData *strData = [helloWorld dataUsingEncoding: NSASCIIStringEncoding];
-    [stdout writeData: strData];
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    Greeter *greeter = [Greeter new];
+    [greeter sayHello];
+    [greeter release];
+
+    [pool drain];
+
     return 0;
 }
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/native-binaries/objective-cpp/build.gradle b/subprojects/docs/src/samples/native-binaries/objective-cpp/build.gradle
index 16a73ded420b..2e3c77a36a1a 100644
--- a/subprojects/docs/src/samples/native-binaries/objective-cpp/build.gradle
+++ b/subprojects/docs/src/samples/native-binaries/objective-cpp/build.gradle
@@ -8,15 +8,13 @@ executables {
 }
 // END SNIPPET executables
 
-
 // START SNIPPET all-binaries
 binaries.all {
-    objcppCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
-
-    //on osx we need different linker settings than on linux or windows
-    if(targetPlatform.operatingSystem.isMacOsX()){
+    //on OS X we need different linker settings than on Linux or Windows
+    if (targetPlatform.operatingSystem.macOsX) {
         linker.args "-framework", "Foundation"
-    }else{
+    } else {
+        objcppCompiler.args "-I/usr/include/GNUstep", "-I/usr/local/include/objc", "-fconstant-string-class=NSConstantString", "-D_NATIVE_OBJC_EXCEPTIONS"
         linker.args "-lgnustep-base", "-lobjc"
     }
 }
diff --git a/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/headers/greeter.h b/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/headers/greeter.h
new file mode 100644
index 000000000000..2326522a1dce
--- /dev/null
+++ b/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/headers/greeter.h
@@ -0,0 +1,7 @@
+#define __STDC_LIMIT_MACROS
+#import <stdint.h>
+#import <Foundation/Foundation.h>
+
+@interface Greeter : NSObject
+    - (void)sayHello;
+@end
diff --git a/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/greeter.mm b/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/greeter.mm
new file mode 100644
index 000000000000..661fcdacff47
--- /dev/null
+++ b/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/greeter.mm
@@ -0,0 +1,11 @@
+#import <iostream>
+#import "greeter.h"
+
+@implementation Greeter
+
+- (void) sayHello {
+    NSString *helloWorld = @"Hello world!";
+    std::cout << [helloWorld UTF8String] << std::endl;
+}
+
+@end
diff --git a/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/main.mm b/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/main.mm
index 1c97154ca881..20f06052f63a 100644
--- a/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/main.mm
+++ b/subprojects/docs/src/samples/native-binaries/objective-cpp/src/main/objcpp/main.mm
@@ -1,14 +1,14 @@
-#define __STDC_LIMIT_MACROS
-#include <stdint.h>
-#import <Foundation/Foundation.h>
-#include <iostream>
+#import "greeter.h"
 
 int main (int argc, const char * argv[])
 {
-    NSFileHandle *stdout = [NSFileHandle fileHandleWithStandardOutput];
-    NSData *strData = [@"Hello " dataUsingEncoding: NSASCIIStringEncoding];
-    [stdout writeData: strData];
-    std::cout << "world!" << std::endl;
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    Greeter *greeter = [Greeter new];
+    [greeter sayHello];
+    [greeter release];
+
+    [pool drain];
 
     return 0;
 }
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/build.gradle b/subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/build.gradle
index 2e6a47b7f152..ca4c702cb9ed 100644
--- a/subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/build.gradle
+++ b/subprojects/docs/src/samples/native-binaries/prebuilt/3rd-party-lib/util/build.gradle
@@ -20,6 +20,3 @@ libraries {
         }
     }
 }
-task buildLibraries {
-    dependsOn binaries.withType(LibraryBinary)
-}
diff --git a/subprojects/docs/src/samples/native-binaries/prebuilt/build.gradle b/subprojects/docs/src/samples/native-binaries/prebuilt/build.gradle
index 6d274cf74d35..e0e2d21b0963 100644
--- a/subprojects/docs/src/samples/native-binaries/prebuilt/build.gradle
+++ b/subprojects/docs/src/samples/native-binaries/prebuilt/build.gradle
@@ -39,7 +39,4 @@ executables {
 }
 sources.main.cpp.lib library: 'boost', linkage: 'api'
 sources.main.cpp.lib library: 'util', linkage: 'static'
-task buildExecutables {
-    dependsOn binaries.withType(ExecutableBinary)
-}
 
diff --git a/subprojects/docs/src/samples/native-binaries/target-platforms/build.gradle b/subprojects/docs/src/samples/native-binaries/target-platforms/build.gradle
new file mode 100644
index 000000000000..cf2c9391f08c
--- /dev/null
+++ b/subprojects/docs/src/samples/native-binaries/target-platforms/build.gradle
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+apply plugin: 'cpp'
+
+// START SNIPPET targetplatforms
+model {
+    toolChains {
+        gcc(Gcc) {
+            target("arm"){
+                cppCompiler.withArguments { args ->
+                    args << "-m32"
+                }
+                linker.withArguments { args ->
+                    args << "-m32"
+                }
+            }
+            target("sparc")
+        }
+    }
+    platforms {
+        arm {
+            architecture "arm"
+        }
+        sparc {
+            architecture "sparc"
+        }
+    }
+}
+// END SNIPPET targetplatforms
+model {
+    toolChains {
+        all{
+            target("arm"){
+                cppCompiler.withArguments { args ->
+                    args << "-m32"
+                }
+                linker.withArguments { args ->
+                    args << "-m32"
+                }
+            }
+            target("sparc")
+        }
+    }
+}
+
+executables {
+    main {}
+}
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/native-binaries/target-platforms/src/main/cpp/main.cpp b/subprojects/docs/src/samples/native-binaries/target-platforms/src/main/cpp/main.cpp
new file mode 100644
index 000000000000..d0e685cef906
--- /dev/null
+++ b/subprojects/docs/src/samples/native-binaries/target-platforms/src/main/cpp/main.cpp
@@ -0,0 +1,18 @@
+#include <iostream>
+
+int main () {
+    #if defined(__clang__)
+        std::cout << "Hello from clang!" << std::endl;
+    #elif defined(__GNUC__) && defined(__MINGW32__)
+        std::cout << "Hello from mingw!" << std::endl;
+    #elif defined(__GNUC__) && defined(__CYGWIN__)
+        std::cout << "Hello from gcc cygwin!" << std::endl;
+    #elif defined(__GNUC__)
+        std::cout << "Hello from gcc!" << std::endl;
+    #elif defined(_MSC_VER)
+        std::cout << "Hello from visual c++!" << std::endl;
+    #else
+        std::cout << "Hello from an unrecognised tool chain!" << std::endl;
+    #endif
+  return 0;
+}
diff --git a/subprojects/docs/src/samples/native-binaries/tool-chains/build.gradle b/subprojects/docs/src/samples/native-binaries/tool-chains/build.gradle
index 00e10fedffd6..1ea0b1e5ec50 100644
--- a/subprojects/docs/src/samples/native-binaries/tool-chains/build.gradle
+++ b/subprojects/docs/src/samples/native-binaries/tool-chains/build.gradle
@@ -16,6 +16,31 @@ model {
 }
 // END SNIPPET toolChains
 
+
+// START SNIPPET withArguments
+model {
+    toolChains {
+        visualCpp(VisualCpp) {
+            cppCompiler.withArguments { args ->
+                args << "-DFRENCH"
+            }
+        }
+        clang(Clang){
+            cCompiler.withArguments { args ->
+                Collections.replaceAll(args, "CUSTOM", "-DFRENCH")
+            }
+            linker.withArguments { args ->
+                args.remove "CUSTOM"
+            }
+            staticLibArchiver.withArguments { args ->
+                args.remove "CUSTOM"
+            }
+        }
+
+    }
+}
+// END SNIPPET withArguments
+
 executables {
     main {}
 }
diff --git a/subprojects/docs/src/samples/native-binaries/variants/build.gradle b/subprojects/docs/src/samples/native-binaries/variants/build.gradle
index 96508a01cbca..92b9fbcb6be6 100644
--- a/subprojects/docs/src/samples/native-binaries/variants/build.gradle
+++ b/subprojects/docs/src/samples/native-binaries/variants/build.gradle
@@ -69,8 +69,3 @@ task visualCppExecutables {
         it.toolChain in VisualCpp
     }
 }
-task buildExecutables {
-    dependsOn binaries.withType(ExecutableBinary).matching {
-        it.buildable
-    }
-}
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/native-binaries/variants/src/hello/headers/hello.h b/subprojects/docs/src/samples/native-binaries/variants/src/hello/headers/hello.h
index 79b608b09ab7..da8bebf468ce 100755
--- a/subprojects/docs/src/samples/native-binaries/variants/src/hello/headers/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/variants/src/hello/headers/hello.h
@@ -1,9 +1,6 @@
-#ifdef _WIN32
-#ifdef DLL_EXPORT
+#if defined(_WIN32) && defined(DLL_EXPORT)
 #define LIB_FUNC __declspec(dllexport)
-#endif
-#endif
-#ifndef LIB_FUNC
+#else
 #define LIB_FUNC
 #endif
 
diff --git a/subprojects/docs/src/samples/native-binaries/visual-studio/src/hello/headers/hello.h b/subprojects/docs/src/samples/native-binaries/visual-studio/src/hello/headers/hello.h
index 51b48fd22020..da8bebf468ce 100755
--- a/subprojects/docs/src/samples/native-binaries/visual-studio/src/hello/headers/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/visual-studio/src/hello/headers/hello.h
@@ -1,4 +1,4 @@
-#ifdef DLL_EXPORT
+#if defined(_WIN32) && defined(DLL_EXPORT)
 #define LIB_FUNC __declspec(dllexport)
 #else
 #define LIB_FUNC
diff --git a/subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/cpp/hello.cpp b/subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/cpp/hello.cpp
index 6c2f01e144a8..b95de7043a8c 100755
--- a/subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/cpp/hello.cpp
+++ b/subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/cpp/hello.cpp
@@ -13,7 +13,7 @@ std::string LoadStringFromResource(UINT stringID)
     return std::string(wide.begin(), wide.end());
 }
 
-void DLL_FUNC hello() {
+void hello() {
     std::string hello = LoadStringFromResource(IDS_HELLO);
     std::cout << hello << std::endl;
 }
diff --git a/subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/headers/hello.h b/subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/headers/hello.h
index e6507adc9e18..da8bebf468ce 100755
--- a/subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/headers/hello.h
+++ b/subprojects/docs/src/samples/native-binaries/windows-resources/src/hello/headers/hello.h
@@ -1,7 +1,7 @@
-#ifdef DLL_EXPORT
-#define DLL_FUNC __declspec(dllexport)
+#if defined(_WIN32) && defined(DLL_EXPORT)
+#define LIB_FUNC __declspec(dllexport)
 #else
-#define DLL_FUNC
+#define LIB_FUNC
 #endif
 
-void DLL_FUNC hello();
+void LIB_FUNC hello();
diff --git a/subprojects/docs/src/samples/osgi/build.gradle b/subprojects/docs/src/samples/osgi/build.gradle
index 16c7cecacb2d..ad286fe3ad48 100644
--- a/subprojects/docs/src/samples/osgi/build.gradle
+++ b/subprojects/docs/src/samples/osgi/build.gradle
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.2.0'
+    compile 'org.codehaus.groovy:groovy:2.2.2'
     compile 'org.eclipse:osgi:3.5.0.v20090520'
 }
 
diff --git a/subprojects/docs/src/samples/userguide/artifacts/defineRepository/build.gradle b/subprojects/docs/src/samples/userguide/artifacts/defineRepository/build.gradle
index 0fdcd60dff21..1e6b82e691f9 100644
--- a/subprojects/docs/src/samples/userguide/artifacts/defineRepository/build.gradle
+++ b/subprojects/docs/src/samples/userguide/artifacts/defineRepository/build.gradle
@@ -1,5 +1,37 @@
 import org.gradle.api.artifacts.repositories.IvyArtifactRepository
 
+//START SNIPPET maven-ivy-repository-no-auth
+repositories {
+    maven {
+        url "http://repo.mycompany.com/maven2"
+    }
+
+    ivy {
+        url "http://repo.mycompany.com/repo"
+    }
+}
+//END SNIPPET maven-ivy-repository-no-auth
+
+//START SNIPPET maven-ivy-repository-auth
+repositories {
+    maven {
+        url "sftp://repo.mycompany.com:22/maven2"
+        credentials {
+            username 'user'
+            password 'password'
+        }
+    }
+
+    ivy {
+        url "sftp://repo.mycompany.com:22/repo"
+        credentials {
+            username 'user'
+            password 'password'
+        }
+    }
+}
+//END SNIPPET maven-ivy-repository-auth
+
 //START SNIPPET maven-central
 repositories {
     mavenCentral()
diff --git a/subprojects/docs/src/samples/userguide/artifacts/externalDependencies/build.gradle b/subprojects/docs/src/samples/userguide/artifacts/externalDependencies/build.gradle
index 6e16edc8b40b..98dc109c6513 100644
--- a/subprojects/docs/src/samples/userguide/artifacts/externalDependencies/build.gradle
+++ b/subprojects/docs/src/samples/userguide/artifacts/externalDependencies/build.gradle
@@ -66,7 +66,7 @@ dependencies {
 
 //START SNIPPET client-modules
 dependencies {
-    runtime module("org.codehaus.groovy:groovy-all:2.2.0") {
+    runtime module("org.codehaus.groovy:groovy:2.2.2") {
         dependency("commons-cli:commons-cli:1.0") {
             transitive = false
         }
diff --git a/subprojects/docs/src/samples/userguide/groovy/groovyDependency/build.gradle b/subprojects/docs/src/samples/userguide/groovy/groovyDependency/build.gradle
index e36b137540e5..00f4453c544b 100644
--- a/subprojects/docs/src/samples/userguide/groovy/groovyDependency/build.gradle
+++ b/subprojects/docs/src/samples/userguide/groovy/groovyDependency/build.gradle
@@ -6,7 +6,7 @@ repositories {
 
 // START SNIPPET groovy-test-dependency
 dependencies {
-    testCompile "org.codehaus.groovy:groovy-all:2.2.0"
+    testCompile "org.codehaus.groovy:groovy:2.2.2"
 }
 // END SNIPPET groovy-test-dependency
 
diff --git a/subprojects/docs/src/samples/userguide/tutorial/projectReports/build.gradle b/subprojects/docs/src/samples/userguide/tutorial/projectReports/build.gradle
index acdab3a89b53..a12d00a4d1cc 100644
--- a/subprojects/docs/src/samples/userguide/tutorial/projectReports/build.gradle
+++ b/subprojects/docs/src/samples/userguide/tutorial/projectReports/build.gradle
@@ -64,7 +64,7 @@ project(':api') {
 description = 'The shared API for the application'
 // END SNIPPET project-description
     dependencies {
-        compile "org.codehaus.groovy:groovy-all:2.2.0"
+        compile "org.codehaus.groovy:groovy-all:2.2.2"
         testCompile "junit:junit:4.11"
     }
 }
diff --git a/subprojects/docs/src/samples/userguideOutput/dependencyInsightReport.out b/subprojects/docs/src/samples/userguideOutput/dependencyInsightReport.out
index 6d637309991d..f429dff8522a 100644
--- a/subprojects/docs/src/samples/userguideOutput/dependencyInsightReport.out
+++ b/subprojects/docs/src/samples/userguideOutput/dependencyInsightReport.out
@@ -1,3 +1,3 @@
-org.codehaus.groovy:groovy-all:2.2.0
+org.codehaus.groovy:groovy-all:2.2.2
 \--- project :api
      \--- compile
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/userguideOutput/dependencyListReport.out b/subprojects/docs/src/samples/userguideOutput/dependencyListReport.out
index 2572e3368b19..b3e4cbc1e16e 100644
--- a/subprojects/docs/src/samples/userguideOutput/dependencyListReport.out
+++ b/subprojects/docs/src/samples/userguideOutput/dependencyListReport.out
@@ -10,7 +10,7 @@ Project :api - The shared API for the application
 ------------------------------------------------------------
 
 compile
-\--- org.codehaus.groovy:groovy-all:2.2.0
+\--- org.codehaus.groovy:groovy-all:2.2.2
 
 testCompile
 \--- junit:junit:4.11
@@ -22,7 +22,7 @@ Project :webapp - The Web application implementation
 
 compile
 +--- project :api
-|    \--- org.codehaus.groovy:groovy-all:2.2.0
+|    \--- org.codehaus.groovy:groovy-all:2.2.2
 \--- commons-io:commons-io:1.2
 
 testCompile
diff --git a/subprojects/docs/src/samples/userguideOutput/propertyListReport.out b/subprojects/docs/src/samples/userguideOutput/propertyListReport.out
index 2049c5be240d..3ca5a388c11a 100644
--- a/subprojects/docs/src/samples/userguideOutput/propertyListReport.out
+++ b/subprojects/docs/src/samples/userguideOutput/propertyListReport.out
@@ -8,5 +8,6 @@ ant: org.gradle.api.internal.project.DefaultAntBuilder@12345
 antBuilderFactory: org.gradle.api.internal.project.DefaultAntBuilderFactory@12345
 artifacts: org.gradle.api.internal.artifacts.dsl.DefaultArtifactHandler@12345
 asDynamicObject: org.gradle.api.internal.ExtensibleDynamicObject@12345
+baseClassLoaderScope: org.gradle.api.internal.initialization.DefaultClassLoaderScope@12345
 buildDir: /home/user/gradle/samples/userguide/tutorial/projectReports/api/build
 buildFile: /home/user/gradle/samples/userguide/tutorial/projectReports/api/build.gradle
diff --git a/subprojects/docs/src/samples/userguideOutput/taskHelp.out b/subprojects/docs/src/samples/userguideOutput/taskHelp.out
index 64b121c1387e..86bd9b017a5e 100644
--- a/subprojects/docs/src/samples/userguideOutput/taskHelp.out
+++ b/subprojects/docs/src/samples/userguideOutput/taskHelp.out
@@ -9,4 +9,3 @@ Type
 
 Description
      Builds the JAR
-
diff --git a/subprojects/docs/src/samples/userguideOutput/taskListAllReport.out b/subprojects/docs/src/samples/userguideOutput/taskListAllReport.out
index 31b58467bb08..597ac074576b 100644
--- a/subprojects/docs/src/samples/userguideOutput/taskListAllReport.out
+++ b/subprojects/docs/src/samples/userguideOutput/taskListAllReport.out
@@ -25,8 +25,20 @@ wrapper - Generates Gradle wrapper files. [incubating]
 Help tasks
 ----------
 dependencies - Displays all dependencies declared in root project 'projectReports'.
+api:dependencies - Displays all dependencies declared in project ':api'.
+webapp:dependencies - Displays all dependencies declared in project ':webapp'.
 dependencyInsight - Displays the insight into a specific dependency in root project 'projectReports'.
+api:dependencyInsight - Displays the insight into a specific dependency in project ':api'.
+webapp:dependencyInsight - Displays the insight into a specific dependency in project ':webapp'.
 help - Displays a help message
+api:help - Displays a help message
+webapp:help - Displays a help message
 projects - Displays the sub-projects of root project 'projectReports'.
+api:projects - Displays the sub-projects of project ':api'.
+webapp:projects - Displays the sub-projects of project ':webapp'.
 properties - Displays the properties of root project 'projectReports'.
+api:properties - Displays the properties of project ':api'.
+webapp:properties - Displays the properties of project ':webapp'.
 tasks - Displays the tasks runnable from root project 'projectReports' (some of the displayed tasks may belong to subprojects).
+api:tasks - Displays the tasks runnable from project ':api'.
+webapp:tasks - Displays the tasks runnable from project ':webapp'.
diff --git a/subprojects/docs/src/samples/water/bluewhale/build.gradle b/subprojects/docs/src/samples/water/bluewhale/build.gradle
deleted file mode 100644
index d546c8f8750f..000000000000
--- a/subprojects/docs/src/samples/water/bluewhale/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-
-    dependsOn(':krill')
-
-    hello.doLast {
-        println "I'm the largets animal which has ever lived on this planet!"
-    }
-    
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/water/build.gradle b/subprojects/docs/src/samples/water/build.gradle
deleted file mode 100644
index e157bdea3cdf..000000000000
--- a/subprojects/docs/src/samples/water/build.gradle
+++ /dev/null
@@ -1,16 +0,0 @@
-childrenDependOnMe()
-
-allprojects {
-    task hello << {Task task ->
-        println "Hello, I'm $task.project.name"
-    }
-}
-
-subprojects*.hello*.doLast {
-    println 'I love water.'
-}
-
-hello << {
-    println 'As you all know, I cover three quarters of this planet!'
-}
-    
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/water/krill/build.gradle b/subprojects/docs/src/samples/water/krill/build.gradle
deleted file mode 100644
index d1c7d4f821dd..000000000000
--- a/subprojects/docs/src/samples/water/krill/build.gradle
+++ /dev/null
@@ -1,7 +0,0 @@
-
-    dependsOn(':phytoplankton')
-
-    hello.doLast {
-        println "The weight of my species in summer is twice as heavy as all human beings!"
-    }
-    
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/water/phytoplankton/build.gradle b/subprojects/docs/src/samples/water/phytoplankton/build.gradle
deleted file mode 100644
index ec57a7d27afe..000000000000
--- a/subprojects/docs/src/samples/water/phytoplankton/build.gradle
+++ /dev/null
@@ -1,5 +0,0 @@
-
-    hello.doLast {
-        println "I produce as much oxygen as all the other plants on earth together!"
-    }
-    
\ No newline at end of file
diff --git a/subprojects/docs/src/samples/water/settings.gradle b/subprojects/docs/src/samples/water/settings.gradle
deleted file mode 100644
index 8f7c568dfc34..000000000000
--- a/subprojects/docs/src/samples/water/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include 'bluewhale', 'krill', 'phytoplankton'
\ No newline at end of file
diff --git a/subprojects/docs/src/test/groovy/org/gradle/docs/releasenotes/FunctionalReleaseNotesTest.groovy b/subprojects/docs/src/test/groovy/org/gradle/docs/releasenotes/FunctionalReleaseNotesTest.groovy
index c7608c93c50f..6f9837111ed3 100644
--- a/subprojects/docs/src/test/groovy/org/gradle/docs/releasenotes/FunctionalReleaseNotesTest.groovy
+++ b/subprojects/docs/src/test/groovy/org/gradle/docs/releasenotes/FunctionalReleaseNotesTest.groovy
@@ -28,7 +28,7 @@ import spock.lang.Shared
 /**
  * These tests actually open the release notes in a browser and test the JS.
  */
-@IgnoreIf({ !canReachServices() })
+@IgnoreIf({ !FunctionalReleaseNotesTest.canReachServices() })
 class FunctionalReleaseNotesTest extends GebReportingSpec {
 
     static private final String FIXED_ISSUES_URL = "http://services.gradle.org/fixed-issues/${GradleVersion.current().baseVersion.version}"
@@ -53,7 +53,6 @@ class FunctionalReleaseNotesTest extends GebReportingSpec {
         to ReleaseNotesPage
     }
 
-    @Override
     ReleaseNotesPage getPage() {
         browser.page as ReleaseNotesPage
     }
@@ -64,11 +63,18 @@ class FunctionalReleaseNotesTest extends GebReportingSpec {
     }
 
     List<Map> fixedIssues() {
-        new JsonSlurper().parseText(new URL(FIXED_ISSUES_URL).text) as List<Map>
+        parseIssues(FIXED_ISSUES_URL)
     }
 
     List<Map> knownIssues() {
-        new JsonSlurper().parseText(new URL(KNOWN_ISSUES_URL).text) as List<Map>
+        parseIssues(KNOWN_ISSUES_URL)
+    }
+
+    private List<Map<String, String>> parseIssues(String url) {
+        def result = new JsonSlurper().parseText(new URL(url).text) as List<Map>
+        result.each { json ->
+            json.summary = json.summary.replace('\n', '').replace('\t', '').replaceAll('\\s+', ' ').trim()
+        }
     }
 
     def "has fixed issues"() {
@@ -85,7 +91,7 @@ class FunctionalReleaseNotesTest extends GebReportingSpec {
         page.fixedIssuesListItems.size() == numFixedIssues
         fixed.eachWithIndex { json, i ->
             def issue = page.fixedIssuesListItems[i]
-            assert issue.text() == "[$json.key] - ${json.summary.trim()}"
+            assert issue.text() == "[$json.key] - ${json.summary}"
             assert issue.find("a").attr("href") == json.link
         }
     }
@@ -105,7 +111,7 @@ class FunctionalReleaseNotesTest extends GebReportingSpec {
         page.knownIssuesListItems.size() == knownIssues.size()
         knownIssues.eachWithIndex { json, i ->
             def issue = page.knownIssuesListItems[i]
-            assert issue.text() == "[$json.key] - ${json.summary.trim()}"
+            assert issue.text() == "[$json.key] - ${json.summary}"
             assert issue.find("a").attr("href") == json.link
         }
     }
diff --git a/subprojects/ear/src/main/groovy/org/gradle/plugins/ear/Ear.groovy b/subprojects/ear/src/main/groovy/org/gradle/plugins/ear/Ear.groovy
index a8497b0ca103..450c794a0915 100644
--- a/subprojects/ear/src/main/groovy/org/gradle/plugins/ear/Ear.groovy
+++ b/subprojects/ear/src/main/groovy/org/gradle/plugins/ear/Ear.groovy
@@ -21,7 +21,6 @@ import org.gradle.api.file.FileCopyDetails
 import org.gradle.api.internal.file.collections.FileTreeAdapter
 import org.gradle.api.internal.file.collections.MapFileTree
 import org.gradle.api.tasks.bundling.Jar
-import org.gradle.internal.nativeplatform.filesystem.Chmod
 import org.gradle.plugins.ear.descriptor.DeploymentDescriptor
 import org.gradle.plugins.ear.descriptor.EarModule
 import org.gradle.plugins.ear.descriptor.internal.DefaultDeploymentDescriptor
@@ -74,7 +73,7 @@ class Ear extends Jar {
         // this allows us to generate the deployment descriptor after recording all modules it contains
         def metaInf = mainSpec.addChild().into('META-INF')
         metaInf.addChild().from {
-            MapFileTree descriptorSource = new MapFileTree(temporaryDirFactory, services.get(Chmod))
+            MapFileTree descriptorSource = new MapFileTree(temporaryDirFactory, fileSystem)
             final DeploymentDescriptor descriptor = deploymentDescriptor
             if (descriptor) {
                 if (!descriptor.libraryDirectory) {
diff --git a/subprojects/ear/src/test/groovy/org/gradle/plugins/ear/EarTest.groovy b/subprojects/ear/src/test/groovy/org/gradle/plugins/ear/EarTest.groovy
index edb6be788129..1310b688dd65 100644
--- a/subprojects/ear/src/test/groovy/org/gradle/plugins/ear/EarTest.groovy
+++ b/subprojects/ear/src/test/groovy/org/gradle/plugins/ear/EarTest.groovy
@@ -28,7 +28,8 @@ class EarTest extends AbstractArchiveTaskTest {
 
     Ear ear
 
-    @Before public void setUp() {
+    @Before
+    public void setUp() {
         ear = createTask(Ear)
         configure(ear)
     }
@@ -37,21 +38,20 @@ class EarTest extends AbstractArchiveTaskTest {
         ear
     }
 
-    @Test public void testEar() {
+    @Test
+    public void testEar() {
         assertEquals(Ear.EAR_EXTENSION, ear.extension)
     }
 
-    @Test public void testLibDirName() {
-        ear.libDirName = "APP-INF/lib"
-        assertEquals(ear.libDirName, ear.lib.destPath as String)
-    }
 
-    @Test public void testDeploymentDescriptor() {
+    @Test
+    public void testDeploymentDescriptor() {
         ear.deploymentDescriptor = new DefaultDeploymentDescriptor(null)
         checkDeploymentDescriptor()
     }
 
-    @Test public void testDeploymentDescriptorWithNullManifest() {
+    @Test
+    public void testDeploymentDescriptorWithNullManifest() {
         ear.deploymentDescriptor = null
         checkDeploymentDescriptor()
     }
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationTest.groovy
index c729de052a4a..59589ed4fb67 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractIdeIntegrationTest.groovy
@@ -19,6 +19,7 @@ package org.gradle.plugins.ide
 
 import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.integtests.fixtures.executer.ExecutionResult
+import org.gradle.plugins.ide.idea.IdeaModuleFixture
 import org.gradle.test.fixtures.file.TestFile
 
 abstract class AbstractIdeIntegrationTest extends AbstractIntegrationTest {
@@ -52,6 +53,10 @@ abstract class AbstractIdeIntegrationTest extends AbstractIntegrationTest {
         return runTask("idea", buildScript)
     }
 
+    protected IdeaModuleFixture parseIml(Map options = [:], String moduleFile) {
+        return new IdeaModuleFixture(parseFile(options, moduleFile))
+    }
+
     protected parseImlFile(Map options = [:], String projectName) {
         parseFile(options, "${projectName}.iml")
     }
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractSourcesAndJavadocJarsIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractSourcesAndJavadocJarsIntegrationTest.groovy
index 8d4548fa52a2..377b36f3d94c 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractSourcesAndJavadocJarsIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/AbstractSourcesAndJavadocJarsIntegrationTest.groovy
@@ -15,10 +15,10 @@
  */
 package org.gradle.plugins.ide
 
-import org.gradle.test.fixtures.ivy.IvyHttpModule
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
-import org.gradle.test.fixtures.maven.HttpArtifact
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.IvyHttpModule
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
+import org.gradle.test.fixtures.server.http.HttpArtifact
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.junit.Rule
 
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseClasspathIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseClasspathIntegrationTest.groovy
index b427c79a861b..37b4f61fd33e 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseClasspathIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseClasspathIntegrationTest.groovy
@@ -172,7 +172,7 @@ eclipse {
   classpath {
     sourceSets = []
 
-    plusConfigurations += configurations.someConfig
+    plusConfigurations << configurations.someConfig
 
     containers 'someFriendlyContainer', 'andYetAnotherContainer'
 
@@ -221,8 +221,8 @@ dependencies {
 }
 
 eclipse.classpath {
-    plusConfigurations += configurations.someConfig
-    minusConfigurations += configurations.someOtherConfig
+    plusConfigurations << configurations.someConfig
+    minusConfigurations << configurations.someOtherConfig
 }
 """
 
@@ -256,8 +256,8 @@ dependencies {
 }
 
 eclipse.classpath {
-    plusConfigurations += configurations.someConfig
-    minusConfigurations += configurations.someOtherConfig
+    plusConfigurations << configurations.someConfig
+    minusConfigurations << configurations.someOtherConfig
 }
 """
 
@@ -291,8 +291,8 @@ dependencies {
 }
 
 eclipse.classpath {
-    plusConfigurations += configurations.someConfig
-    minusConfigurations += configurations.someOtherConfig
+    plusConfigurations << configurations.someConfig
+    minusConfigurations << configurations.someOtherConfig
 }
 """
 
@@ -579,8 +579,8 @@ dependencies {
 
 eclipse {
   classpath {
-    plusConfigurations += configurations.provided
-    noExportConfigurations += configurations.provided
+    plusConfigurations << configurations.provided
+    noExportConfigurations << configurations.provided
   }
 }
 """
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseSourcesAndJavadocJarsIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseSourcesAndJavadocJarsIntegrationTest.groovy
index df46e8173ee8..4788b11a7421 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseSourcesAndJavadocJarsIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseSourcesAndJavadocJarsIntegrationTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.plugins.ide.eclipse
 
 import org.gradle.plugins.ide.AbstractSourcesAndJavadocJarsIntegrationTest
-import org.gradle.test.fixtures.maven.HttpArtifact
+import org.gradle.test.fixtures.server.http.HttpArtifact
 
 class EclipseSourcesAndJavadocJarsIntegrationTest extends AbstractSourcesAndJavadocJarsIntegrationTest {
     @Override
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpModelIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpModelIntegrationTest.groovy
index e0cb1d2157ad..3bc6140a98c4 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpModelIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/eclipse/EclipseWtpModelIntegrationTest.groovy
@@ -69,8 +69,8 @@ eclipse {
 
       sourceDirs += file('someExtraSourceDir')
 
-      plusConfigurations += configurations.configOne
-      minusConfigurations += configurations.configTwo
+      plusConfigurations << configurations.configOne
+      minusConfigurations << configurations.configTwo
 
       deployName = 'someBetterDeployName'
 
@@ -272,8 +272,8 @@ dependencies {
 eclipse {
   wtp {
     component {
-        plusConfigurations += configurations.configOne
-        minusConfigurations += configurations.configTwo
+        plusConfigurations << configurations.configOne
+        minusConfigurations << configurations.configTwo
     }
   }
 }
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaIntegrationTest.groovy
index 114017f2d43b..bdfe9c8bd276 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaIntegrationTest.groovy
@@ -140,11 +140,11 @@ dependencies {
     }
 
     @Test
-        void libraryReferenceSubstitutesPathVariable() {
-            def repoDir = file("repo")
-            def artifact1 = maven(repoDir).module("myGroup", "myArtifact1").publish().artifactFile
+    void libraryReferenceSubstitutesPathVariable() {
+        def repoDir = file("repo")
+        def artifact1 = maven(repoDir).module("myGroup", "myArtifact1").publish().artifactFile
 
-            runIdeaTask """
+        runIdeaTask """
     apply plugin: "java"
     apply plugin: "idea"
 
@@ -161,13 +161,13 @@ dependencies {
     }
             """
 
-            def module = parseImlFile("root")
-            def libs = module.component.orderEntry.library
-            assert libs.size() == 1
-            assert libs.CLASSES.root*.@url*.text().collect { new File(it).name } as Set == [artifact1.name + "!"] as Set
-            assert libs.CLASSES.root*.@url*.text().findAll(){ it.contains("\$GRADLE_REPO\$") }.size() == 1
-            assert libs.CLASSES.root*.@url*.text().collect { it.replace("\$GRADLE_REPO\$", relPath(repoDir))} as Set == ["jar://${relPath(artifact1)}!/"] as Set
-        }
+        def module = parseImlFile("root")
+        def libs = module.component.orderEntry.library
+        assert libs.size() == 1
+        assert libs.CLASSES.root*.@url*.text().collect { new File(it).name } as Set == [artifact1.name + "!"] as Set
+        assert libs.CLASSES.root*.@url*.text().findAll(){ it.contains("\$GRADLE_REPO\$") }.size() == 1
+        assert libs.CLASSES.root*.@url*.text().collect { it.replace("\$GRADLE_REPO\$", relPath(repoDir))} as Set == ["jar://${relPath(artifact1)}!/"] as Set
+    }
 
     @Test
     void onlyAddsSourceDirsThatExistOnFileSystem() {
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleFixture.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleFixture.groovy
new file mode 100644
index 000000000000..85eafe847c4e
--- /dev/null
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleFixture.groovy
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugins.ide.idea
+
+import groovy.util.slurpersupport.GPathResult
+
+class IdeaModuleFixture {
+    private GPathResult iml
+
+    IdeaModuleFixture(GPathResult iml) {
+        this.iml = iml
+    }
+
+    ImlDependencies getDependencies() {
+        new ImlDependencies(iml.component.orderEntry.collect { it ->
+            if (it.@type == 'module-library') {
+                def lib = new ImlLibrary()
+                lib.type = 'module-library'
+                lib.url = it.library.CLASSES.root.@url.text()
+                lib.scope = it.@scope != '' ? it.@scope : 'COMPILE'
+                return lib
+            } else if (it.@type == 'module') {
+                def module = new ImlModule()
+                module.type = 'module'
+                module.scope = it.@scope != '' ? it.@scope : 'COMPILE'
+                module.moduleName = it.'@module-name'
+                return module
+            } else if (it.@type == 'sourceFolder') {
+                def source = new ImlSource()
+                source.type = 'sourceFolder'
+                source.forTests = it.@forTests
+                return source
+            } else {
+                def dep = new ImlDependency()
+                dep.type = it.@type
+                return dep
+            }
+        })
+
+    }
+
+    class ImlDependencies {
+        List<ImlDependency> dependencies
+
+        private ImlDependencies(List<ImlDependency> dependencies) {
+            this.dependencies = dependencies
+        }
+
+        List<ImlLibrary> getLibraries() {
+            dependencies.findAll { it.type == 'module-library' }
+        }
+
+        List<ImlModule> getModules() {
+            dependencies.findAll { it.type == 'module' }
+        }
+
+        void assertHasInheritedJdk() {
+            assert dependencies.any { ImlDependency it ->
+                it.type == 'inheritedJdk'
+            }
+        }
+
+        void assertHasSource(String forTests) {
+            assert dependencies.findAll { it.type == 'sourceFolder' }.any { ImlSource it -> it.forTests = forTests }
+        }
+
+        void assertHasModule(String scope, String name) {
+            assert modules.any { ImlModule it ->
+                it.scope == scope && it.moduleName == name
+            }
+        }
+
+        void assertHasLibrary(String scope, String name) {
+            assert libraries.any { ImlLibrary it ->
+                it.scope == scope && it.url.contains(name)
+            }
+        }
+    }
+
+    class ImlDependency {
+        String type
+    }
+
+    class ImlSource extends ImlDependency {
+        String forTests
+    }
+
+    class ImlModule extends ImlDependency {
+        String scope
+        String moduleName
+    }
+
+    class ImlLibrary extends ImlDependency {
+        String scope
+        String url
+
+        @Override
+        public String toString() {
+            return "ImlLibrary{" +
+                    "type='" + type + '\'' +
+                    ", scope='" + scope + '\'' +
+                    ", url='" + url + '\'' +
+                    '}';
+        }
+    }
+}
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleIntegrationTest.groovy
index 29487ac370a9..50972e0e59a8 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaModuleIntegrationTest.groovy
@@ -122,7 +122,7 @@ dependencies {
 
 idea {
     module {
-        scopes.COMPILE.plus += configurations.foo
+        scopes.COMPILE.plus << configurations.foo
         scopes.COMPILE.minus += [configurations.bar, configurations.baz]
     }
 }
@@ -190,14 +190,11 @@ apply plugin: "idea"
 sourceSets.main.output.dir "$buildDir/generated/main"
 sourceSets.test.output.dir "$buildDir/ws/test"
 '''
-        def iml = parseFile(print: true, 'root.iml')
-
         //then
-        assert iml.component.orderEntry.@scope.collect { it.text() == ['RUNTIME', 'TEST'] }
-
-        def classesDirs = iml.component.orderEntry.library.CLASSES.root.@url.collect { it.text() }
-        assert classesDirs.any { it.contains ('generated/main') }
-        assert classesDirs.any { it.contains ('ws/test') }
+        def dependencies = parseIml("root.iml").dependencies
+        assert dependencies.libraries.size() == 2
+        dependencies.assertHasLibrary('RUNTIME', 'generated/main')
+        dependencies.assertHasLibrary('TEST', 'ws/test')
     }
 
     @Test
@@ -391,19 +388,12 @@ dependencies {
     runtime 'org.gradle:impl-artifact:1.0'
 }
 """
-        def iml = parseFile(print: true, 'root.iml')
-
         //then
-        assert iml.component.orderEntry.@scope.collect { it.text() == ['RUNTIME', 'TEST'] }
-
-        def orderEntries = iml.component.orderEntry
-        assert orderEntries.findAll { it.@type == 'module-library' }.size() == 3
-        assert orderEntries.any { it.@type == 'module-library' && // no scope means COMPILE
-                it.library.CLASSES.root.@url.text().contains ('api-artifact-1.0.jar') }
-        assert orderEntries.any { it.@type == 'module-library' && it.@scope == 'RUNTIME' &&
-                it.library.CLASSES.root.@url.text().contains ('impl-artifact-1.0.jar') }
-        assert orderEntries.any { it.@type == 'module-library' && it.@scope == 'TEST' &&
-                it.library.CLASSES.root.@url.text().contains ('impl-artifact-1.0.jar') }
+        def dependencies = parseIml("root.iml").dependencies
+        assert dependencies.libraries.size() == 3
+        dependencies.assertHasLibrary('COMPILE', 'api-artifact-1.0.jar')
+        dependencies.assertHasLibrary('RUNTIME', 'impl-artifact-1.0.jar')
+        dependencies.assertHasLibrary('TEST', 'impl-artifact-1.0.jar')
     }
 
     @Test
@@ -427,19 +417,14 @@ dependencies {
 
 idea {
   module {
-    scopes.PROVIDED.plus += configurations.compile
+    scopes.PROVIDED.plus << configurations.compile
   }
 }
 """
-        def iml = parseFile(print: true, 'root.iml')
-
         //then
-        assert iml.component.orderEntry.@scope.collect { it.text() == ['PROVIDED'] }
-
-        def orderEntries = iml.component.orderEntry
-        assert orderEntries.findAll { it.@type == 'module-library' }.size() == 1
-        assert orderEntries.any { it.@type == 'module-library' && it.@scope == 'PROVIDED' &&
-                it.library.CLASSES.root.@url.text().contains ('api-artifact-1.0.jar') }
+        def dependencies = parseIml("root.iml").dependencies
+        assert dependencies.libraries.size() == 1
+        dependencies.assertHasLibrary('PROVIDED', 'api-artifact-1.0.jar')
     }
 
     @Test
@@ -469,22 +454,16 @@ dependencies {
 
 idea {
   module {
-    scopes.PROVIDED.plus += configurations.myCustom
-    scopes.COMPILE.plus += configurations.myCustom
+    scopes.PROVIDED.plus << configurations.myCustom
+    scopes.COMPILE.plus << configurations.myCustom
   }
 }
 """
-        def iml = parseFile(print: true, 'root.iml')
-
         //then
-        assert iml.component.orderEntry.@scope.collect { it.text() == ['PROVIDED'] }
-
-        def orderEntries = iml.component.orderEntry
-        assert orderEntries.findAll { it.@type == 'module-library' }.size() == 2
-        assert orderEntries.any { it.@type == 'module-library' && it.@scope == 'PROVIDED' &&
-                it.library.CLASSES.root.@url.text().contains ('bar-1.0.jar') }
-        assert orderEntries.any { it.@type == 'module-library' &&
-                it.library.CLASSES.root.@url.text().contains ('api-artifact-1.0.jar') }
+        def dependencies = parseIml("root.iml").dependencies
+        assert dependencies.libraries.size() == 2
+        dependencies.assertHasLibrary('PROVIDED', 'bar-1.0.jar')
+        dependencies.assertHasLibrary('COMPILE', 'api-artifact-1.0.jar')
     }
 
     @Test
@@ -521,19 +500,12 @@ idea {
   }
 }
 """
-        def iml = parseFile(print: true, 'root.iml')
-
         //then
-        assert iml.component.orderEntry.@scope.collect { it.text() == ['TEST', 'RUNTIME'] }
-
-        def orderEntries = iml.component.orderEntry
-        assert orderEntries.findAll { it.@type == 'module-library' }.size() == 3
-        assert orderEntries.any { it.@type == 'module-library' &&
-                it.library.CLASSES.root.@url.text().contains ('api-artifact-1.0.jar') }
-        assert orderEntries.any { it.@type == 'module-library' && it.@scope == 'TEST' &&
-                it.library.CLASSES.root.@url.text().contains ('bar-1.0.jar') }
-        assert orderEntries.any { it.@type == 'module-library' && it.@scope == 'RUNTIME' &&
-                it.library.CLASSES.root.@url.text().contains ('bar-1.0.jar') }
+        def dependencies = parseIml("root.iml").dependencies
+        assert dependencies.libraries.size() == 3
+        dependencies.assertHasLibrary('COMPILE', 'api-artifact-1.0.jar')
+        dependencies.assertHasLibrary('TEST', 'bar-1.0.jar')
+        dependencies.assertHasLibrary('RUNTIME', 'bar-1.0.jar')
     }
 
     @Test
@@ -559,10 +531,8 @@ dependencies {
     compile 'org.gradle:api-artifact:1.0'
 }
 """
-        def iml = parseFile(print: true, 'root.iml')
-
         //then
-        def orderEntries = iml.component.orderEntry
-        assert orderEntries.findAll { it.@type == 'module-library' }.size() == 0
+        def dependencies = parseIml("root.iml").dependencies
+        assert dependencies.libraries.isEmpty()
     }
 }
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaMultiModuleIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaMultiModuleIntegrationTest.groovy
index 260771fd307b..b73933a5fe11 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaMultiModuleIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaMultiModuleIntegrationTest.groovy
@@ -66,10 +66,14 @@ project(':shared:model') {
         executer.usingBuildScript(buildFile).usingSettingsFile(settingsFile).withTasks("ideaModule").run()
 
         //then
-        def apiDeps = parseImlDependencies(project: 'master/api', "api.iml")
-        ['shared-api', 'model'].each { assert apiDeps.contains(it) }
-        def modelDeps = parseImlDependencies(project: 'master/shared/model', "model.iml")
-        ['util'].each { assert modelDeps.contains(it) }
+        def dependencies = parseIml("master/api/api.iml").dependencies
+        assert dependencies.modules.size() == 2
+        dependencies.assertHasModule("COMPILE", "shared-api")
+        dependencies.assertHasModule("TEST", "model")
+
+        dependencies = parseIml("master/shared/model/model.iml").dependencies
+        assert dependencies.modules.size() == 1
+        dependencies.assertHasModule("TEST", "util")
     }
 
     @Test
@@ -136,30 +140,18 @@ project(':services:utilities') {
 
         //then
         assertIprContainsCorrectModules()
-        assertApiModuleContainsCorrectDependencies()
-        assertServicesUtilModuleContainsCorrectDependencies()
-    }
-
-    def assertServicesUtilModuleContainsCorrectDependencies() {
-        List moduleDeps = parseImlDependencies(project: 'master/services/utilities', "services-util.iml")
-
-        assert moduleDeps.contains("very-cool-model")
-        assert moduleDeps.contains("util")
-        assert moduleDeps.contains("shared-api")
-        assert moduleDeps.contains("contrib-services-util")
-    }
-
-    List parseImlDependencies(options, file) {
-        def iml = parseFile(options, file)
-        def moduleDeps = iml.component.orderEntry.'@module-name'.collect { it.text() }
-        return moduleDeps
-    }
-
-    def assertApiModuleContainsCorrectDependencies() {
-        def moduleDeps = parseImlDependencies(project: 'master/api', "api.iml")
 
-        assert moduleDeps.contains("very-cool-model")
-        assert moduleDeps.contains("shared-api")
+        def moduleDeps = parseIml("master/api/api.iml").dependencies
+        assert moduleDeps.modules.size() == 2
+        moduleDeps.assertHasModule("COMPILE", "shared-api")
+        moduleDeps.assertHasModule("COMPILE", "very-cool-model")
+
+        moduleDeps = parseIml("master/services/utilities/services-util.iml").dependencies
+        assert moduleDeps.modules.size() == 4
+        moduleDeps.assertHasModule("COMPILE", "shared-api")
+        moduleDeps.assertHasModule("COMPILE", "very-cool-model")
+        moduleDeps.assertHasModule("COMPILE", "util")
+        moduleDeps.assertHasModule("COMPILE", "contrib-services-util")
     }
 
     def assertIprContainsCorrectModules() {
@@ -333,20 +325,14 @@ project(':app') {
 
         //when
         executer.usingBuildScript(buildFile).usingSettingsFile(settingsFile).withTasks("ideaModule").run()
-        def iml = parseFile(project: 'master/app', print: true, 'app.iml')
 
         //then
-        assert iml.component.orderEntry.@scope.collect { it.text() == ['RUNTIME', 'TEST'] }
-
-        def orderEntries = iml.component.orderEntry
-        assert orderEntries.size() == 5
-        assert orderEntries.any { it.@type == 'inheritedJdk' }
-        assert orderEntries.any { it.@type == 'sourceFolder' }
-        assert orderEntries.any { it.@type == 'module' &&
-                it.'@module-name'.text().contains ('api') }
-        assert orderEntries.any { it.@type == 'module' && it.@scope == 'RUNTIME' &&
-                it.'@module-name'.text().contains ('impl') }
-        assert orderEntries.any { it.@type == 'module' && it.@scope == 'TEST' &&
-                it.'@module-name'.text().contains ('impl') }
+        def dependencies = parseIml("master/app/app.iml").dependencies
+        assert dependencies.modules.size() == 3
+        dependencies.assertHasInheritedJdk()
+        dependencies.assertHasSource('false')
+        dependencies.assertHasModule('COMPILE', 'api')
+        dependencies.assertHasModule('TEST', 'impl')
+        dependencies.assertHasModule('RUNTIME', 'impl')
     }
 }
diff --git a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaSourcesAndJavadocJarsIntegrationTest.groovy b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaSourcesAndJavadocJarsIntegrationTest.groovy
index f76d16c887b4..8c9d82e7579f 100644
--- a/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaSourcesAndJavadocJarsIntegrationTest.groovy
+++ b/subprojects/ide/src/integTest/groovy/org/gradle/plugins/ide/idea/IdeaSourcesAndJavadocJarsIntegrationTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.plugins.ide.idea
 
 import org.gradle.plugins.ide.AbstractSourcesAndJavadocJarsIntegrationTest
-import org.gradle.test.fixtures.maven.HttpArtifact
+import org.gradle.test.fixtures.server.http.HttpArtifact
 
 class IdeaSourcesAndJavadocJarsIntegrationTest extends AbstractSourcesAndJavadocJarsIntegrationTest {
     @Override
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/GeneratorTask.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/GeneratorTask.java
index 7058bf08ab61..02178ebf4709 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/GeneratorTask.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/api/GeneratorTask.java
@@ -20,9 +20,11 @@
 import org.gradle.api.specs.Specs;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.internal.reflect.Instantiator;
 import org.gradle.listener.ActionBroadcast;
 import org.gradle.plugins.ide.internal.generator.generator.Generator;
 
+import javax.inject.Inject;
 import java.io.File;
 
 /**
@@ -79,6 +81,11 @@ void generate() {
         generator.write(domainObject, getOutputFile());
     }
 
+    @Inject
+    protected Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * The input file to load the initial configuration from. Defaults to the output file. If the specified input file
      * does not exist, this task uses some default initial configuration.
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipsePlugin.groovy b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipsePlugin.groovy
index 3a14788908c0..e6356d35e854 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipsePlugin.groovy
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipsePlugin.groovy
@@ -151,7 +151,7 @@ class EclipsePlugin extends IdePlugin {
                         def provided = ["scala-library", "scala-swing", "scala-dbc"]
                         def dependencies = classpath.plusConfigurations.collectMany { it.allDependencies }.findAll { it.name in provided }
                         if (!dependencies.empty) {
-                            classpath.minusConfigurations += project.configurations.detachedConfiguration(dependencies as Dependency[])
+                            classpath.minusConfigurations << project.configurations.detachedConfiguration(dependencies as Dependency[])
                         }
                     }
                 }
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseJdt.groovy b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseJdt.groovy
index 499be65665c8..4111530daa35 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseJdt.groovy
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseJdt.groovy
@@ -15,7 +15,6 @@
  */
 package org.gradle.plugins.ide.eclipse
 
-import org.gradle.internal.reflect.Instantiator
 import org.gradle.plugins.ide.api.PropertiesFileContentMerger
 import org.gradle.plugins.ide.api.PropertiesGeneratorTask
 import org.gradle.plugins.ide.eclipse.model.EclipseJdt
@@ -34,7 +33,7 @@ class GenerateEclipseJdt extends PropertiesGeneratorTask<Jdt> {
     EclipseJdt jdt
 
     GenerateEclipseJdt() {
-        jdt = services.get(Instantiator).newInstance(EclipseJdt, new PropertiesFileContentMerger(getTransformer()))
+        jdt = instantiator.newInstance(EclipseJdt, new PropertiesFileContentMerger(getTransformer()))
     }
     
     protected Jdt create() {
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseProject.groovy b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseProject.groovy
index cc1992f2aad9..1f09e4dc6d31 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseProject.groovy
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseProject.groovy
@@ -15,7 +15,6 @@
  */
 package org.gradle.plugins.ide.eclipse
 
-import org.gradle.internal.reflect.Instantiator
 import org.gradle.plugins.ide.api.XmlFileContentMerger
 import org.gradle.plugins.ide.api.XmlGeneratorTask
 import org.gradle.plugins.ide.eclipse.model.EclipseProject
@@ -35,7 +34,7 @@ class GenerateEclipseProject extends XmlGeneratorTask<Project> {
 
     GenerateEclipseProject() {
         xmlTransformer.indentation = "\t"
-        projectModel = services.get(Instantiator).newInstance(EclipseProject, new XmlFileContentMerger(xmlTransformer))
+        projectModel = instantiator.newInstance(EclipseProject, new XmlFileContentMerger(xmlTransformer))
     }
 
     @Override protected Project create() {
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpComponent.groovy b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpComponent.groovy
index 5632f4c5bd7c..970f416950f0 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpComponent.groovy
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpComponent.groovy
@@ -16,7 +16,6 @@
 package org.gradle.plugins.ide.eclipse
 
 import org.gradle.api.artifacts.Configuration
-import org.gradle.internal.reflect.Instantiator
 import org.gradle.plugins.ide.api.XmlFileContentMerger
 import org.gradle.plugins.ide.api.XmlGeneratorTask
 import org.gradle.plugins.ide.eclipse.model.EclipseWtpComponent
@@ -37,7 +36,7 @@ class GenerateEclipseWtpComponent extends XmlGeneratorTask<WtpComponent> {
 
     GenerateEclipseWtpComponent() {
         xmlTransformer.indentation = "\t"
-        component = services.get(Instantiator).newInstance(EclipseWtpComponent, project, new XmlFileContentMerger(xmlTransformer))
+        component = instantiator.newInstance(EclipseWtpComponent, project, new XmlFileContentMerger(xmlTransformer))
     }
 
     @Override protected WtpComponent create() {
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpFacet.groovy b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpFacet.groovy
index 8adf9efa3485..cf7dc16a01fc 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpFacet.groovy
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/GenerateEclipseWtpFacet.groovy
@@ -15,7 +15,6 @@
  */
 package org.gradle.plugins.ide.eclipse
 
-import org.gradle.internal.reflect.Instantiator
 import org.gradle.plugins.ide.api.XmlFileContentMerger
 import org.gradle.plugins.ide.api.XmlGeneratorTask
 import org.gradle.plugins.ide.eclipse.model.EclipseWtpFacet
@@ -33,7 +32,7 @@ class GenerateEclipseWtpFacet extends XmlGeneratorTask<WtpFacet> {
 
     GenerateEclipseWtpFacet() {
         xmlTransformer.indentation = "\t"
-        facet = services.get(Instantiator).newInstance(EclipseWtpFacet, new XmlFileContentMerger(xmlTransformer))
+        facet = instantiator.newInstance(EclipseWtpFacet, new XmlFileContentMerger(xmlTransformer))
     }
 
     @Override protected WtpFacet create() {
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/PathFactory.groovy b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/PathFactory.groovy
index c7735e8956b6..27f69e3c8d3e 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/PathFactory.groovy
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/idea/model/PathFactory.groovy
@@ -43,7 +43,7 @@ class PathFactory {
         }
 
         if (match) {
-            return relativePath(match.dir, match.name, file)
+            return resolvePath(match.dir, match.name, file)
         }
 
         // IDEA doesn't like the result of file.toURI() so use the absolute path instead
@@ -56,10 +56,10 @@ class PathFactory {
      * Creates a path relative to the given path variable.
      */
     FilePath relativePath(String pathVar, File file) {
-        return relativePath(varsByName[pathVar], "\$$pathVar\$", file)
+        return resolvePath(varsByName[pathVar], "\$$pathVar\$", file)
     }
 
-    private FilePath relativePath(File rootDir, String rootDirName, File file) {
+    private FilePath resolvePath(File rootDir, String rootDirName, File file) {
         def relPath = getRelativePath(rootDir, rootDirName, file)
         def url = relativePathToURI(relPath)
         def canonicalUrl = relativePathToURI(file.absolutePath.replace(File.separator, '/'))
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/IdeDependenciesExtractor.groovy b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/IdeDependenciesExtractor.groovy
index dbff24685bc2..bd11b324eaaa 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/IdeDependenciesExtractor.groovy
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/IdeDependenciesExtractor.groovy
@@ -24,9 +24,9 @@ import org.gradle.api.artifacts.ModuleVersionIdentifier
 import org.gradle.api.artifacts.component.ComponentIdentifier
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier
 import org.gradle.api.artifacts.dsl.DependencyHandler
-import org.gradle.api.artifacts.resolution.JvmLibrary
-import org.gradle.api.artifacts.resolution.JvmLibraryJavadocArtifact
-import org.gradle.api.artifacts.resolution.JvmLibrarySourcesArtifact
+import org.gradle.api.artifacts.result.jvm.JavadocArtifact
+import org.gradle.api.artifacts.result.jvm.JvmLibraryComponent
+import org.gradle.api.artifacts.result.jvm.SourcesArtifact
 import org.gradle.api.internal.artifacts.component.DefaultModuleComponentIdentifier
 import org.gradle.plugins.ide.internal.resolver.DefaultIdeDependencyResolver
 import org.gradle.plugins.ide.internal.resolver.IdeDependencyResolver
@@ -88,13 +88,13 @@ class IdeDependenciesExtractor {
         def query = dependencyHandler.createArtifactResolutionQuery()
         query.forComponents(dependencies.keySet());
         if (downloadSources) {
-            query.withArtifacts(JvmLibrary, JvmLibrarySourcesArtifact)
+            query.withArtifacts(JvmLibraryComponent, SourcesArtifact)
         }
         if (downloadJavadoc) {
-            query.withArtifacts(JvmLibrary, JvmLibraryJavadocArtifact)
+            query.withArtifacts(JvmLibraryComponent, JavadocArtifact)
         }
 
-        def jvmLibraries = query.execute().getComponents(JvmLibrary)
+        def jvmLibraries = query.execute().getResolvedComponents(JvmLibraryComponent)
         for (jvmLibrary in jvmLibraries) {
             for (dependency in dependencies.get(jvmLibrary.id)) {
                 for (sourcesArtifact in jvmLibrary.sourcesArtifacts) {
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilder.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilder.java
index 0b28697fc37e..9f9612bbca4a 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilder.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilder.java
@@ -21,6 +21,7 @@
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
+import org.gradle.api.internal.project.ProjectTaskLister;
 import org.gradle.tooling.internal.gradle.DefaultBuildInvocations;
 import org.gradle.tooling.internal.impl.LaunchableGradleTask;
 import org.gradle.tooling.internal.impl.LaunchableGradleTaskSelector;
@@ -31,10 +32,10 @@
 import java.util.Set;
 
 public class BuildInvocationsBuilder extends ProjectSensitiveToolingModelBuilder {
-    private final GradleProjectBuilder gradleProjectBuilder;
+    private final ProjectTaskLister taskLister;
 
-    public BuildInvocationsBuilder(GradleProjectBuilder gradleProjectBuilder) {
-        this.gradleProjectBuilder = gradleProjectBuilder;
+    public BuildInvocationsBuilder(ProjectTaskLister taskLister) {
+        this.taskLister = taskLister;
     }
 
     public boolean canBuild(String modelName) {
@@ -46,7 +47,7 @@ public DefaultBuildInvocations<LaunchableGradleTask> buildAll(String modelName,
             throw new GradleException("Unknown model name " + modelName);
         }
         List<LaunchableGradleTaskSelector> selectors = Lists.newArrayList();
-        Set<String> aggregatedTasks = Sets.newHashSet();
+        Set<String> aggregatedTasks = Sets.newLinkedHashSet();
         findTasks(project, aggregatedTasks);
         for (String selectorName : aggregatedTasks) {
             selectors.add(new LaunchableGradleTaskSelector().
@@ -60,7 +61,7 @@ public DefaultBuildInvocations<LaunchableGradleTask> buildAll(String modelName,
         }
         return new DefaultBuildInvocations<LaunchableGradleTask>()
                 .setSelectors(selectors)
-                .setTasks(convertTasks(gradleProjectBuilder.buildAll(project).findByPath(project.getPath()).getTasks()));
+                .setTasks(tasks(project));
     }
 
     public DefaultBuildInvocations buildAll(String modelName, Project project, boolean implicitProject) {
@@ -68,16 +69,16 @@ public DefaultBuildInvocations buildAll(String modelName, Project project, boole
     }
 
     // build tasks without project reference
-    private List<LaunchableGradleTask> convertTasks(Iterable<LaunchableGradleTask> tasks) {
-        List<LaunchableGradleTask> convertedTasks = Lists.newArrayList();
-        for (LaunchableGradleTask task : tasks) {
-            convertedTasks.add(new LaunchableGradleTask()
+    private List<LaunchableGradleTask> tasks(Project project) {
+        List<LaunchableGradleTask> tasks = Lists.newArrayList();
+        for (Task task : taskLister.listProjectTasks(project)) {
+            tasks.add(new LaunchableGradleTask()
                     .setPath(task.getPath())
                     .setName(task.getName())
                     .setDisplayName(task.toString())
                     .setDescription(task.getDescription()));
         }
-        return convertedTasks;
+        return tasks;
     }
 
     private void findTasks(Project project, Collection<String> tasks) {
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/EclipseModelBuilder.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/EclipseModelBuilder.java
index 190b8ae17cc6..5d1c609d2f14 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/EclipseModelBuilder.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/EclipseModelBuilder.java
@@ -23,10 +23,6 @@
 import org.gradle.plugins.ide.eclipse.model.*;
 import org.gradle.plugins.ide.internal.tooling.eclipse.*;
 import org.gradle.tooling.internal.gradle.DefaultGradleProject;
-import org.gradle.tooling.internal.protocol.ExternalDependencyVersion1;
-import org.gradle.tooling.internal.protocol.eclipse.EclipseProjectDependencyVersion2;
-import org.gradle.tooling.internal.protocol.eclipse.EclipseSourceDirectoryVersion1;
-import org.gradle.tooling.internal.protocol.eclipse.EclipseTaskVersion1;
 import org.gradle.tooling.provider.model.ToolingModelBuilder;
 import org.gradle.util.GUtil;
 
@@ -88,9 +84,9 @@ private void populate(Project project) {
         classpath.setProjectDependenciesOnly(projectDependenciesOnly);
         List<ClasspathEntry> entries = classpath.resolveDependencies();
 
-        final List<ExternalDependencyVersion1> externalDependencies = new LinkedList<ExternalDependencyVersion1>();
-        final List<EclipseProjectDependencyVersion2> projectDependencies = new LinkedList<EclipseProjectDependencyVersion2>();
-        final List<EclipseSourceDirectoryVersion1> sourceDirectories = new LinkedList<EclipseSourceDirectoryVersion1>();
+        final List<DefaultEclipseExternalDependency> externalDependencies = new LinkedList<DefaultEclipseExternalDependency>();
+        final List<DefaultEclipseProjectDependency> projectDependencies = new LinkedList<DefaultEclipseProjectDependency>();
+        final List<DefaultEclipseSourceDirectory> sourceDirectories = new LinkedList<DefaultEclipseSourceDirectory>();
 
         for (ClasspathEntry entry : entries) {
             //we don't handle Variables at the moment because users didn't request it yet
@@ -122,7 +118,7 @@ private void populate(Project project) {
         }
         eclipseProject.setLinkedResources(linkedResources);
 
-        List<EclipseTaskVersion1> tasks = new ArrayList<EclipseTaskVersion1>();
+        List<DefaultEclipseTask> tasks = new ArrayList<DefaultEclipseTask>();
         for (Task t : tasksFactory.getTasks(project)) {
             tasks.add(new DefaultEclipseTask(eclipseProject, t.getPath(), t.getName(), t.getDescription()));
         }
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/ToolingRegistrationAction.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/ToolingRegistrationAction.java
index bdf003027334..8c8ec4eacf17 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/ToolingRegistrationAction.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/ToolingRegistrationAction.java
@@ -18,6 +18,7 @@
 
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.ProjectPublicationRegistry;
 import org.gradle.api.internal.project.ProjectInternal;
+import org.gradle.api.internal.project.ProjectTaskLister;
 import org.gradle.configuration.project.ProjectConfigureAction;
 import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry;
 
@@ -25,6 +26,7 @@ public class ToolingRegistrationAction implements ProjectConfigureAction {
     public void execute(ProjectInternal project) {
         ToolingModelBuilderRegistry modelBuilderRegistry = project.getServices().get(ToolingModelBuilderRegistry.class);
         ProjectPublicationRegistry projectPublicationRegistry = project.getServices().get(ProjectPublicationRegistry.class);
+        ProjectTaskLister taskLister = project.getServices().get(ProjectTaskLister.class);
 
         GradleProjectBuilder gradleProjectBuilder  = new GradleProjectBuilder();
         IdeaModelBuilder ideaModelBuilder = new IdeaModelBuilder(gradleProjectBuilder);
@@ -33,7 +35,7 @@ public void execute(ProjectInternal project) {
         modelBuilderRegistry.register(gradleProjectBuilder);
         modelBuilderRegistry.register(new GradleBuildBuilder());
         modelBuilderRegistry.register(new BasicIdeaModelBuilder(ideaModelBuilder));
-        modelBuilderRegistry.register(new BuildInvocationsBuilder(gradleProjectBuilder));
+        modelBuilderRegistry.register(new BuildInvocationsBuilder(taskLister));
         modelBuilderRegistry.register(new PublicationsBuilder(projectPublicationRegistry));
     }
 }
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseLinkedResource.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseLinkedResource.java
index 0ff1f7bcd1b6..6e650b262806 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseLinkedResource.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseLinkedResource.java
@@ -16,11 +16,9 @@
 
 package org.gradle.plugins.ide.internal.tooling.eclipse;
 
-import org.gradle.tooling.internal.protocol.eclipse.EclipseLinkedResourceVersion1;
-
 import java.io.Serializable;
 
-public class DefaultEclipseLinkedResource implements Serializable, EclipseLinkedResourceVersion1 {
+public class DefaultEclipseLinkedResource implements Serializable {
 
     private String name;
     private String type;
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProject.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProject.java
index 9f13cd0eb5f6..98aa1179c3ed 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProject.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProject.java
@@ -18,29 +18,30 @@
 import com.google.common.collect.Lists;
 import org.gradle.tooling.internal.gradle.DefaultGradleProject;
 import org.gradle.tooling.internal.gradle.GradleProjectIdentity;
-import org.gradle.tooling.internal.protocol.ExternalDependencyVersion1;
-import org.gradle.tooling.internal.protocol.eclipse.*;
 
 import java.io.File;
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
-public class DefaultEclipseProject implements EclipseProjectVersion3, Serializable, GradleProjectIdentity {
+/**
+ * An implementation for {@link org.gradle.tooling.model.eclipse.EclipseProject}.
+ */
+public class DefaultEclipseProject implements Serializable, GradleProjectIdentity {
     private final String name;
     private final String path;
-    private EclipseProjectVersion3 parent;
-    private List<ExternalDependencyVersion1> classpath;
-    private final List<EclipseProjectVersion3> children;
-    private List<EclipseSourceDirectoryVersion1> sourceDirectories;
-    private List<EclipseProjectDependencyVersion2> projectDependencies;
+    private DefaultEclipseProject parent;
+    private List<DefaultEclipseExternalDependency> classpath;
+    private final List<DefaultEclipseProject> children;
+    private List<DefaultEclipseSourceDirectory> sourceDirectories;
+    private List<DefaultEclipseProjectDependency> projectDependencies;
     private final String description;
     private final File projectDirectory;
-    private Iterable<? extends EclipseTaskVersion1> tasks;
-    private Iterable<? extends EclipseLinkedResourceVersion1> linkedResources;
+    private Iterable<? extends DefaultEclipseTask> tasks;
+    private Iterable<? extends DefaultEclipseLinkedResource> linkedResources;
     private DefaultGradleProject gradleProject;
 
-    public DefaultEclipseProject(String name, String path, String description, File projectDirectory, Iterable<? extends EclipseProjectVersion3> children) {
+    public DefaultEclipseProject(String name, String path, String description, File projectDirectory, Iterable<? extends DefaultEclipseProject> children) {
         this.name = name;
         this.path = path;
         this.description = description;
@@ -69,7 +70,7 @@ public String getDescription() {
         return description;
     }
 
-    public EclipseProjectVersion3 getParent() {
+    public DefaultEclipseProject getParent() {
         return parent;
     }
 
@@ -77,50 +78,51 @@ public File getProjectDirectory() {
         return projectDirectory;
     }
 
-    public void setParent(EclipseProjectVersion3 parent) {
+    public void setParent(DefaultEclipseProject parent) {
         this.parent = parent;
     }
 
-    public List<EclipseProjectVersion3> getChildren() {
+    public List<DefaultEclipseProject> getChildren() {
         return children;
     }
 
-    public Iterable<? extends EclipseSourceDirectoryVersion1> getSourceDirectories() {
+    public Iterable<? extends DefaultEclipseSourceDirectory> getSourceDirectories() {
         return sourceDirectories;
     }
 
-    public void setSourceDirectories(List<EclipseSourceDirectoryVersion1> sourceDirectories) {
+    public void setSourceDirectories(List<DefaultEclipseSourceDirectory> sourceDirectories) {
         this.sourceDirectories = sourceDirectories;
     }
 
-    public Iterable<? extends EclipseProjectDependencyVersion2> getProjectDependencies() {
+    public Iterable<? extends DefaultEclipseProjectDependency> getProjectDependencies() {
         return projectDependencies;
     }
 
-    public void setProjectDependencies(List<EclipseProjectDependencyVersion2> projectDependencies) {
+    public void setProjectDependencies(List<DefaultEclipseProjectDependency> projectDependencies) {
         this.projectDependencies = projectDependencies;
     }
 
-    public List<ExternalDependencyVersion1> getClasspath() {
+    public List<DefaultEclipseExternalDependency> getClasspath() {
         return classpath;
     }
-    public void setClasspath(List<ExternalDependencyVersion1> classpath) {
+
+    public void setClasspath(List<DefaultEclipseExternalDependency> classpath) {
         this.classpath = classpath;
     }
 
-    public Iterable<? extends EclipseTaskVersion1> getTasks() {
+    public Iterable<? extends DefaultEclipseTask> getTasks() {
         return tasks;
     }
 
-    public void setTasks(Iterable<? extends EclipseTaskVersion1> tasks) {
+    public void setTasks(Iterable<? extends DefaultEclipseTask> tasks) {
         this.tasks = tasks;
     }
 
-    public Iterable<? extends EclipseLinkedResourceVersion1> getLinkedResources() {
+    public Iterable<? extends DefaultEclipseLinkedResource> getLinkedResources() {
         return linkedResources;
     }
 
-    public void setLinkedResources(Iterable<? extends EclipseLinkedResourceVersion1> linkedResources) {
+    public void setLinkedResources(Iterable<? extends DefaultEclipseLinkedResource> linkedResources) {
         this.linkedResources = linkedResources;
     }
 
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProjectDependency.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProjectDependency.java
index f04208104f1b..73765b97338c 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProjectDependency.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseProjectDependency.java
@@ -15,21 +15,18 @@
  */
 package org.gradle.plugins.ide.internal.tooling.eclipse;
 
-import org.gradle.tooling.internal.protocol.eclipse.EclipseProjectDependencyVersion2;
-import org.gradle.tooling.internal.protocol.eclipse.HierarchicalEclipseProjectVersion1;
-
 import java.io.Serializable;
 
-public class DefaultEclipseProjectDependency implements EclipseProjectDependencyVersion2, Serializable {
+public class DefaultEclipseProjectDependency implements Serializable {
     private final String path;
-    private final HierarchicalEclipseProjectVersion1 target;
+    private final DefaultEclipseProject target;
 
-    public DefaultEclipseProjectDependency(String path, HierarchicalEclipseProjectVersion1 target) {
+    public DefaultEclipseProjectDependency(String path, DefaultEclipseProject target) {
         this.target = target;
         this.path = path;
     }
 
-    public HierarchicalEclipseProjectVersion1 getTargetProject() {
+    public DefaultEclipseProject getTargetProject() {
         return target;
     }
 
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseSourceDirectory.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseSourceDirectory.java
index f6ba5b25be5a..85e37c11ebeb 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseSourceDirectory.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseSourceDirectory.java
@@ -15,12 +15,10 @@
  */
 package org.gradle.plugins.ide.internal.tooling.eclipse;
 
-import org.gradle.tooling.internal.protocol.eclipse.EclipseSourceDirectoryVersion1;
-
 import java.io.File;
 import java.io.Serializable;
 
-public class DefaultEclipseSourceDirectory implements EclipseSourceDirectoryVersion1, Serializable {
+public class DefaultEclipseSourceDirectory implements Serializable {
     private final String path;
     private final File directory;
 
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseTask.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseTask.java
index cebd4bb3a6a6..7c66d6f2da14 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseTask.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/eclipse/DefaultEclipseTask.java
@@ -15,18 +15,15 @@
  */
 package org.gradle.plugins.ide.internal.tooling.eclipse;
 
-import org.gradle.tooling.internal.protocol.eclipse.EclipseProjectVersion3;
-import org.gradle.tooling.internal.protocol.eclipse.EclipseTaskVersion1;
-
 import java.io.Serializable;
 
-public class DefaultEclipseTask implements EclipseTaskVersion1, Serializable {
-    private final EclipseProjectVersion3 project;
+public class DefaultEclipseTask implements Serializable {
+    private final DefaultEclipseProject project;
     private final String path;
     private final String name;
     private final String description;
 
-    public DefaultEclipseTask(EclipseProjectVersion3 project, String path, String name, String description) {
+    public DefaultEclipseTask(DefaultEclipseProject project, String path, String name, String description) {
         this.project = project;
         this.path = path;
         this.name = name;
@@ -38,7 +35,7 @@ public String toString() {
         return String.format("task '%s'", path);
     }
 
-    public EclipseProjectVersion3 getProject() {
+    public DefaultEclipseProject getProject() {
         return project;
     }
 
diff --git a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaProject.java b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaProject.java
index aaf0234eed8d..5c5cb4bebe9b 100644
--- a/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaProject.java
+++ b/subprojects/ide/src/main/groovy/org/gradle/plugins/ide/internal/tooling/idea/DefaultIdeaProject.java
@@ -16,16 +16,13 @@
 
 package org.gradle.plugins.ide.internal.tooling.idea;
 
-import org.gradle.tooling.internal.protocol.InternalIdeaProject;
-import org.gradle.tooling.model.HierarchicalElement;
 import org.gradle.tooling.model.idea.IdeaLanguageLevel;
 
-import java.io.File;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedList;
 
-public class DefaultIdeaProject implements InternalIdeaProject, Serializable {
+public class DefaultIdeaProject implements Serializable {
     private String name;
     private String description;
     private Collection<DefaultIdeaModule> children = new LinkedList<DefaultIdeaModule>();
@@ -68,18 +65,10 @@ public DefaultIdeaProject setDescription(String description) {
         return this;
     }
 
-    public HierarchicalElement getParent() {
+    public Object getParent() {
         return null;
     }
 
-    public File getProjectDirectory() {
-        throw new UnsupportedOperationException("This method should not be used.");
-    }
-
-    public String getPath() {
-        throw new UnsupportedOperationException("This method should not be used.");
-    }
-
     public DefaultIdeaProject setChildren(Collection<? extends DefaultIdeaModule> children) {
         this.children.clear();
         this.children.addAll(children);
diff --git a/subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/DefaultIdeDependencyResolver.java b/subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/DefaultIdeDependencyResolver.java
index 42d39d07c3ee..6dfd299b3544 100644
--- a/subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/DefaultIdeDependencyResolver.java
+++ b/subprojects/ide/src/main/java/org/gradle/plugins/ide/internal/resolver/DefaultIdeDependencyResolver.java
@@ -23,7 +23,7 @@
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier;
 import org.gradle.api.artifacts.component.ProjectComponentIdentifier;
 import org.gradle.api.artifacts.result.*;
-import org.gradle.api.specs.Spec;
+import org.gradle.api.specs.Specs;
 import org.gradle.plugins.ide.internal.resolver.model.IdeExtendedRepoFileDependency;
 import org.gradle.plugins.ide.internal.resolver.model.IdeLocalFileDependency;
 import org.gradle.plugins.ide.internal.resolver.model.IdeProjectDependency;
@@ -114,7 +114,8 @@ private String unresolvedFileName(ComponentSelector componentSelector) {
      */
     public List<IdeExtendedRepoFileDependency> getIdeRepoFileDependencies(Configuration configuration) {
         ResolutionResult result = getIncomingResolutionResult(configuration);
-        List<ResolvedComponentResult> resolvedDependencies = findAllResolvedDependencyResults(result.getAllDependencies(), ModuleComponentIdentifier.class);
+        List<ResolvedComponentResult> resolvedDependencies = new ArrayList<ResolvedComponentResult>();
+        findAllResolvedDependencyResultsAndTheirDependencies(resolvedDependencies, result.getRoot().getDependencies(), ModuleComponentIdentifier.class);
         Set<ModuleVersionIdentifier> mappedResolvedDependencies = mapResolvedDependencies(resolvedDependencies);
         Set<ResolvedArtifact> artifacts = getExternalArtifacts(configuration);
 
@@ -131,6 +132,28 @@ public List<IdeExtendedRepoFileDependency> getIdeRepoFileDependencies(Configurat
         return externalDependencies;
     }
 
+    /**
+     * Finds all resolved components of the given type from the given set of dependency edges. If resolved component has dependencies itself, recursively resolve them as well
+     * and add them to the results. This method can handle circular dependencies.
+     *
+     * @param dependencies Dependencies
+     * @return Resolved dependency results
+     */
+    private void findAllResolvedDependencyResultsAndTheirDependencies(List<ResolvedComponentResult> matches, Set<? extends DependencyResult> dependencies, Class<? extends ComponentIdentifier> type) {
+        for (DependencyResult dependencyResult : dependencies) {
+            if (dependencyResult instanceof ResolvedDependencyResult) {
+                ResolvedDependencyResult resolvedResult = (ResolvedDependencyResult) dependencyResult;
+                if (type.isInstance(resolvedResult.getSelected().getId())) {
+                    // avoid circular dependencies by checking whether component result is already added
+                    if (!matches.contains(resolvedResult.getSelected())) {
+                        matches.add(resolvedResult.getSelected());
+                        findAllResolvedDependencyResultsAndTheirDependencies(matches, resolvedResult.getSelected().getDependencies(), type);
+                    }
+                }
+            }
+        }
+    }
+
     /**
      * Maps resolved dependencies by module version identifier.
      *
@@ -238,12 +261,6 @@ private List<UnresolvedDependencyResult> findAllUnresolvedDependencyResults(Set<
      * @return External artifacts
      */
     private Set<ResolvedArtifact> getExternalArtifacts(Configuration configuration) {
-        return configuration.getResolvedConfiguration().getLenientConfiguration().getArtifacts(new ExternalDependencySpec());
-    }
-
-    private class ExternalDependencySpec implements Spec<Dependency> {
-        public boolean isSatisfiedBy(Dependency element) {
-            return element instanceof ExternalDependency;
-        }
+        return configuration.getResolvedConfiguration().getLenientConfiguration().getArtifacts(Specs.SATISFIES_ALL);
     }
 }
\ No newline at end of file
diff --git a/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/idea/model/internal/IdeaDependenciesProviderTest.groovy b/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/idea/model/internal/IdeaDependenciesProviderTest.groovy
index cc61e67242a0..3653b833a8a4 100644
--- a/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/idea/model/internal/IdeaDependenciesProviderTest.groovy
+++ b/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/idea/model/internal/IdeaDependenciesProviderTest.groovy
@@ -80,7 +80,7 @@ public class IdeaDependenciesProviderTest extends Specification {
         when:
         project.dependencies.add('compile', project.files('lib/guava.jar'))
         project.dependencies.add('excluded', project.files('lib/guava.jar'))
-        module.scopes.COMPILE.minus += project.configurations.getByName('excluded')
+        module.scopes.COMPILE.minus << project.configurations.getByName('excluded')
         def result = dependenciesProvider.provide(module)
 
         then:
@@ -102,8 +102,8 @@ public class IdeaDependenciesProviderTest extends Specification {
         project.dependencies.add('compile', project.files('lib/slf4j-api.jar'))
         project.dependencies.add('excluded1', project.files('lib/guava.jar'))
         project.dependencies.add('excluded2', project.files('lib/slf4j-api.jar'))
-        module.scopes.COMPILE.minus += project.configurations.getByName('excluded1')
-        module.scopes.COMPILE.minus += project.configurations.getByName('excluded2')
+        module.scopes.COMPILE.minus << project.configurations.getByName('excluded1')
+        module.scopes.COMPILE.minus << project.configurations.getByName('excluded2')
         def result = dependenciesProvider.provide(module)
 
         then:
@@ -121,7 +121,7 @@ public class IdeaDependenciesProviderTest extends Specification {
         module.offline = true
 
         when:
-        module.scopes.RUNTIME.plus += detachedCfg
+        module.scopes.RUNTIME.plus << detachedCfg
         def result = dependenciesProvider.provide(module)
 
         then:
diff --git a/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilderTest.groovy b/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilderTest.groovy
index b816718880c3..e591bde8d9f5 100644
--- a/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilderTest.groovy
+++ b/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/BuildInvocationsBuilderTest.groovy
@@ -17,6 +17,7 @@
 package org.gradle.plugins.ide.internal.tooling
 
 import org.gradle.api.DefaultTask
+import org.gradle.api.internal.project.DefaultProjectTaskLister
 import org.gradle.tooling.internal.impl.LaunchableGradleTaskSelector
 import org.gradle.tooling.model.gradle.BuildInvocations
 import org.gradle.util.TestUtil
@@ -25,7 +26,7 @@ import spock.lang.Specification
 import spock.lang.Unroll
 
 class BuildInvocationsBuilderTest extends Specification {
-    def builder = new BuildInvocationsBuilder(new GradleProjectBuilder())
+    def builder = new BuildInvocationsBuilder(new DefaultProjectTaskLister())
     @Shared def project = TestUtil.builder().withName("root").build()
     @Shared def child1 = TestUtil.builder().withName("child1").withParent(project).build()
     @Shared def child1a = TestUtil.builder().withName("child1a").withParent(child1).build()
diff --git a/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/TasksFactoryTest.groovy b/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/TasksFactoryTest.groovy
index e55ec83d42ca..47d77b021b17 100644
--- a/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/TasksFactoryTest.groovy
+++ b/subprojects/ide/src/test/groovy/org/gradle/plugins/ide/internal/tooling/TasksFactoryTest.groovy
@@ -23,7 +23,7 @@ import spock.lang.Specification
 
 class TasksFactoryTest extends Specification {
     final Project project = Mock()
-    final org.gradle.tooling.internal.protocol.eclipse.EclipseProjectVersion3 eclipseProject = new DefaultEclipseProject(null, null, null, null, [])
+    final def eclipseProject = new DefaultEclipseProject(null, null, null, null, [])
     final task = TestUtil.createTask(AbstractTask)
 
     def "does not return tasks"() {
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildAggregationIntegrationTest.groovy b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildAggregationIntegrationTest.groovy
index 7eaaaaab3e99..dea650b24834 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildAggregationIntegrationTest.groovy
+++ b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/BuildAggregationIntegrationTest.groovy
@@ -93,20 +93,37 @@ class BuildAggregationIntegrationTest extends AbstractIntegrationTest {
     @Test
     @Issue("http://issues.gradle.org//browse/GRADLE-3052")
     void buildTaskCanHaveInputsAndOutputs() {
-        def message = "This is from the hello task"
+        file("input") << "foo"
+        file("settings.gradle") << "rootProject.name = 'proj'"
         file("build.gradle") << """
-            task hello << { println "$message" }
+            class UpperFile extends DefaultTask {
+                @InputFile
+                File input
+
+                @OutputFile
+                File output
+
+                @TaskAction
+                void upper() {
+                  output.text = input.text.toUpperCase()
+                }
+            }
+
+            task upper(type: UpperFile) {
+                input = file("input")
+                output = file("output")
+            }
 
             task build(type: GradleBuild) {
-              tasks = ["hello"]
+              dependsOn upper
+              tasks = ["upper"]
               startParameter.searchUpwards = false
               outputs.file "build.gradle" // having an output (or input) triggers the bug
             }
         """
 
         def run = executer.withTasks("build").run()
-        def output = run.output
-
-        assert output.contains(message)
+        assert run.executedTasks == [":upper", ":build", ":proj:upper"]
+        assert run.skippedTasks == [":proj:upper"].toSet()
     }
 }
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CacheProjectIntegrationTest.groovy b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CacheProjectIntegrationTest.groovy
index 84b1522fd146..977dc85a3a49 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CacheProjectIntegrationTest.groovy
+++ b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/CacheProjectIntegrationTest.groovy
@@ -21,7 +21,7 @@ import org.gradle.groovy.scripts.ScriptSource
 import org.gradle.groovy.scripts.UriScriptSource
 import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.gradle.util.GradleVersion
 import org.junit.Before
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/DistributionLocatorIntegrationTest.groovy b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/DistributionLocatorIntegrationTest.groovy
index 56d95e2966d0..27bbd82457a7 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/DistributionLocatorIntegrationTest.groovy
+++ b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/DistributionLocatorIntegrationTest.groovy
@@ -32,11 +32,12 @@ class DistributionLocatorIntegrationTest extends Specification {
         urlExist(locator.getDistributionFor(GradleVersion.version("0.8")))
         urlExist(locator.getDistributionFor(GradleVersion.version("0.9.1")))
         urlExist(locator.getDistributionFor(GradleVersion.version("1.0-milestone-3")))
+        urlExist(locator.getDistributionFor(GradleVersion.version("1.12")))
     }
 
     def "locates snapshot versions"() {
         expect:
-        urlExist(locator.getDistributionFor(GradleVersion.version("1.6-20130321190822+0000")))
+        urlExist(locator.getDistributionFor(GradleVersion.version("2.0-20140503220015+0000")))
     }
 
     void urlExist(URI url) {
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/MixedNativeAndJvmProjectIntegrationTest.groovy b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/MixedNativeAndJvmProjectIntegrationTest.groovy
index d53e6e75ecc3..4cc3f5a5bbde 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/MixedNativeAndJvmProjectIntegrationTest.groovy
+++ b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/MixedNativeAndJvmProjectIntegrationTest.groovy
@@ -26,16 +26,111 @@ public class MixedNativeAndJvmProjectIntegrationTest extends AbstractIntegration
             apply plugin: "java"
             apply plugin: "cpp"
 
-            executables { main {} }
-            libraries { main {} }
+            nativeCode {
+                executables {
+                    mainExe
+                }
+                libraries {
+                    mainLib
+                }
+            }
 
             task checkBinaries << {
                 assert binaries.mainClasses instanceof ClassDirectoryBinary
-                assert binaries.mainExecutable instanceof ExecutableBinary
-                assert binaries.mainSharedLibrary instanceof SharedLibraryBinary
+                assert binaries.mainExeExecutable instanceof NativeExecutableBinary
+                assert binaries.mainLibSharedLibrary instanceof SharedLibraryBinary
             }
 """
         expect:
         succeeds "checkBinaries"
     }
+
+    def "can combine jvm and native components in the same project"() {
+        buildFile << """
+    apply plugin: 'native-component'
+    apply plugin: 'jvm-component'
+
+    nativeCode {
+        executables {
+            nativeExe
+        }
+        libraries {
+            nativeLib
+        }
+    }
+
+    jvm {
+        libraries {
+            jvmLib
+        }
+    }
+
+    task check << {
+        assert softwareComponents.size() == 3
+        assert softwareComponents.nativeExe instanceof NativeExecutable
+        assert softwareComponents.nativeLib instanceof NativeLibrary
+        assert softwareComponents.jvmLib instanceof JvmLibrary
+
+        assert nativeCode.executables as List == [softwareComponents.nativeExe]
+        assert nativeCode.libraries as List == [softwareComponents.nativeLib]
+        assert jvm.libraries as List == [softwareComponents.jvmLib]
+
+        assert binaries.size() == 4
+        binaries.jvmLibJar instanceof JvmLibraryBinary
+        binaries.nativeExeExecutable instanceof NativeExecutableBinary
+        binaries.nativeLibStaticLibrary instanceof StaticLibraryBinary
+        binaries.nativeLibSharedLibrary instanceof SharedLibraryBinary
+    }
+"""
+        expect:
+        succeeds "check"
+    }
+
+    // TODO:DAZ Need to add some sources and actually build the binary outputs
+    def "can build jvm and native components in the same project"() {
+        buildFile << """
+    apply plugin: 'native-component'
+    apply plugin: 'jvm-component'
+
+    nativeCode {
+        executables {
+            nativeApp
+        }
+        libraries {
+            nativeLib
+        }
+    }
+    jvm {
+        libraries {
+            jvmLib
+        }
+    }
+"""
+        when:
+        succeeds "jvmLibJar"
+
+        then:
+        executed ":createJvmLibJar", ":jvmLibJar"
+        notExecuted  ":nativeAppExecutable", ":nativeLibStaticLibrary", ":nativeLibSharedLibrary"
+
+        when:
+        succeeds "nativeLibStaticLibrary"
+
+        then:
+        executed ":createNativeLibStaticLibrary", ":nativeLibStaticLibrary"
+        notExecuted ":jvmLibJar", ":nativeAppExecutable", ":nativeLibSharedLibrary"
+
+        when:
+        succeeds  "nativeAppExecutable"
+
+        then:
+        executed ":linkNativeAppExecutable", ":nativeAppExecutable"
+        notExecuted ":jvmLibJar", ":nativeLibStaticLibrary", ":nativeLibSharedLibrary"
+
+        when:
+        succeeds "assemble"
+
+        then:
+        executed ":jvmLibJar", ":nativeAppExecutable", ":nativeLibSharedLibrary", ":nativeLibStaticLibrary"
+    }
 }
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ProjectLayoutIntegrationTest.groovy b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ProjectLayoutIntegrationTest.groovy
index bdef399da08a..b67f97098353 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ProjectLayoutIntegrationTest.groovy
+++ b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/ProjectLayoutIntegrationTest.groovy
@@ -39,7 +39,7 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.0.5'
+    compile 'org.codehaus.groovy:groovy-all:2.2.2'
     // scaladoc in Scala 2.9.2 requires Java 1.6
     compile 'org.scala-lang:scala-library:2.9.1'
 }
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/WaterProjectIntegrationTest.groovy b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/WaterProjectIntegrationTest.groovy
deleted file mode 100644
index 9b5f2cf1d7ce..000000000000
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/WaterProjectIntegrationTest.groovy
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.integtests
-
-import org.gradle.integtests.fixtures.Sample
-import org.gradle.integtests.fixtures.executer.*
-import org.gradle.internal.SystemProperties
-import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
-import org.junit.Rule
-import org.junit.Test
-
-import static org.junit.Assert.assertEquals
-
-class WaterProjectIntegrationTest {
-    final static String NL = SystemProperties.lineSeparator
-
-    final static String HELLO_CLAUSE = "Hello, I'm "
-    final static String CHILDREN_TEXT = 'I love water.'
-    final static String WATER_INFO = 'As you all know, I cover three quarters of this planet!'
-    final static String BLUE_WHALE_INFO = "I'm the largets animal which has ever lived on this planet!"
-    final static String KRILL_INFO = "The weight of my species in summer is twice as heavy as all human beings!"
-    final static String PHYTOPLANKTON_INFO = "I produce as much oxygen as all the other plants on earth together!"
-
-    final static String WATER_NAME = 'water'
-    final static String BLUE_WHALE_NAME = 'bluewhale'
-    final static String KRILL_NAME = 'krill'
-    final static String PHYTOPLANKTON_NAME = 'phytoplankton'
-
-    @Rule public final TestNameTestDirectoryProvider temporaryFolder = new TestNameTestDirectoryProvider();
-    private final GradleDistribution dist = new UnderDevelopmentGradleDistribution();
-    private final GradleExecuter executer = new GradleContextualExecuter(dist, temporaryFolder);
-
-    @Rule public final Sample sample = new Sample(temporaryFolder, WATER_NAME)
-
-    @Test
-    public void waterProject() {
-        File waterDir = sample.dir
-        ExecutionResult result = executer.inDirectory(waterDir).withTasks('hello').withQuietLogging().run()
-        assertEquals(result.output, list2text([intro(WATER_NAME), WATER_INFO,
-                intro(PHYTOPLANKTON_NAME), CHILDREN_TEXT, PHYTOPLANKTON_INFO,
-                intro(KRILL_NAME), CHILDREN_TEXT, KRILL_INFO,
-                intro(BLUE_WHALE_NAME), CHILDREN_TEXT, BLUE_WHALE_INFO]))
-
-        result = executer.inDirectory(new File(waterDir, BLUE_WHALE_NAME)).withTasks('hello').withQuietLogging().run()
-        assertEquals(result.output, list2text([intro(WATER_NAME), WATER_INFO,
-                intro(PHYTOPLANKTON_NAME), CHILDREN_TEXT, PHYTOPLANKTON_INFO,
-                intro(KRILL_NAME), CHILDREN_TEXT, KRILL_INFO,
-                intro(BLUE_WHALE_NAME), CHILDREN_TEXT, BLUE_WHALE_INFO]))
-
-        result = executer.inDirectory(new File(waterDir, PHYTOPLANKTON_NAME)).withTasks('hello').withQuietLogging().run()
-        assertEquals(result.output, list2text([intro(WATER_NAME), WATER_INFO,
-                intro(PHYTOPLANKTON_NAME), CHILDREN_TEXT, PHYTOPLANKTON_INFO]))
-    }
-
-    static String intro(String projectName) {
-        HELLO_CLAUSE + projectName
-    }
-
-    static String list2text(List list) {
-        list.join(NL) + NL
-    }
-
-}
\ No newline at end of file
diff --git a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySFtpPublishIntegrationTest.groovy b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySFtpResolverPublishIntegrationTest.groovy
similarity index 76%
rename from subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySFtpPublishIntegrationTest.groovy
rename to subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySFtpResolverPublishIntegrationTest.groovy
index 0995405c721b..21bd2b7a57f2 100644
--- a/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySFtpPublishIntegrationTest.groovy
+++ b/subprojects/integ-test/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvySFtpResolverPublishIntegrationTest.groovy
@@ -17,18 +17,28 @@ package org.gradle.integtests.publish.ivy
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
+import org.gradle.test.fixtures.server.sftp.IvySftpRepository
 import org.gradle.test.fixtures.server.sftp.SFTPServer
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
 import org.junit.Rule
 
-class IvySFtpPublishIntegrationTest extends AbstractIntegrationSpec {
+@Requires(TestPrecondition.JDK6_OR_LATER)
+class IvySFtpResolverPublishIntegrationTest extends AbstractIntegrationSpec {
 
     @Rule
     public final SFTPServer sftpServer = new SFTPServer(this)
     @Rule
     ProgressLoggingFixture progressLogging = new ProgressLoggingFixture(executer, temporaryFolder)
 
+    IvySftpRepository getIvySftpRepo() {
+        new IvySftpRepository(sftpServer, '/repos/libs', false, '[organisation]/[module]')
+    }
+
     public void "can publish using SftpResolver"() {
         given:
+        def module = ivySftpRepo.module("org.gradle", "publish", "2")
+
         file("settings.gradle") << 'rootProject.name = "publish"'
 
         and:
@@ -53,12 +63,29 @@ class IvySFtpPublishIntegrationTest extends AbstractIntegrationSpec {
         executer.withDeprecationChecksDisabled()
 
         when:
+        sftpServer.expectRealpath('')
+        module.jar.withEachDirectory {
+            sftpServer.expectStat(it)
+            sftpServer.expectMkdir(it)
+        }
+        module.jar.expectStat()
+        module.jar.expectOpen()
+        module.jar.allowWrite()
+        module.jar.expectClose()
+
+        sftpServer.expectStat('/repos/libs/org.gradle/publish')
+        module.ivy.expectStat()
+        module.ivy.expectOpen()
+        module.ivy.allowWrite()
+        module.ivy.expectClose()
+
+        and:
         run "uploadArchives"
 
         then:
         sftpServer.hasFile("repos/libs/org.gradle/publish/publish-2.jar")
         sftpServer.hasFile("repos/libs/org.gradle/publish/ivy-2.xml");
-        sftpServer.file("repos/libs/org.gradle/publish/publish-2.jar").assertIsCopyOf(file('build/libs/publish-2.jar'))
+        module.jarFile.assertIsCopyOf(file('build/libs/publish-2.jar'))
 
         and:
         progressLogging.uploadProgressLogged("repos/libs/org.gradle/publish/ivy-2.xml")
diff --git a/subprojects/internal-integ-testing/internal-integ-testing.gradle b/subprojects/internal-integ-testing/internal-integ-testing.gradle
index dff0de9ff7fc..3482bef094f5 100644
--- a/subprojects/internal-integ-testing/internal-integ-testing.gradle
+++ b/subprojects/internal-integ-testing/internal-integ-testing.gradle
@@ -24,7 +24,7 @@ dependencies {
         dependency libraries.slf4j_api
         dependency "org.jboss.netty:netty:3.2.4.Final"
     }
-    compile "org.apache.sshd:sshd-core:0.6.0"
+    compile libraries.sshd
     compile libraries.gson
 }
 
@@ -54,4 +54,4 @@ class PrepareVersionsInfo extends DefaultTask {
     }
 }
 
-apply from: "$rootDir/gradle/ideaTestSourcesWorkaround.gradle"
\ No newline at end of file
+apply from: "$rootDir/gradle/ideaTestSourcesWorkaround.gradle"
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractDependencyResolutionTest.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractDependencyResolutionTest.groovy
index ec978817a7b4..01bbee0aaed2 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractDependencyResolutionTest.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractDependencyResolutionTest.groovy
@@ -17,22 +17,13 @@
 package org.gradle.integtests.fixtures
 
 import org.gradle.test.fixtures.ivy.IvyFileRepository
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
 import org.gradle.test.fixtures.maven.M2Installation
 import org.gradle.test.fixtures.maven.MavenFileRepository
-import org.gradle.test.fixtures.maven.MavenHttpRepository
-import org.gradle.test.fixtures.server.http.HttpServer
-import org.gradle.util.GradleVersion
-import org.junit.Rule
-
-import static org.gradle.test.matchers.UserAgentMatcher.matchesNameAndVersion
 
 abstract class AbstractDependencyResolutionTest extends AbstractIntegrationSpec {
-    @Rule public final HttpServer server = new HttpServer()
     private M2Installation m2Installation = new M2Installation(testDirectory)
 
     def setup() {
-        server.expectUserAgent(matchesNameAndVersion("Gradle", GradleVersion.current().getVersion()))
         requireOwnGradleUserHomeDir()
         executer.beforeExecute m2Installation
     }
@@ -45,29 +36,7 @@ abstract class AbstractDependencyResolutionTest extends AbstractIntegrationSpec
         return ivy(dir)
     }
 
-    IvyHttpRepository getIvyHttpRepo() {
-        return new IvyHttpRepository(server, "/repo", ivyRepo)
-    }
-
-    IvyHttpRepository ivyHttpRepo(String name) {
-        assert !name.startsWith("/")
-        return new IvyHttpRepository(server, "/${name}", ivyRepo(name))
-    }
-
     MavenFileRepository mavenRepo(String name = "repo") {
         return maven(name)
     }
-
-    MavenHttpRepository getMavenHttpRepo() {
-        return new MavenHttpRepository(server, "/repo", mavenRepo)
-    }
-
-    MavenHttpRepository mavenHttpRepo(String name) {
-        assert !name.startsWith("/")
-        return new MavenHttpRepository(server, "/${name}", mavenRepo(name))
-    }
-
-    MavenHttpRepository mavenHttpRepo(String contextPath, MavenFileRepository backingRepo) {
-        return new MavenHttpRepository(server, contextPath, backingRepo)
-    }
 }
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractHttpDependencyResolutionTest.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractHttpDependencyResolutionTest.groovy
new file mode 100644
index 000000000000..ea9bcdd90793
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractHttpDependencyResolutionTest.groovy
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures
+
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
+import org.gradle.test.fixtures.maven.MavenFileRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.util.GradleVersion
+import org.junit.Rule
+
+import static org.gradle.test.matchers.UserAgentMatcher.matchesNameAndVersion
+
+abstract class AbstractHttpDependencyResolutionTest extends AbstractDependencyResolutionTest {
+    @Rule public final HttpServer server = new HttpServer()
+
+    def setup() {
+        server.expectUserAgent(matchesNameAndVersion("Gradle", GradleVersion.current().getVersion()))
+        server.start()
+    }
+
+    IvyHttpRepository getIvyHttpRepo() {
+        return new IvyHttpRepository(server, "/repo", ivyRepo)
+    }
+
+    IvyHttpRepository ivyHttpRepo(String name) {
+        assert !name.startsWith("/")
+        return new IvyHttpRepository(server, "/${name}", ivyRepo(name))
+    }
+
+    MavenHttpRepository getMavenHttpRepo() {
+        return new MavenHttpRepository(server, "/repo", mavenRepo)
+    }
+
+    MavenHttpRepository mavenHttpRepo(String name) {
+        assert !name.startsWith("/")
+        return new MavenHttpRepository(server, "/${name}", mavenRepo(name))
+    }
+
+    MavenHttpRepository mavenHttpRepo(String contextPath, MavenFileRepository backingRepo) {
+        return new MavenHttpRepository(server, contextPath, backingRepo)
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractSftpDependencyResolutionTest.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractSftpDependencyResolutionTest.groovy
new file mode 100644
index 000000000000..28abf539d642
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AbstractSftpDependencyResolutionTest.groovy
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures
+
+import org.gradle.test.fixtures.server.sftp.IvySftpRepository
+import org.gradle.test.fixtures.server.sftp.MavenSftpRepository
+import org.gradle.test.fixtures.server.sftp.SFTPServer
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
+import org.junit.Rule
+
+@Requires(TestPrecondition.JDK6_OR_LATER)
+class AbstractSftpDependencyResolutionTest extends AbstractDependencyResolutionTest {
+    @Rule final SFTPServer server = new SFTPServer(this)
+
+    MavenSftpRepository getMavenSftpRepo() {
+        new MavenSftpRepository(server, '/repo')
+    }
+
+    IvySftpRepository getIvySftpRepo(boolean m2Compatible, String dirPattern = null) {
+        new IvySftpRepository(server, '/repo', m2Compatible, dirPattern)
+    }
+
+    IvySftpRepository getIvySftpRepo(String contextPath) {
+        new IvySftpRepository(server, contextPath, false, null)
+    }
+
+    IvySftpRepository getIvySftpRepo() {
+        new IvySftpRepository(server, '/repo')
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AvailableJavaHomes.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AvailableJavaHomes.java
index f72b871be660..6f42849bf6fb 100755
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AvailableJavaHomes.java
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/AvailableJavaHomes.java
@@ -15,14 +15,19 @@
  */
 package org.gradle.integtests.fixtures;
 
+import org.gradle.api.JavaVersion;
+import org.gradle.api.specs.Spec;
+import org.gradle.integtests.fixtures.jvm.InstalledJvmLocator;
+import org.gradle.integtests.fixtures.jvm.JvmInstallation;
 import org.gradle.internal.jvm.Jre;
 import org.gradle.internal.jvm.Jvm;
 import org.gradle.internal.os.OperatingSystem;
-import org.gradle.util.GFileUtils;
+import org.gradle.util.CollectionUtils;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -30,74 +35,22 @@
  */
 abstract public class AvailableJavaHomes {
 
-    private static File getJavaHome(String label) {
-        String value = System.getenv().get(String.format("JDK_%s", label));
-        return value == null ? null : GFileUtils.canonicalise(new File(value));
-    }
+    private static List<JvmInstallation> jvms;
 
     /**
      * Locates a JVM installation that is different to the current JVM.
      */
     public static File getBestAlternative() {
         Jvm jvm = Jvm.current();
-
-        // Use environment variables
-        File javaHome = null;
-        if (jvm.getJavaVersion().isJava6Compatible()) {
-            javaHome = firstAvailable("15", "17");
-        } else if (jvm.getJavaVersion().isJava5Compatible()) {
-            javaHome = firstAvailable("16", "17");
-        }
-        if (javaHome != null) {
-            return javaHome;
-        }
-
-        if (OperatingSystem.current().isMacOsX()) {
-            // Search in the install dir used by the Apple jvms, followed by the install dir used by the OpenJDK jvms
-            List<File> installDirs = Arrays.asList(new File("/System/Library/Java/JavaVirtualMachines"), new File("/Library/Java/JavaVirtualMachines"));
-            for (File installDir : installDirs) {
-                if (installDir.isDirectory()) {
-                    for (File candidate : installDir.listFiles()) {
-                        javaHome = GFileUtils.canonicalise(new File(candidate, "Contents/Home"));
-                        if (!javaHome.equals(jvm.getJavaHome()) && javaHome.isDirectory() && new File(javaHome, "bin/java").isFile()) {
-                            return javaHome;
-                        }
-                    }
-                }
-            }
-        } else if (OperatingSystem.current().isLinux()) {
-            // Ubuntu specific
-            File installedJvms = new File("/usr/lib/jvm");
-            if (installedJvms.isDirectory()) {
-                for (File candidate : installedJvms.listFiles()) {
-                    javaHome = GFileUtils.canonicalise(candidate);
-                    if (!javaHome.equals(jvm.getJavaHome()) && javaHome.isDirectory() && new File(javaHome, "bin/java").isFile()) {
-                        return javaHome;
-                    }
-                }
-            }
-        } else if (OperatingSystem.current().isWindows()) {
-            //very simple algorithm trying to find java on windows
-            List<File> installDirs = new ArrayList<File>();
-            File candidate = new File("c:/Program Files/Java");
-            if (candidate.isDirectory()) {
-                installDirs.add(candidate);
+        for (JvmInstallation candidate : getJvms()) {
+            if (candidate.getJavaHome().equals(jvm.getJavaHome())) {
+                continue;
             }
-            // Attempt to look for 32-bit version under 64-bit OS
-            candidate = new File("c:/Program Files (x86)/Java");
-            if (candidate.isDirectory()) {
-                installDirs.add(candidate);
-            }
-            for (File installDir : installDirs) {
-                for (File file : installDir.listFiles()) {
-                    if (file.getName().startsWith("jdk")) {
-                        javaHome = GFileUtils.canonicalise(file);
-                        if (!javaHome.equals(jvm.getJavaHome()) && javaHome.isDirectory() && new File(javaHome, "bin/java.exe").isFile()) {
-                            return javaHome;
-                        }
-                    }
-                }
+            // Currently tests implicitly assume a JDK
+            if (!candidate.isJdk()) {
+                continue;
             }
+            return candidate.getJavaHome();
         }
 
         return null;
@@ -121,13 +74,36 @@ public static File getBestJre() {
         return null;
     }
 
-    public static File firstAvailable(String... labels) {
-        for (String label : labels) {
-            File found = getJavaHome(label);
-            if (found != null) {
-                return found;
+    private static List<JvmInstallation> getJvms() {
+        if (jvms == null) {
+            jvms = new ArrayList<JvmInstallation>();
+            jvms.addAll(new DevInfrastructureJvmLocator().findJvms());
+            jvms.addAll(new InstalledJvmLocator().findJvms());
+            // Order from most recent to least recent
+            Collections.sort(jvms, new Comparator<JvmInstallation>() {
+                public int compare(JvmInstallation o1, JvmInstallation o2) {
+                    return o2.getVersion().compareTo(o1.getVersion());
+                }
+            });
+        }
+        return jvms;
+    }
+
+    private static class DevInfrastructureJvmLocator {
+        public List<JvmInstallation> findJvms() {
+            List<JvmInstallation> jvms = new ArrayList<JvmInstallation>();
+            if (OperatingSystem.current().isLinux()) {
+                jvms.add(new JvmInstallation(JavaVersion.VERSION_1_5, "1.5.0", new File("/opt/jdk/sun-jdk-5"), true, JvmInstallation.Arch.i386));
+                jvms.add(new JvmInstallation(JavaVersion.VERSION_1_6, "1.6.0", new File("/opt/jdk/sun-jdk-6"), true, JvmInstallation.Arch.x86_64));
+                jvms.add(new JvmInstallation(JavaVersion.VERSION_1_6, "1.6.0", new File("/opt/jdk/ibm-jdk-6"), true, JvmInstallation.Arch.x86_64));
+                jvms.add(new JvmInstallation(JavaVersion.VERSION_1_7, "1.7.0", new File("/opt/jdk/oracle-jdk-7"), true, JvmInstallation.Arch.x86_64));
+                jvms.add(new JvmInstallation(JavaVersion.VERSION_1_8, "1.8.0", new File("/opt/jdk/oracle-jdk-8"), true, JvmInstallation.Arch.x86_64));
             }
+            return CollectionUtils.filter(jvms, new Spec<JvmInstallation>() {
+                public boolean isSatisfiedBy(JvmInstallation element) {
+                    return element.getJavaHome().isDirectory();
+                }
+            });
         }
-        return null;
     }
 }
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/CompilationOutputsFixture.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/CompilationOutputsFixture.groovy
new file mode 100644
index 000000000000..b07a4e5707f2
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/CompilationOutputsFixture.groovy
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures
+
+import groovy.io.FileType
+
+import static org.apache.commons.io.FilenameUtils.removeExtension
+import static org.spockframework.util.CollectionUtil.asSet
+
+class CompilationOutputsFixture {
+
+    private final File targetDir
+
+    //Tracks outputs in given target dir
+    CompilationOutputsFixture(File targetDir) {
+        assert targetDir != null
+        this.targetDir = targetDir
+    }
+
+    private List<File> snapshot = []
+
+    // Executes optional operation and makes a snapshot of outputs (sets the last modified timestamp to zero for all files)
+    public <T> T snapshot(Closure<T> operation = null) {
+        T result = operation?.call()
+        snapshot.clear()
+        targetDir.eachFileRecurse(FileType.FILES) {
+            it.lastModified = 0
+            snapshot << it
+        }
+        result
+    }
+
+    //asserts none of the files changed/added since last snapshot
+    void noneRecompiled() {
+        recompiledFiles([])
+    }
+
+    //asserts file changed/added since last snapshot
+    void recompiledFile(File file) {
+        recompiledFiles([file])
+    }
+
+    //asserts files changed/added since last snapshot
+    void recompiledFiles(Collection<File> files) {
+        def expectedNames = files.collect({ removeExtension(it.name) }) as Set
+        assert changedFileNames == expectedNames
+    }
+
+    //asserts classes changed/added since last snapshot. Class means file name without extension.
+    void recompiledClasses(String ... classNames) {
+        assert changedFileNames == asSet(classNames)
+    }
+
+    //asserts classes deleted since last snapshot. Class means file name without extension.
+    void deletedClasses(String ... classNames) {
+        def deleted = snapshot.findAll { !it.exists() }.collect { removeExtension(it.name) } as Set
+        assert deleted == asSet(classNames)
+    }
+
+    private Set<String> getChangedFileNames() {
+        // Get all of the files that do not have a zero last modified timestamp
+        def changed = new HashSet()
+        targetDir.eachFileRecurse(FileType.FILES) {
+            if (it.lastModified() > 0) {
+                changed << removeExtension(it.name)
+            }
+        }
+        changed
+    }
+}
\ No newline at end of file
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/Sample.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/Sample.java
index fe92819a2d24..ccca452e59da 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/Sample.java
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/Sample.java
@@ -33,22 +33,32 @@
 public class Sample implements MethodRule {
     private final Logger logger = LoggerFactory.getLogger(Sample.class);
     private final String defaultSampleName;
+    private final String testSampleDirName;
 
     private TestFile sampleDir;
     private TestDirectoryProvider testDirectoryProvider;
 
+    public Sample(TestDirectoryProvider testDirectoryProvider) {
+        this(testDirectoryProvider, null);
+    }
+
     public Sample(TestDirectoryProvider testDirectoryProvider, String defaultSampleName) {
-        this.testDirectoryProvider = testDirectoryProvider;
-        this.defaultSampleName = defaultSampleName;
+        this(testDirectoryProvider, defaultSampleName, null);
     }
 
-    public Sample(TestDirectoryProvider testDirectoryProvider) {
-        this(testDirectoryProvider, null);
+    public Sample(TestDirectoryProvider testDirectoryProvider, String defaultSampleName, String testSampleDirName) {
+        this.testDirectoryProvider = testDirectoryProvider;
+        this.defaultSampleName = defaultSampleName;
+        this.testSampleDirName = testSampleDirName;
     }
 
     public Statement apply(final Statement base, FrameworkMethod method, Object target) {
         final String sampleName = getSampleName(method);
-        sampleDir = sampleName == null ? null : testDirectoryProvider.getTestDirectory().file(sampleName);
+        if (testSampleDirName != null) {
+            sampleDir = testDirectoryProvider.getTestDirectory().file(testSampleDirName);
+        } else {
+            sampleDir = sampleName == null ? null : testDirectoryProvider.getTestDirectory().file(sampleName);
+        }
 
         return new Statement() {
             @Override
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/TestNGExecutionResult.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/TestNGExecutionResult.groovy
index d57594b00f63..9000f53afb40 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/TestNGExecutionResult.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/TestNGExecutionResult.groovy
@@ -86,7 +86,7 @@ class TestNGExecutionResult implements TestExecutionResult {
     }
 }
 
-private class TestNgTestClassExecutionResult implements TestClassExecutionResult {
+class TestNgTestClassExecutionResult implements TestClassExecutionResult {
     def String testClass
     def GPathResult testClassNode
 
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java
index 28e7093989c7..eb15ff927712 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/AbstractGradleExecuter.java
@@ -374,7 +374,7 @@ protected String toJvmArgsString(Iterable<String> jvmArgs) {
                 result.append(" ");
             }
             if (jvmArg.contains(" ")) {
-                assert !jvmArg.contains("\"");
+                assert !jvmArg.contains("\"") : "jvmArg '" + jvmArg + "' contains '\"'";
                 result.append('"');
                 result.append(jvmArg);
                 result.append('"');
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/DefaultGradleDistribution.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/DefaultGradleDistribution.java
index 0fd566068876..39ab7c5ad5ac 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/DefaultGradleDistribution.java
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/DefaultGradleDistribution.java
@@ -99,7 +99,7 @@ public boolean isDaemonIdleTimeoutConfigurable() {
     }
 
     public boolean isOpenApiSupported() {
-        return isSameOrNewer("0.9-rc-1");
+        return isSameOrNewer("0.9-rc-1") && !isSameOrNewer("2.0");
     }
 
     public boolean isToolingApiSupported() {
@@ -114,7 +114,9 @@ public boolean isToolingApiNonAsciiOutputSupported() {
     }
 
     public VersionNumber getArtifactCacheLayoutVersion() {
-        if (isSameOrNewer("1.12-rc-1")) {
+        if (isSameOrNewer("2.0-rc-1")) {
+            return VersionNumber.parse("2.12");
+        } else if (isSameOrNewer("1.12-rc-1")) {
             return VersionNumber.parse("2.6");
         } else if (isSameOrNewer("1.11-rc-1")) {
             return VersionNumber.parse("2.2");
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/InProcessGradleExecuter.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/InProcessGradleExecuter.java
index 4eab245ae11b..2eb43cf93928 100755
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/InProcessGradleExecuter.java
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/InProcessGradleExecuter.java
@@ -17,7 +17,7 @@
 package org.gradle.integtests.fixtures.executer;
 
 import org.gradle.BuildResult;
-import org.gradle.GradleLauncher;
+import org.gradle.initialization.GradleLauncher;
 import org.gradle.StartParameter;
 import org.gradle.api.GradleException;
 import org.gradle.api.Task;
@@ -39,10 +39,14 @@
 import org.gradle.internal.jvm.Jvm;
 import org.gradle.internal.nativeplatform.ProcessEnvironment;
 import org.gradle.internal.nativeplatform.services.NativeServices;
+import org.gradle.internal.service.ServiceRegistry;
+import org.gradle.internal.service.ServiceRegistryBuilder;
+import org.gradle.internal.service.scopes.GlobalScopeServices;
 import org.gradle.launcher.Main;
 import org.gradle.launcher.cli.converter.LayoutToPropertiesConverter;
 import org.gradle.launcher.cli.converter.PropertiesToStartParameterConverter;
 import org.gradle.launcher.daemon.registry.DaemonRegistry;
+import org.gradle.logging.LoggingServiceRegistry;
 import org.gradle.logging.ShowStacktrace;
 import org.gradle.process.internal.JavaExecHandleBuilder;
 import org.gradle.test.fixtures.file.TestDirectoryProvider;
@@ -65,8 +69,13 @@
 import static org.junit.Assert.*;
 
 class InProcessGradleExecuter extends AbstractGradleExecuter {
-
-    private final ProcessEnvironment processEnvironment = NativeServices.getInstance().get(ProcessEnvironment.class);
+    private static final ServiceRegistry GLOBAL_SERVICES = ServiceRegistryBuilder.builder()
+            .displayName("Global services")
+            .parent(LoggingServiceRegistry.newProcessLogging())
+            .parent(NativeServices.getInstance())
+            .provider(new GlobalScopeServices(true))
+            .build();
+    private final ProcessEnvironment processEnvironment = GLOBAL_SERVICES.get(ProcessEnvironment.class);
 
     InProcessGradleExecuter(GradleDistribution distribution, TestDirectoryProvider testDirectoryProvider) {
         super(distribution, testDirectoryProvider);
@@ -153,7 +162,7 @@ private BuildResult doRun(final OutputListenerImpl outputListener, OutputListene
         converter.configure(parser);
         ParsedCommandLine parsedCommandLine = parser.parse(getAllArgs());
 
-        BuildLayoutParameters layout = converter.getLayoutConverter().convert(parsedCommandLine);
+        BuildLayoutParameters layout = converter.getLayoutConverter().convert(parsedCommandLine, new BuildLayoutParameters());
 
         Map<String, String> properties = new HashMap<String, String>();
         new LayoutToPropertiesConverter().convert(layout, properties);
@@ -162,17 +171,17 @@ private BuildResult doRun(final OutputListenerImpl outputListener, OutputListene
         new PropertiesToStartParameterConverter().convert(properties, parameter);
         converter.convert(parsedCommandLine, parameter);
 
-        DefaultGradleLauncherFactory factory = DeprecationLogger.whileDisabled(new Factory<DefaultGradleLauncherFactory>() {
-            public DefaultGradleLauncherFactory create() {
-                return (DefaultGradleLauncherFactory) GradleLauncher.getFactory();
-            }
-        });
+        DefaultGradleLauncherFactory factory = GLOBAL_SERVICES.get(DefaultGradleLauncherFactory.class);
         factory.addListener(listener);
-        GradleLauncher gradleLauncher = factory.newInstance(parameter);
-        gradleLauncher.addStandardOutputListener(outputListener);
-        gradleLauncher.addStandardErrorListener(errorListener);
         try {
-            return gradleLauncher.run();
+            GradleLauncher gradleLauncher = factory.newInstance(parameter);
+            try {
+                gradleLauncher.addStandardOutputListener(outputListener);
+                gradleLauncher.addStandardErrorListener(errorListener);
+                return gradleLauncher.run();
+            } finally {
+                gradleLauncher.stop();
+            }
         } finally {
             // Restore the environment
             System.setProperties(originalSysProperties);
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/ProgressLoggingFixture.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/ProgressLoggingFixture.groovy
index 9f98db9077ab..1aad1d549caf 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/ProgressLoggingFixture.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/ProgressLoggingFixture.groovy
@@ -63,7 +63,7 @@ class ProgressLoggingFixture extends InitScriptExecuterFixture {
     }
 
     boolean downloadProgressLogged(URI url) {
-        downloadProgressLogged(url.toString())
+        downloadProgressLogged(url.toASCIIString())
     }
 
     boolean downloadProgressLogged(String url) {
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/SequentialOutputMatcher.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/SequentialOutputMatcher.groovy
index af7730369567..2c3f2f9e3e04 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/SequentialOutputMatcher.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/executer/SequentialOutputMatcher.groovy
@@ -19,6 +19,7 @@
 package org.gradle.integtests.fixtures.executer
 
 import org.gradle.internal.SystemProperties
+import org.gradle.internal.jvm.Jvm
 import org.junit.Assert
 import org.gradle.util.TextUtil
 
@@ -62,10 +63,14 @@ class SequentialOutputMatcher {
         if (lines.empty) {
             return lines;
         }
+        boolean seenWarning = false
         List<String> result = new ArrayList<String>()
         for (String line : lines) {
             if (line.matches('Download .+')) {
                 // ignore
+            } else if (!seenWarning && !Jvm.current().javaVersion.java7Compatible && line == 'Support for reading or changing file permissions is only available on this platform using Java 7 or later.') {
+                // ignore this warning once only on java < 7
+                seenWarning = true
             } else {
                 result << line
             }
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/InstalledJvmLocator.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/InstalledJvmLocator.java
new file mode 100644
index 000000000000..1f8e71a748ac
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/InstalledJvmLocator.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures.jvm;
+
+import net.rubygrapefruit.platform.SystemInfo;
+import net.rubygrapefruit.platform.WindowsRegistry;
+import org.gradle.internal.jvm.Jvm;
+import org.gradle.internal.nativeplatform.services.NativeServices;
+import org.gradle.internal.os.OperatingSystem;
+
+import java.io.File;
+import java.util.*;
+
+public class InstalledJvmLocator {
+    private final OperatingSystem operatingSystem = OperatingSystem.current();
+    private final WindowsRegistry windowsRegistry = NativeServices.getInstance().get(WindowsRegistry.class);
+    private final SystemInfo systemInfo = NativeServices.getInstance().get(SystemInfo.class);
+    private final Jvm currentJvm = Jvm.current();
+
+    /**
+     * Discovers JVMs installed on the local machine. Returns the details of each JVM that can be determined efficiently, without running the JVM.
+     *
+     * @return The JVMs, ordered from highest to lowest Java version. Will include the current JVM.
+     */
+    public List<JvmInstallation> findJvms() {
+        Map<File, JvmInstallation> installs = new HashMap<File, JvmInstallation>();
+        Collection<JvmInstallation> jvms;
+        if (operatingSystem.isMacOsX()) {
+            jvms = new OsXInstalledJvmLocator().findJvms();
+        } else if (OperatingSystem.current().isWindows()) {
+            jvms = new WindowsOracleJvmLocator(windowsRegistry, systemInfo).findJvms();
+        } else if (OperatingSystem.current().isLinux()) {
+            jvms = new UbuntuJvmLocator().findJvms();
+        } else {
+            jvms = Collections.emptySet();
+        }
+        for (JvmInstallation jvm : jvms) {
+            if (!installs.containsKey(jvm.getJavaHome())) {
+                installs.put(jvm.getJavaHome(), jvm);
+            }
+        }
+        if (!installs.containsKey(currentJvm.getJavaHome())) {
+            // TODO - this isn't quite right
+            boolean isJdk = !currentJvm.getJre().getHomeDir().equals(currentJvm.getJavaHome());
+            installs.put(currentJvm.getJavaHome(), new JvmInstallation(currentJvm.getJavaVersion(), System.getProperty("java.version"), currentJvm.getJavaHome(), isJdk, toArch(System.getProperty("os.arch"))));
+        }
+
+        List<JvmInstallation> result = new ArrayList<JvmInstallation>(installs.values());
+        Collections.sort(result, new Comparator<JvmInstallation>() {
+            public int compare(JvmInstallation o1, JvmInstallation o2) {
+                return o2.getVersion().compareTo(o1.getVersion());
+            }
+        });
+        return result;
+    }
+
+    private JvmInstallation.Arch toArch(String arch) {
+        if (arch.equals("amd64") || arch.equals("x86_64")) {
+            return JvmInstallation.Arch.x86_64;
+        }
+        if (arch.equals("i386")) {
+            return JvmInstallation.Arch.i386;
+        }
+        return JvmInstallation.Arch.Unknown;
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/JvmInstallation.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/JvmInstallation.java
new file mode 100644
index 000000000000..e8152b18d6ac
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/JvmInstallation.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures.jvm;
+
+import org.gradle.api.JavaVersion;
+import org.gradle.util.GFileUtils;
+import org.gradle.util.VersionNumber;
+
+import java.io.File;
+
+public class JvmInstallation {
+    public enum Arch { i386, x86_64, Unknown }
+
+    private final JavaVersion javaVersion;
+    private final VersionNumber version;
+    private final File javaHome;
+    private final boolean jdk;
+    private final Arch arch;
+
+    public JvmInstallation(JavaVersion javaVersion, String version, File javaHome, boolean jdk, Arch arch) {
+        this.javaVersion = javaVersion;
+        this.version = VersionNumber.withPatchNumber().parse(version);
+        this.javaHome = GFileUtils.canonicalise(javaHome);
+        this.jdk = jdk;
+        this.arch = arch;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("%s %s (%s) %s %s", jdk ? "JDK" : "JRE", javaVersion, version, arch, javaHome);
+    }
+
+    public Arch getArch() {
+        return arch;
+    }
+
+    public boolean isJdk() {
+        return jdk;
+    }
+
+    public VersionNumber getVersion() {
+        return version;
+    }
+
+    public JavaVersion getJavaVersion() {
+        return javaVersion;
+    }
+
+    public File getJavaHome() {
+        return javaHome;
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/OsXInstalledJvmLocator.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/OsXInstalledJvmLocator.java
new file mode 100644
index 000000000000..109b0c4ab9cb
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/OsXInstalledJvmLocator.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures.jvm;
+
+import org.gradle.api.GradleException;
+import org.gradle.process.internal.ExecHandleBuilder;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.InputStreamReader;
+import java.util.Collection;
+
+/**
+ * Uses `java_home -V` to find JVM installations
+ */
+class OsXInstalledJvmLocator {
+    public Collection<JvmInstallation> findJvms() {
+        try {
+            ExecHandleBuilder execHandleBuilder = new ExecHandleBuilder();
+            execHandleBuilder.workingDir(new File(".").getAbsoluteFile());
+            execHandleBuilder.commandLine("/usr/libexec/java_home", "-V");
+            ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+            // verbose output is written to stderr for some reason
+            execHandleBuilder.setErrorOutput(outputStream);
+            execHandleBuilder.setStandardOutput(new ByteArrayOutputStream());
+            execHandleBuilder.build().start().waitForFinish().assertNormalExitValue();
+            return new OsXJavaHomeParser().parse(new InputStreamReader(new ByteArrayInputStream(outputStream.toByteArray())));
+        } catch (Exception e) {
+            throw new GradleException("Could not locate installed JVMs.", e);
+        }
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/OsXJavaHomeParser.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/OsXJavaHomeParser.java
new file mode 100644
index 000000000000..0c07bcb22911
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/OsXJavaHomeParser.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures.jvm;
+
+import org.gradle.api.JavaVersion;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Parses the output of `java_home -V` to extract JVM installation details.
+ */
+class OsXJavaHomeParser {
+    private static final Pattern NEW_FORMAT_PATTERN = Pattern.compile("\\s+(\\S+),\\s+(\\S+):\\s+\".*?\"\\s+(.+)");
+    private static final Pattern OLD_FORMAT_PATTERN = Pattern.compile("\\s+(\\S+)\\s+\\((.*?)\\):\\s+(.+)");
+
+    public List<JvmInstallation> parse(Reader output) throws IOException {
+        ArrayList<JvmInstallation> result = new ArrayList<JvmInstallation>();
+        BufferedReader reader = new BufferedReader(output);
+        for (String line = reader.readLine(); line != null; line = reader.readLine()) {
+            Matcher matcher = NEW_FORMAT_PATTERN.matcher(line);
+            if (matcher.matches()) {
+                String version = matcher.group(1);
+                String arch = matcher.group(2);
+                String javaHome = matcher.group(3);
+                result.add(new JvmInstallation(JavaVersion.toVersion(version), version, new File(javaHome), true, toArch(arch)));
+            } else {
+                matcher = OLD_FORMAT_PATTERN.matcher(line);
+                if (matcher.matches()) {
+                    String version = matcher.group(1);
+                    String arch = matcher.group(2);
+                    String javaHome = matcher.group(3);
+                    result.add(new JvmInstallation(JavaVersion.toVersion(version), version, new File(javaHome), true, toArch(arch)));
+                }
+            }
+        }
+        return result;
+    }
+
+    private JvmInstallation.Arch toArch(String arch) {
+        if (arch.equals("i386")) {
+            return JvmInstallation.Arch.i386;
+        } else if (arch.equals("x86_64")) {
+            return JvmInstallation.Arch.x86_64;
+        }
+        return JvmInstallation.Arch.Unknown;
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/UbuntuJvmLocator.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/UbuntuJvmLocator.java
new file mode 100644
index 000000000000..87664ce637dd
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/UbuntuJvmLocator.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures.jvm;
+
+import org.gradle.api.JavaVersion;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Searches for JVM installations in /usr/lib/jvm. Currently assumes the Ubuntu OpenJDK convention.
+ */
+public class UbuntuJvmLocator {
+    private static final Pattern JAVA_HOME_DIR_PATTERN = Pattern.compile("java-(\\d+.\\d+(?:\\.\\d+)?)-\\w+-(\\w+)");
+    private final File libDir;
+
+    public UbuntuJvmLocator() {
+        this(new File("/usr/lib/jvm"));
+    }
+
+    public UbuntuJvmLocator(File libDir) {
+        this.libDir = libDir;
+    }
+
+    public Collection<JvmInstallation> findJvms() {
+        List<JvmInstallation> jvms = new ArrayList<JvmInstallation>();
+        if (libDir.isDirectory()) {
+            for (File javaHome : libDir.listFiles()) {
+                Matcher matcher = JAVA_HOME_DIR_PATTERN.matcher(javaHome.getName());
+                if (!matcher.matches()) {
+                    continue;
+                }
+                if (!new File(javaHome, "jre/bin/java").isFile()) {
+                    continue;
+                }
+                String version = matcher.group(1);
+                String arch = matcher.group(2);
+                boolean jdk = new File(javaHome, "bin/javac").isFile();
+                jvms.add(new JvmInstallation(JavaVersion.toVersion(version), version, javaHome, jdk, toArch(arch)));
+            }
+        }
+        return jvms;
+    }
+
+    private JvmInstallation.Arch toArch(String arch) {
+        if (arch.equals("amd64")) {
+            return JvmInstallation.Arch.x86_64;
+        } else if (arch.equals("i386")) {
+            return JvmInstallation.Arch.i386;
+        } else {
+            return JvmInstallation.Arch.Unknown;
+        }
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/WindowsOracleJvmLocator.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/WindowsOracleJvmLocator.java
new file mode 100644
index 000000000000..d4f672c566a0
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/integtests/fixtures/jvm/WindowsOracleJvmLocator.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.integtests.fixtures.jvm;
+
+import net.rubygrapefruit.platform.MissingRegistryEntryException;
+import net.rubygrapefruit.platform.SystemInfo;
+import net.rubygrapefruit.platform.WindowsRegistry;
+import org.gradle.api.JavaVersion;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Uses windows registry to find installed Sun/Oracle JVMs
+ */
+class WindowsOracleJvmLocator {
+    private final WindowsRegistry windowsRegistry;
+    private final SystemInfo systemInfo;
+
+    WindowsOracleJvmLocator(WindowsRegistry windowsRegistry, SystemInfo systemInfo) {
+        this.windowsRegistry = windowsRegistry;
+        this.systemInfo = systemInfo;
+    }
+
+    public Collection<JvmInstallation> findJvms() {
+        JvmInstallation.Arch defaultArch = systemInfo.getArchitecture() == SystemInfo.Architecture.i386 ? JvmInstallation.Arch.i386 : JvmInstallation.Arch.x86_64;
+        List<JvmInstallation> jvms = new ArrayList<JvmInstallation>();
+        findJvms(windowsRegistry, "SOFTWARE\\JavaSoft\\Java Development Kit", jvms, true, defaultArch);
+        findJvms(windowsRegistry, "SOFTWARE\\JavaSoft\\Java Runtime Environment", jvms, false, defaultArch);
+        findJvms(windowsRegistry, "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Development Kit", jvms, true, JvmInstallation.Arch.i386);
+        findJvms(windowsRegistry, "SOFTWARE\\Wow6432Node\\JavaSoft\\Java Runtime Environment", jvms, false, JvmInstallation.Arch.i386);
+        return jvms;
+    }
+
+    private void findJvms(WindowsRegistry windowsRegistry, String sdkSubkey, Collection<JvmInstallation> jvms, boolean jdk, JvmInstallation.Arch arch) {
+        List<String> versions;
+        try {
+            versions = windowsRegistry.getSubkeys(WindowsRegistry.Key.HKEY_LOCAL_MACHINE, sdkSubkey);
+        } catch (MissingRegistryEntryException e) {
+            // Ignore
+            return;
+        }
+
+        for (String version : versions) {
+            if (version.matches("\\d+\\.\\d+")) {
+                continue;
+            }
+            String javaHome = windowsRegistry.getStringValue(WindowsRegistry.Key.HKEY_LOCAL_MACHINE, sdkSubkey + '\\' + version, "JavaHome");
+            jvms.add(new JvmInstallation(JavaVersion.toVersion(version), version, new File(javaHome), jdk, arch));
+        }
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/AbstractModule.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/AbstractModule.groovy
index 142e53d0172e..f811e47ffdf5 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/AbstractModule.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/AbstractModule.groovy
@@ -24,6 +24,7 @@ abstract class AbstractModule {
      * @param cl A closure that is passed a writer to use to generate the content.
      */
     protected void publish(TestFile file, Closure cl) {
+        file.parentFile.mkdirs()
         def hashBefore = file.exists() ? getHash(file, "sha1") : null
         def tmpFile = file.parentFile.file("${file.name}.tmp")
 
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayApi.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayApi.groovy
deleted file mode 100644
index ce24f54ee018..000000000000
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayApi.groovy
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.test.fixtures.bintray
-
-import org.gradle.test.fixtures.server.http.HttpServer
-
-import javax.servlet.http.HttpServletRequest
-import javax.servlet.http.HttpServletResponse
-
-import static org.gradle.plugin.resolve.internal.JCenterPluginMapper.*
-import static org.gradle.test.fixtures.server.http.HttpServer.Utils.json
-
-class BintrayApi {
-
-    final HttpServer httpServer
-    private final String path
-
-    BintrayApi(HttpServer httpServer) {
-        // The bintray client seems hardcoded to issue requests relative to the root
-        // therefore we have to use the root as the path
-        // Waiting for one of the following issues to be resolved so we can debug into it:
-        // https://github.com/bintray/bintray-client-java/pull/2
-        // https://github.com/bintray/bintray-client-java/issues/3
-        this.path = ""
-        this.httpServer = httpServer
-    }
-
-    String getAddress() {
-        httpServer.address + path
-    }
-
-    void expectPackageSearch(String pluginId, FoundPackage... packages) {
-        httpServer.expect("$path/search/attributes/$GRADLE_PLUGINS_ORG/$GRADLE_PLUGINS_REPO", ["POST"], new HttpServer.ActionSupport("search action") {
-            void handle(HttpServletRequest request, HttpServletResponse response) {
-                def requestBody = json(request)
-                assert requestBody == json("[{\"${PLUGIN_ID_ATTRIBUTE_NAME}\":[\"$pluginId\"]}]")
-                json(response, packages*.asStruct())
-            }
-        })
-    }
-
-    static class FoundPackage {
-        List<String> systemIds
-        String latestVersion
-
-        FoundPackage(String latestVersion, String... systemIds) {
-            this.systemIds = systemIds.toList()
-            this.latestVersion = latestVersion
-        }
-
-        Map<String, Object> asStruct() {
-            [
-                    "name": "not-used",
-                    "repo": "not-used",
-                    "owner": "not-used",
-                    "desc": "not-used",
-                    "labels": [],
-                    "attribute_names": ["not-used"],
-                    "followers_count": 0,
-                    "created": "2013-11-18T12:31:31.147Z",
-                    "versions": [],
-                    "latest_version": latestVersion,
-                    "updated": "2013-11-18T14:39:20.023Z",
-                    "rating_count": 0,
-                    "system_ids": systemIds
-            ]
-        }
-    }
-}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayTestServer.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayTestServer.groovy
deleted file mode 100644
index a4af18263c87..000000000000
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/bintray/BintrayTestServer.groovy
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.test.fixtures.bintray
-
-import org.gradle.api.Action
-import org.gradle.api.internal.artifacts.BaseRepositoryFactory
-import org.gradle.integtests.fixtures.executer.GradleExecuter
-import org.gradle.plugin.resolve.internal.JCenterPluginMapper
-import org.gradle.test.fixtures.maven.MavenFileRepository
-import org.gradle.test.fixtures.maven.MavenHttpRepository
-import org.gradle.test.fixtures.server.http.HttpServer
-import org.junit.rules.ExternalResource
-
-class BintrayTestServer extends ExternalResource {
-
-    private final HttpServer http
-
-    final MavenHttpRepository jcenter
-    final MavenFileRepository repo
-    final BintrayApi api
-
-    BintrayTestServer(GradleExecuter executer, MavenFileRepository repo) {
-        this.http = new HttpServer()
-        this.repo = repo
-        this.jcenter = new MavenHttpRepository(http, repo)
-        this.api = new BintrayApi(http)
-
-        executer.beforeExecute(new Action<GradleExecuter>() {
-            void execute(GradleExecuter e) {
-                if (http.running) {
-                    e.withArguments(
-                            "-D$JCenterPluginMapper.BINTRAY_API_OVERRIDE_URL_PROPERTY=$api.address",
-                            "-D$BaseRepositoryFactory.JCENTER_REPO_OVERRIDE_URL_PROPERTY=$jcenter.uri"
-                    )
-                }
-            }
-        })
-    }
-
-    void start() {
-        http.start()
-    }
-
-    @Override
-    protected void after() {
-        http.stop()
-    }
-}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyFileModule.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyFileModule.groovy
index fad14314b3fc..4f9664e9ef93 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyFileModule.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyFileModule.groovy
@@ -15,9 +15,7 @@
  */
 package org.gradle.test.fixtures.ivy
 
-import org.apache.ivy.core.IvyPatternHelper
-import org.apache.ivy.core.module.id.ModuleId
-import org.apache.ivy.core.module.id.ModuleRevisionId
+import groovy.xml.MarkupBuilder
 import org.gradle.api.Action
 import org.gradle.api.internal.xml.XmlTransformer
 import org.gradle.test.fixtures.AbstractModule
@@ -30,22 +28,26 @@ class IvyFileModule extends AbstractModule implements IvyModule {
     final String organisation
     final String module
     final String revision
+    final boolean m2Compatible
     final List dependencies = []
     final Map<String, Map> configurations = [:]
     final List artifacts = []
     final Map extendsFrom = [:]
+    final Map extraAttributes = [:]
+    final Map extraInfo = [:]
     String status = "integration"
     boolean noMetaData
     int publishCount = 1
     XmlTransformer transformer = new XmlTransformer()
 
-    IvyFileModule(String ivyPattern, String artifactPattern, TestFile moduleDir, String organisation, String module, String revision) {
+    IvyFileModule(String ivyPattern, String artifactPattern, TestFile moduleDir, String organisation, String module, String revision, boolean m2Compatible) {
         this.ivyPattern = ivyPattern
         this.artifactPattern = artifactPattern
         this.moduleDir = moduleDir
         this.organisation = organisation
         this.module = module
         this.revision = revision
+        this.m2Compatible = m2Compatible
         configurations['runtime'] = [extendsFrom: [], transitive: true, visibility: 'public']
         configurations['default'] = [extendsFrom: ['runtime'], transitive: true, visibility: 'public']
     }
@@ -111,23 +113,52 @@ class IvyFileModule extends AbstractModule implements IvyModule {
     }
 
     IvyFileModule withStatus(String status) {
-        this.status = status;
+        this.status = status
         return this
     }
 
     IvyFileModule withNoMetaData() {
-        noMetaData = true;
+        noMetaData = true
         return this
     }
 
+    IvyFileModule withExtraAttributes(Map extraAttributes) {
+        this.extraAttributes.putAll(extraAttributes)
+        return this
+    }
+
+    /**
+     * Keys in extra info will be prefixed with namespace prefix "my" in this fixture.
+     */
+    IvyFileModule withExtraInfo(Map extraInfo) {
+        this.extraInfo.putAll(extraInfo)
+        return this
+    }
+
+    protected String getIvyFilePath() {
+        getArtifactFilePath(name: "ivy", type: "ivy", ext: "xml")
+    }
+
     TestFile getIvyFile() {
-        def path = IvyPatternHelper.substitute(ivyPattern, new ModuleRevisionId(new ModuleId(organisation, module), revision))
-        return moduleDir.file(path)
+        return moduleDir.file(ivyFilePath)
     }
 
     TestFile getJarFile() {
-        def path = IvyPatternHelper.substitute(artifactPattern, new ModuleRevisionId(new ModuleId(organisation, module), revision), null, "jar", "jar")
-        return moduleDir.file(path)
+        return moduleDir.file(jarFilePath)
+    }
+
+    protected String getJarFilePath() {
+        getArtifactFilePath(name: module, type: "jar", ext: "jar")
+    }
+
+    TestFile file(Map<String, ?> options) {
+        return moduleDir.file(getArtifactFilePath(options))
+    }
+
+    protected String getArtifactFilePath(Map<String, ?> options) {
+        def artifact = toArtifact(options)
+        def tokens = [organisation: organisation, module: module, revision: revision, artifact: artifact.name, type: artifact.type, ext: artifact.ext, classifier: artifact.classifier]
+        M2CompatibleIvyPatternHelper.substitute(artifactPattern, m2Compatible, tokens)
     }
 
     /**
@@ -166,68 +197,62 @@ class IvyFileModule extends AbstractModule implements IvyModule {
             transformer.transform(writer, new Action<Writer>() {
                 void execute(Writer ivyFileWriter) {
                     ivyFileWriter << """<?xml version="1.0" encoding="UTF-8"?>
-<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven">
+<ivy-module version="1.0" xmlns:m="http://ant.apache.org/ivy/maven"
+${ extraAttributes ? 'xmlns:e="http://ant.apache.org/ivy/extra"' : ''}
+${ extraInfo ? 'xmlns:my="http://my.extra.info"' : ''}>
     <!-- ${getArtifactContent()} -->
-	<info organisation="${organisation}"
-		module="${module}"
-		revision="${revision}"
-		status="${status}"
-        publication="${getPublicationDate()}"
-	>"""
-        if (extendsFrom) {
-            ivyFileWriter << "<extends organisation='${extendsFrom.organisation}' module='${extendsFrom.module}' revision='${extendsFrom.revision}'"
-            if (extendsFrom.location) {
-                ivyFileWriter << " location='${extendsFrom.location}'"
-            }
-            ivyFileWriter << "/>"
-        }
-                    ivyFileWriter << """</info>
-	<configurations>"""
-            configurations.each { name, config ->
-                ivyFileWriter << "<conf name='$name'"
-                if (config.extendsFrom) {
-                    ivyFileWriter << " extends='${config.extendsFrom.join(',')}'"
-                }
-                if (!config.transitive) {
-                    ivyFileWriter << " transitive='false'"
-                }
-                ivyFileWriter << " visibility='$config.visibility'"
-                ivyFileWriter << "/>"
-            }
-            ivyFileWriter << """</configurations>
-	<publications>
-"""
-            artifacts.each { artifact ->
-                if (!artifact.undeclared) {
-                    ivyFileWriter << """<artifact name="${artifact.name}" type="${artifact.type}" ext="${artifact.ext}" conf="${artifact.conf}" m:classifier="${artifact.classifier ?: ''}"/>
 """
-                }
-            }
-            ivyFileWriter << """
-	</publications>
-	<dependencies>
-"""
-            dependencies.each { dep ->
-                def confAttribute = dep.conf == null ? "" : """ conf="${dep.conf}" """
-                def revConstraint = dep.revConstraint == null ? "" : """ revConstraint="${dep.revConstraint}" """
-                ivyFileWriter << """<dependency org="${dep.organisation}" name="${dep.module}" rev="${dep.revision}" ${confAttribute} ${revConstraint}/>
-"""
-            }
-            ivyFileWriter << """
-    </dependencies>
-</ivy-module>
-        """
+
+                    def builder = new MarkupBuilder(ivyFileWriter)
+                    def infoAttrs = [organisation: organisation, module: module, revision: revision, status: status, publication: getPublicationDate()]
+                    infoAttrs += extraAttributes.collectEntries {key, value -> ["e:$key", value]}
+                    builder.info(infoAttrs) {
+                        if (extendsFrom) {
+                            "extends"(extendsFrom)
+                        }
+                        extraInfo.each { key, value ->
+                            "my:$key"(value)
+                        }
+                    }
+                    builder.configurations {
+                        configurations.each { name, config ->
+                            def confAttrs = [name: name, visibility: config.visibility]
+                            if (config.extendsFrom) {
+                                confAttrs.extends=config.extendsFrom.join(',')
+                            }
+                            if (!config.transitive) {
+                                confAttrs.transitive='false'
+                            }
+                            conf(confAttrs)
+                        }
+                    }
+                    builder.publications {
+                        artifacts.each { art ->
+                            if (!art.undeclared) {
+                                builder.artifact(name: art.name, type:art.type, ext: art.ext, conf:art.conf, "m:classifier": art.classifier ?: '')
+                            }
+                        }
+                    }
+                    builder.dependencies {
+                        dependencies.each { dep ->
+                            def depAttrs = [org: dep.organisation, name: dep.module, rev: dep.revision]
+                            if (dep.conf) {
+                                depAttrs.conf = dep.conf
+                            }
+                            if (dep.revConstraint) {
+                                depAttrs.revConstraint = dep.revConstraint
+                            }
+                            dependency(depAttrs)
+                        }
+                    }
+
+            ivyFileWriter << '</ivy-module>'
                 }
             })
         }
         return this
     }
 
-    TestFile file(Map<String, ?> options) {
-        def artifact = toArtifact(options)
-        return moduleDir.file("${artifact.name}-${revision}${artifact.classifier ? '-' + artifact.classifier : ''}.${artifact.ext}")
-    }
-
     @Override
     protected onPublish(TestFile file) {
         sha1File(file)
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyFileRepository.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyFileRepository.groovy
index 9fd679ff1404..0368b5570b63 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyFileRepository.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyFileRepository.groovy
@@ -15,16 +15,21 @@
  */
 package org.gradle.test.fixtures.ivy
 
-import org.apache.ivy.core.IvyPatternHelper
-import org.apache.ivy.core.module.id.ModuleId
-import org.apache.ivy.core.module.id.ModuleRevisionId
 import org.gradle.test.fixtures.file.TestFile
 
 class IvyFileRepository implements IvyRepository {
     final TestFile rootDir
+    final boolean m2Compatible
+    final String dirPattern
+    final String ivyFilePattern
+    final String artifactFilePattern
 
-    IvyFileRepository(TestFile rootDir) {
+    IvyFileRepository(TestFile rootDir, boolean m2Compatible = false, String dirPattern = null, String ivyFilePattern = null, String artifactFilePattern = null) {
         this.rootDir = rootDir
+        this.m2Compatible = m2Compatible
+        this.dirPattern = dirPattern ?: "[organisation]/[module]/[revision]"
+        this.ivyFilePattern = ivyFilePattern ?: "ivy-[revision].xml"
+        this.artifactFilePattern = artifactFilePattern ?: "[artifact]-[revision](-[classifier])(.[ext])"
     }
 
     URI getUri() {
@@ -39,24 +44,16 @@ class IvyFileRepository implements IvyRepository {
         return "${uri}/${baseArtifactPattern}"
     }
 
-    String getIvyFilePattern() {
-        "ivy-[revision].xml"
-    }
-
     String getBaseIvyPattern() {
         "$dirPattern/$ivyFilePattern"
     }
 
-    String getArtifactFilePattern() {
-        "[artifact]-[revision](.[ext])"
-    }
-
     String getBaseArtifactPattern() {
         "$dirPattern/$artifactFilePattern"
     }
 
-    String getDirPattern() {
-        "[organisation]/[module]/[revision]"
+    String getDirPath(String organisation, String module, String revision) {
+        M2CompatibleIvyPatternHelper.substitute(dirPattern, organisation, module, revision, m2Compatible)
     }
 
     IvyFileModule module(String organisation, String module, Object revision = '1.0') {
@@ -69,9 +66,8 @@ class IvyFileRepository implements IvyRepository {
 
     private IvyFileModule createModule(String organisation, String module, String revision) {
         def revisionString = revision.toString()
-        def path = IvyPatternHelper.substitute(dirPattern, new ModuleRevisionId(new ModuleId(organisation, module), revisionString))
-        def moduleDir = rootDir.file(path)
-        return new IvyFileModule(ivyFilePattern, artifactFilePattern, moduleDir, organisation, module, revisionString)
+        def moduleDir = rootDir.file(getDirPath(organisation, module, revision))
+        return new IvyFileModule(ivyFilePattern, artifactFilePattern, moduleDir, organisation, module, revisionString, m2Compatible)
     }
 }
 
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/M2CompatibleIvyPatternHelper.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/M2CompatibleIvyPatternHelper.groovy
new file mode 100644
index 000000000000..e9e948d27015
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/M2CompatibleIvyPatternHelper.groovy
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.ivy
+
+import org.apache.ivy.core.IvyPatternHelper
+import org.apache.ivy.core.module.id.ModuleId
+import org.apache.ivy.core.module.id.ModuleRevisionId
+
+class M2CompatibleIvyPatternHelper {
+
+    static String substitute(String pattern, String organisation, String module, String revision, boolean m2Compatible) {
+        def organisationToken = organisationToken(m2Compatible, organisation)
+        IvyPatternHelper.substitute(pattern, new ModuleRevisionId(new ModuleId(organisationToken, module), revision))
+    }
+
+    private static String organisationToken(boolean m2Compatible, String organisation) {
+        m2Compatible ? organisation.replaceAll(/\./, '/') : organisation
+    }
+
+    static String substitute(String pattern, boolean m2Compatible, Map<String, String> tokens) {
+        if (tokens.containsKey('organisation')) {
+            tokens.put('organisation', organisationToken(m2Compatible, tokens.get('organisation')))
+        }
+        IvyPatternHelper.substituteTokens(pattern, tokens)
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/RemoteIvyModule.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/RemoteIvyModule.groovy
new file mode 100644
index 000000000000..7de42c3dbcaf
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/RemoteIvyModule.groovy
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.ivy
+
+import org.gradle.test.fixtures.resource.RemoteResource
+
+interface RemoteIvyModule extends IvyModule {
+
+    RemoteResource getIvy()
+    RemoteResource getJar()
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/RemoteIvyRepository.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/RemoteIvyRepository.groovy
new file mode 100644
index 000000000000..e3e217822cc1
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/RemoteIvyRepository.groovy
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.ivy
+
+interface RemoteIvyRepository extends IvyRepository {
+
+    RemoteIvyModule module(String organisation, String module)
+
+    RemoteIvyModule module(String organisation, String module, Object revision)
+
+    String getBaseIvyPattern()
+
+    String getBaseArtifactPattern()
+
+    void expectDirectoryList(String organisation, String module)
+}
\ No newline at end of file
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/AbstractMavenModule.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/AbstractMavenModule.groovy
index bc4080bca2d5..88bf7783710f 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/AbstractMavenModule.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/AbstractMavenModule.groovy
@@ -28,7 +28,7 @@ abstract class AbstractMavenModule extends AbstractModule implements MavenModule
     final String groupId
     final String artifactId
     final String version
-    String parentPomSection
+    Map<String, String> parentPom
     String type = 'jar'
     String packaging
     int publishCount = 1
@@ -45,13 +45,7 @@ abstract class AbstractMavenModule extends AbstractModule implements MavenModule
     }
 
     MavenModule parent(String group, String artifactId, String version) {
-        parentPomSection = """
-<parent>
-  <groupId>${group}</groupId>
-  <artifactId>${artifactId}</artifactId>
-  <version>${version}</version>
-</parent>
-"""
+        parentPom = [groupId: group, artifactId: artifactId, version: version]
         return this
     }
 
@@ -246,42 +240,36 @@ abstract class AbstractMavenModule extends AbstractModule implements MavenModule
 
         publish(pomFile) { Writer writer ->
             def pomPackaging = packaging ?: type;
-            writer << """
-<project xmlns="http://maven.apache.org/POM/4.0.0">
-  <!-- ${getArtifactContent()} -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>$groupId</groupId>
-  <artifactId>$artifactId</artifactId>
-  <packaging>$pomPackaging</packaging>
-  <version>$version</version>
-  <description>Published on $publishTimestamp</description>"""
-
-            if (parentPomSection) {
-                writer << "\n$parentPomSection\n"
-            }
-
-            if (!dependencies.empty) {
-                writer << """
-  <dependencies>"""
-            }
-
-            dependencies.each { dependency ->
-                def typeAttribute = dependency['type'] == null ? "" : "<type>$dependency.type</type>"
-                writer << """
-    <dependency>
-      <groupId>$dependency.groupId</groupId>
-      <artifactId>$dependency.artifactId</artifactId>
-      <version>$dependency.version</version>
-      $typeAttribute
-    </dependency>"""
-            }
-
-            if (!dependencies.empty) {
-                writer << """
-  </dependencies>"""
+            new MarkupBuilder(writer).project {
+                mkp.comment(artifactContent)
+                modelVersion("4.0.0")
+                groupId(groupId)
+                artifactId(artifactId)
+                version(version)
+                packaging(pomPackaging)
+                description("Published on ${publishTimestamp}")
+                if (parentPom) {
+                    parent {
+                        groupId(parentPom.groupId)
+                        artifactId(parentPom.artifactId)
+                        version(parentPom.version)
+                    }
+                }
+                if (dependencies) {
+                    dependencies {
+                        dependencies.each { dep ->
+                            dependency {
+                                groupId(dep.groupId)
+                                artifactId(dep.artifactId)
+                                version(dep.version)
+                                if (dep.type) {
+                                    type(dep.type)
+                                }
+                            }
+                        }
+                    }
+                }
             }
-
-            writer << "\n</project>"
         }
         return this
     }
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/plugin/PluginBuilder.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/plugin/PluginBuilder.groovy
index c23af4dd68d3..0998587de499 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/plugin/PluginBuilder.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/plugin/PluginBuilder.groovy
@@ -29,10 +29,8 @@ class PluginBuilder {
     String packageName = "org.gradle.test"
 
     final Map<String, String> pluginIds = [:]
-    private final GradleExecuter executer
 
-    PluginBuilder(GradleExecuter executer, TestFile projectDir) {
-        this.executer = executer
+    PluginBuilder(TestFile projectDir) {
         this.projectDir = projectDir
     }
 
@@ -59,7 +57,7 @@ class PluginBuilder {
         file("build.gradle").text = (generateManagedBuildScript() + additions)
     }
 
-    void publishTo(TestFile testFile) {
+    void publishTo(GradleExecuter executer, TestFile testFile) {
         generateBuildScript """
             jar {
                 archiveName = "$testFile.name"
@@ -71,6 +69,11 @@ class PluginBuilder {
         executer.inDirectory(projectDir).withTasks("jar").run()
     }
 
+    void generateForBuildSrc() {
+        generateBuildScript()
+        writePluginDescriptors(pluginIds)
+    }
+
     protected void writePluginDescriptors(Map<String, String> pluginIds) {
         descriptorsDir.deleteDir()
         pluginIds.each { id, className ->
@@ -97,6 +100,21 @@ class PluginBuilder {
         this
     }
 
+    PluginBuilder addUnloadablePlugin(String id = "test-plugin", String className = "TestPlugin") {
+        pluginIds[id] = className
+
+        groovy("${className}.groovy") << """
+            package $packageName
+
+            class $className implements $Plugin.name<$Project.name> {
+                static { throw new Exception("unloadable plugin class") }
+                void apply($Project.name project) {
+                }
+            }
+        """
+        this
+    }
+
     PluginBuilder addPluginWithPrintlnTask(String taskName, String message, String id = "test-plugin", String className = "TestPlugin") {
         addPlugin("project.task(\"$taskName\") << { println \"$message\" }", id, className)
         this
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/resource/RemoteResource.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/resource/RemoteResource.groovy
new file mode 100644
index 000000000000..69a49938a67d
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/resource/RemoteResource.groovy
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.resource
+
+public interface RemoteResource {
+
+    URI getUri()
+
+    void expectDownload()
+
+    void expectDownloadMissing()
+
+    void expectMetadataRetrieve()
+
+    void expectMetadataRetrieveMissing()
+
+    void expectDownloadBroken()
+
+    void expectMetadataRetrieveBroken()
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SpecificClassesRebuildInfo.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ExpectOne.groovy
similarity index 70%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SpecificClassesRebuildInfo.java
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ExpectOne.groovy
index dabc13399053..0534688000e6 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SpecificClassesRebuildInfo.java
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ExpectOne.groovy
@@ -14,10 +14,16 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental;
+package org.gradle.test.fixtures.server
 
-public class SpecificClassesRebuildInfo extends DefaultRebuildInfo {
-    public SpecificClassesRebuildInfo(JarDelta jarDelta) {
-        super(false, jarDelta.getChangedClasses());
+abstract class ExpectOne implements ServerExpectation {
+    boolean run
+
+    void assertMet() {
+        if (!run) {
+            throw new AssertionError(notMetMessage)
+        }
     }
+
+    abstract String getNotMetMessage()
 }
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/RepositoryServer.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/RepositoryServer.groovy
new file mode 100644
index 000000000000..07159563beaf
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/RepositoryServer.groovy
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server
+
+import org.gradle.test.fixtures.ivy.RemoteIvyRepository
+
+public interface RepositoryServer {
+
+    RemoteIvyRepository getRemoteIvyRepo()
+
+    RemoteIvyRepository getRemoteIvyRepo(boolean m2Compatible, String dirPattern)
+
+    RemoteIvyRepository getRemoteIvyRepo(boolean m2Compatible, String dirPattern, String ivyFilePattern, String artifactFilePattern)
+
+    RemoteIvyRepository getRemoteIvyRepo(String contextPath)
+
+    void resetExpectations()
+
+    String getValidCredentials()
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarDelta.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ServerExpectation.groovy
similarity index 79%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarDelta.java
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ServerExpectation.groovy
index c310a95cffde..755ce1595cc8 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarDelta.java
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ServerExpectation.groovy
@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental;
+package org.gradle.test.fixtures.server
 
-import java.util.Collection;
-
-interface JarDelta {
-    Collection<String> getChangedClasses();
-}
\ No newline at end of file
+interface ServerExpectation {
+    void assertMet()
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ServerWithExpectations.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ServerWithExpectations.groovy
new file mode 100644
index 000000000000..84f1524fa373
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/ServerWithExpectations.groovy
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server
+
+import org.junit.rules.ExternalResource
+import org.slf4j.Logger
+
+abstract class ServerWithExpectations extends ExternalResource {
+
+    protected Throwable failure
+
+    void resetExpectations() {
+        try {
+            if (failure != null) {
+                throw failure
+            }
+            for (ServerExpectation e in expectations) {
+                e.assertMet()
+            }
+        } finally {
+            failure = null
+            expectations.clear()
+        }
+    }
+
+    @Override
+    protected void after() {
+        stop()
+        resetExpectations()
+    }
+
+    protected void onFailure(Throwable failure) {
+        logger.error(failure.message)
+        if (this.failure == null) {
+            this.failure = failure
+        }
+    }
+
+    abstract protected List<? extends ServerExpectation> getExpectations()
+    abstract protected void stop()
+    abstract protected Logger getLogger()
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/BasicHttpResource.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/BasicHttpResource.groovy
similarity index 91%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/BasicHttpResource.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/BasicHttpResource.groovy
index b0a7f3b6b6c9..a54864e808c8 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/BasicHttpResource.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/BasicHttpResource.groovy
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.maven
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.server.http.HttpServer
 
 class BasicHttpResource extends HttpResource {
     private final String path
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/HttpArtifact.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpArtifact.groovy
similarity index 92%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/HttpArtifact.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpArtifact.groovy
index 14fc453cc6df..6593f9ee778c 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/HttpArtifact.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpArtifact.groovy
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.maven
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.internal.hash.HashUtil
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.server.http.HttpServer
 
 abstract class HttpArtifact extends HttpResource {
 
@@ -38,7 +37,7 @@ abstract class HttpArtifact extends HttpResource {
     }
 
     URI getUri() {
-        return new URI("http://localhost:${server.port}${path}")
+        return new URI("http", "localhost:${server.port}", path, null, null)
     }
 
     protected String getPath() {
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/HttpResource.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpResource.groovy
similarity index 91%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/HttpResource.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpResource.groovy
index 734dcb8c8224..547b7c9de866 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/HttpResource.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpResource.groovy
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.maven
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.api.artifacts.repositories.PasswordCredentials
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.server.http.HttpServer
 
 abstract class HttpResource {
 
@@ -32,10 +31,15 @@ abstract class HttpResource {
         server.allowGetOrHead(getPath(), file)
 
     }
+
     void expectGet() {
         server.expectGet(getPath(), file)
     }
 
+    void expectGet(String userName, String password) {
+        server.expectGet(getPath(), userName, password, file)
+    }
+
     void expectGetBroken() {
         server.expectGetBroken(getPath())
     }
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpResourceInteraction.java b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpResourceInteraction.java
new file mode 100644
index 000000000000..b18d1d259417
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpResourceInteraction.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server.http;
+
+public interface HttpResourceInteraction {
+    HttpResourceInteraction contentType(String encoding);
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpServer.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpServer.groovy
index c7cd0c263a4d..f92cb3b55451 100755
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpServer.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/HttpServer.groovy
@@ -15,14 +15,18 @@
  */
 package org.gradle.test.fixtures.server.http
 
+import com.google.common.net.UrlEscapers
 import com.google.gson.Gson
 import com.google.gson.JsonElement
+import groovy.xml.MarkupBuilder
 import org.gradle.api.artifacts.repositories.PasswordCredentials
 import org.gradle.internal.hash.HashUtil
+import org.gradle.test.fixtures.server.ExpectOne
+import org.gradle.test.fixtures.server.ServerExpectation
+import org.gradle.test.fixtures.server.ServerWithExpectations
 import org.gradle.test.matchers.UserAgentMatcher
 import org.gradle.util.GFileUtils
 import org.hamcrest.Matcher
-import org.junit.rules.ExternalResource
 import org.mortbay.jetty.*
 import org.mortbay.jetty.bio.SocketConnector
 import org.mortbay.jetty.handler.AbstractHandler
@@ -36,9 +40,9 @@ import javax.servlet.http.HttpServletResponse
 import java.security.Principal
 import java.util.zip.GZIPOutputStream
 
-class HttpServer extends ExternalResource {
+class HttpServer extends ServerWithExpectations {
 
-    private static Logger logger = LoggerFactory.getLogger(HttpServer.class)
+    private final static Logger logger = LoggerFactory.getLogger(HttpServer.class)
 
     private final Server server = new Server(0)
     private final HandlerCollection collection = new HandlerCollection()
@@ -48,9 +52,9 @@ class HttpServer extends ExternalResource {
     private SslSocketConnector sslConnector
     AuthScheme authenticationScheme = AuthScheme.BASIC
 
-    private Throwable failure
-    private final List<Expection> expections = []
-    private Matcher expectedUserAgent = null
+    protected Matcher expectedUserAgent = null
+
+    List<ServerExpectation> expectations = []
 
     enum AuthScheme {
         BASIC(new BasicAuthHandler()), DIGEST(new DigestAuthHandler())
@@ -104,6 +108,10 @@ class HttpServer extends ExternalResource {
         server.setHandler(handlers)
     }
 
+    protected Logger getLogger() {
+        logger
+    }
+
     String getAddress() {
         if (!server.started) {
             server.start()
@@ -111,48 +119,37 @@ class HttpServer extends ExternalResource {
         "http://localhost:${port}"
     }
 
-    void start() {
-        start(0)
-    }
-
     boolean isRunning() {
         server.running
     }
 
-    void start(int port) {
+    void start() {
         connector = new SocketConnector()
-        connector.port = port
+        connector.port = 0
         server.addConnector(connector)
-        try {
-            server.start()
-        } catch (java.net.BindException e) {
-            //without this, it is not possible to retry starting the server on the same port
-            //retrying is useful if we need to start server on a specific port
-            //and the OS forces us to wait until it is available.
+        server.start()
+        for (int i = 0; i < 5; i++) {
+            if (connector.localPort > 0) {
+                return;
+            }
+            // Has failed to start for some reason - try again
             server.removeConnector(connector)
-            throw e
-        }
-        def localPort = connector.localPort
-        if (localPort <= 0) {
-            throw new AssertionError("SocketConnector.localPort returned $localPort after starting server");
+            connector.stop()
+            connector = new SocketConnector()
+            connector.port = 0
+            server.addConnector(connector)
+            connector.start()
         }
+        throw new AssertionError("SocketConnector failed to start.");
     }
 
     void stop() {
-        resetExpectations()
         server?.stop()
         if (connector) {
             server?.removeConnector(connector)
         }
     }
 
-    private void onFailure(Throwable failure) {
-        logger.error(failure.message)
-        if (this.failure == null) {
-            this.failure = failure
-        }
-    }
-
     void enableSsl(String keyStore, String keyPassword, String trustStore = null, String trustPassword = null) {
         sslConnector = new SslSocketConnector()
         sslConnector.keystore = keyStore
@@ -163,6 +160,9 @@ class HttpServer extends ExternalResource {
             sslConnector.trustPassword = trustPassword
         }
         server.addConnector(sslConnector)
+        if (server.started) {
+            sslConnector.start()
+        }
     }
 
     int getSslPort() {
@@ -175,24 +175,19 @@ class HttpServer extends ExternalResource {
 
     void resetExpectations() {
         try {
-            if (failure != null) {
-                throw failure
-            }
-            for (Expection e in expections) {
-                e.assertMet()
-            }
+            super.resetExpectations()
         } finally {
             realm = null
-            failure = null
             expectedUserAgent = null
-            expections.clear()
             collection.setHandlers()
         }
     }
 
-    @Override
-    protected void after() {
-        stop()
+    /**
+     * Adds a given file at the given URL. The source file can be either a file or a directory.
+     */
+    void allowHead(String path, File srcFile) {
+        allow(path, true, ['HEAD'], fileHandler(path, srcFile))
     }
 
     /**
@@ -209,35 +204,49 @@ class HttpServer extends ExternalResource {
         allow(path, true, ['GET', 'HEAD'], withAuthentication(path, username, password, fileHandler(path, srcFile)))
     }
 
-    private Action fileHandler(String path, File srcFile, Long lastModified = null, Long contentLength = null) {
-        return new Action() {
-            String getDisplayName() {
-                return "return contents of $srcFile.name"
-            }
+    /**
+     * Allows one GET request for the given URL, which return 404 status code
+     */
+    void allowGetMissing(String path) {
+        allow(path, false, ['GET'], notFound())
+    }
 
-            void handle(HttpServletRequest request, HttpServletResponse response) {
-                if (HttpServer.this.expectedUserAgent != null) {
-                    String receivedUserAgent = request.getHeader("User-Agent")
-                    if (!expectedUserAgent.matches(receivedUserAgent)) {
-                        response.sendError(412, String.format("Precondition Failed: Expected User-Agent: '%s' but was '%s'", expectedUserAgent, receivedUserAgent));
-                        return;
-                    }
-                }
-                def file
-                if (request.pathInfo == path) {
-                    file = srcFile
-                } else {
-                    def relativePath = request.pathInfo.substring(path.length() + 1)
-                    file = new File(srcFile, relativePath)
-                }
-                if (file.isFile()) {
-                    sendFile(response, file, lastModified, contentLength)
-                } else if (file.isDirectory()) {
-                    sendDirectoryListing(response, file)
-                } else {
-                    response.sendError(404, "'$request.pathInfo' does not exist")
+    private Action fileHandler(String path, File srcFile) {
+        return new SendFileAction(path, srcFile)
+    }
+
+    class SendFileAction extends ActionSupport {
+        private final String path
+        private final File srcFile
+
+        SendFileAction(String path, File srcFile) {
+            super("return contents of $srcFile.name")
+            this.srcFile = srcFile
+            this.path = path
+        }
+
+        void handle(HttpServletRequest request, HttpServletResponse response) {
+            if (expectedUserAgent != null) {
+                String receivedUserAgent = request.getHeader("User-Agent")
+                if (!expectedUserAgent.matches(receivedUserAgent)) {
+                    response.sendError(412, String.format("Precondition Failed: Expected User-Agent: '%s' but was '%s'", expectedUserAgent, receivedUserAgent));
+                    return;
                 }
             }
+            def file
+            if (request.pathInfo == path) {
+                file = srcFile
+            } else {
+                def relativePath = request.pathInfo.substring(path.length() + 1)
+                file = new File(srcFile, relativePath)
+            }
+            if (file.isFile()) {
+                sendFile(response, file, null, null, interaction.contentType)
+            } else if (file.isDirectory()) {
+                sendDirectoryListing(response, file)
+            } else {
+                response.sendError(404, "'$request.pathInfo' does not exist")
+            }
         }
     }
 
@@ -249,39 +258,35 @@ class HttpServer extends ExternalResource {
     }
 
     /**
-     * Allows one GET request, which fails with a 500 status code
+     * Expects one GET request, which fails with a 500 status code
      */
     void expectGetBroken(String path) {
         expect(path, false, ['GET'], broken())
     }
 
     /**
-     * Allows one GET request for the given URL, which return 404 status code
+     * Expects one GET request for the given URL, which return 404 status code
      */
     void expectGetMissing(String path, PasswordCredentials passwordCredentials = null) {
         expect(path, false, ['GET'], notFound(), passwordCredentials)
     }
 
     /**
-     * Allows one HEAD request for the given URL, which return 404 status code
+     * Expects one HEAD request for the given URL, which return 404 status code
      */
     void expectHeadMissing(String path) {
         expect(path, false, ['HEAD'], notFound())
     }
 
     /**
-     * Allows one HEAD request for the given URL, which returns a 500 status code
+     * Expects one HEAD request for the given URL, which returns a 500 status code
      */
     void expectHeadBroken(String path) {
         expect(path, false, ['HEAD'], broken())
     }
 
     private Action notFound() {
-        new Action() {
-            String getDisplayName() {
-                return "return 404 not found"
-            }
-
+        new ActionSupport("return 404 not found") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 response.sendError(404, "not found")
             }
@@ -289,11 +294,7 @@ class HttpServer extends ExternalResource {
     }
 
     private Action broken() {
-        new Action() {
-            String getDisplayName() {
-                return "return 500 broken"
-            }
-
+        new ActionSupport("return 500 broken") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 response.sendError(500, "broken")
             }
@@ -301,10 +302,10 @@ class HttpServer extends ExternalResource {
     }
 
     /**
-     * Allows one HEAD request for the given URL.
+     * Expects one HEAD request for the given URL.
      */
-    void expectHead(String path, File srcFile, Long lastModified = null, Long contentLength = null) {
-        expect(path, false, ['HEAD'], fileHandler(path, srcFile, lastModified, contentLength))
+    void expectHead(String path, File srcFile) {
+        expect(path, false, ['HEAD'], fileHandler(path, srcFile))
     }
 
     /**
@@ -317,26 +318,22 @@ class HttpServer extends ExternalResource {
     /**
      * Allows one GET request for the given URL. Reads the request content from the given file.
      */
-    void expectGet(String path, File srcFile, Long lastModified = null, Long contentLength = null) {
-        expect(path, false, ['GET'], fileHandler(path, srcFile, lastModified, contentLength))
+    HttpResourceInteraction expectGet(String path, File srcFile) {
+        return expect(path, false, ['GET'], fileHandler(path, srcFile))
     }
 
     /**
-     * Allows one GET request for the given URL, with the given credentials. Reads the request content from the given file.
+     * Expects one GET request for the given URL, with the given credentials. Reads the request content from the given file.
      */
-    void expectGet(String path, String username, String password, File srcFile) {
-        expect(path, false, ['GET'], withAuthentication(path, username, password, fileHandler(path, srcFile)))
+    HttpResourceInteraction expectGet(String path, String username, String password, File srcFile) {
+        return expect(path, false, ['GET'], withAuthentication(path, username, password, fileHandler(path, srcFile)))
     }
 
     /**
-     * Allows one GET request for the given URL, with the response being GZip encoded.
+     * Expects one GET request for the given URL, with the response being GZip encoded.
      */
     void expectGetGZipped(String path, File srcFile) {
-        expect(path, false, ['GET'], new Action() {
-            String getDisplayName() {
-                return "return gzipped $srcFile.name"
-            }
-
+        expect(path, false, ['GET'], new ActionSupport("return gzipped $srcFile.name") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 def file = srcFile
                 if (file.isFile()) {
@@ -353,25 +350,21 @@ class HttpServer extends ExternalResource {
     }
 
     /**
-     * Allow one GET request for the given URL, responding with a redirect.
+     * Expects one GET request for the given URL, responding with a redirect.
      */
     void expectGetRedirected(String path, String location) {
         expectRedirected('GET', path, location)
     }
 
     /**
-     * Allow one HEAD request for the given URL, responding with a redirect.
+     * Expects one HEAD request for the given URL, responding with a redirect.
      */
     void expectHeadRedirected(String path, String location) {
         expectRedirected('HEAD', path, location)
     }
 
     private void expectRedirected(String method, String path, String location) {
-        expect(path, false, [method], new Action() {
-            String getDisplayName() {
-                return "redirect to $location"
-            }
-
+        expect(path, false, [method], new ActionSupport("redirect to $location") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 response.sendRedirect(location)
             }
@@ -382,11 +375,7 @@ class HttpServer extends ExternalResource {
      * Allows GET requests for the given URL, returning an apache-compatible directory listing with the given File names.
      */
     void allowGetDirectoryListing(String path, File directory) {
-        allow(path, false, ['GET'], new Action() {
-            String getDisplayName() {
-                return "return listing of directory $directory.name"
-            }
-
+        allow(path, false, ['GET'], new ActionSupport("return listing of directory $directory.name") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 sendDirectoryListing(response, directory)
             }
@@ -397,11 +386,7 @@ class HttpServer extends ExternalResource {
      * Expects one GET request for the given URL, returning an apache-compatible directory listing with the given File names.
      */
     void expectGetDirectoryListing(String path, File directory) {
-        expect(path, false, ['GET'], new Action() {
-            String getDisplayName() {
-                return "return listing of directory $directory.name"
-            }
-
+        expect(path, false, ['GET'], new ActionSupport("return listing of directory $directory.name") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 sendDirectoryListing(response, directory)
             }
@@ -409,28 +394,23 @@ class HttpServer extends ExternalResource {
     }
 
     /**
-     * Allows one GET request for the given URL, returning an apache-compatible directory listing with the given File names.
+     * Expects one GET request for the given URL, returning an apache-compatible directory listing with the given File names.
      */
     void expectGetDirectoryListing(String path, String username, String password, File directory) {
-        expect(path, false, ['GET'], withAuthentication(path, username, password, new Action() {
-            String getDisplayName() {
-                return "return listing of directory $directory.name"
-            }
-
+        expect(path, false, ['GET'], withAuthentication(path, username, password, new ActionSupport("return listing of directory $directory.name") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 sendDirectoryListing(response, directory)
             }
         }));
     }
 
-
-    private sendFile(HttpServletResponse response, File file, Long lastModified, Long contentLength) {
+    private sendFile(HttpServletResponse response, File file, Long lastModified, Long contentLength, String contentType) {
         if (sendLastModified) {
             response.setDateHeader(HttpHeaders.LAST_MODIFIED, lastModified ?: file.lastModified())
         }
         def content = file.bytes
         response.setContentLength((contentLength ?: content.length) as int)
-        response.setContentType(new MimeTypes().getMimeByExtension(file.name).toString())
+        response.setContentType(contentType ?: new MimeTypes().getMimeByExtension(file.name).toString())
         if (sendSha1Header) {
             response.addHeader("X-Checksum-Sha1", HashUtil.sha1(content).asHexString())
         }
@@ -457,25 +437,29 @@ class HttpServer extends ExternalResource {
     }
 
     private sendDirectoryListing(HttpServletResponse response, File directory) {
-        def directoryListing = ""
-        for (String fileName : directory.list()) {
-            directoryListing += "<a href=\"$fileName\">$fileName</a>"
+        def writer = new StringWriter()
+        def markupBuilder = new MarkupBuilder(writer)
+        markupBuilder.doubleQuotes = true // for Ivy
+        markupBuilder.html {
+            for (String fileName : directory.list()) {
+                def uri = UrlEscapers.urlPathSegmentEscaper().escape(fileName).replaceAll(':', '%3A')
+                a(href: uri, fileName)
+            }
+
         }
+        def directoryListing = writer.toString().getBytes("utf8")
 
-        response.setContentLength(directoryListing.length())
+        response.setContentLength(directoryListing.length)
         response.setContentType("text/html")
-        response.outputStream.bytes = directoryListing.bytes
+        response.setCharacterEncoding("utf8")
+        response.outputStream.bytes = directoryListing
     }
 
     /**
-     * Allows one PUT request for the given URL. Writes the request content to the given file.
+     * Expects one PUT request for the given URL. Writes the request content to the given file.
      */
     void expectPut(String path, File destFile, int statusCode = HttpStatus.ORDINAL_200_OK, PasswordCredentials credentials = null) {
-        def action = new Action() {
-            String getDisplayName() {
-                return "write request to $destFile.name and return status $statusCode"
-            }
-
+        def action = new ActionSupport("write request to $destFile.name and return status $statusCode") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 if (HttpServer.this.expectedUserAgent != null) {
                     String receivedUserAgent = request.getHeader("User-Agent")
@@ -494,14 +478,10 @@ class HttpServer extends ExternalResource {
     }
 
     /**
-     * Allows one PUT request for the given URL, with the given credentials. Writes the request content to the given file.
+     * Expects one PUT request for the given URL, with the given credentials. Writes the request content to the given file.
      */
     void expectPut(String path, String username, String password, File destFile) {
-        expect(path, false, ['PUT'], withAuthentication(path, username, password, new Action() {
-            String getDisplayName() {
-                return "write request to $destFile.name"
-            }
-
+        expect(path, false, ['PUT'], withAuthentication(path, username, password, new ActionSupport("write request to $destFile.name") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
 
                 if (request.remoteUser != username) {
@@ -518,11 +498,7 @@ class HttpServer extends ExternalResource {
      * Allows PUT requests with the given credentials.
      */
     void allowPut(String path, String username, String password) {
-        allow(path, false, ['PUT'], withAuthentication(path, username, password, new Action() {
-            String getDisplayName() {
-                return "return 500"
-            }
-
+        allow(path, false, ['PUT'], withAuthentication(path, username, password, new ActionSupport("return 500") {
             void handle(HttpServletRequest request, HttpServletResponse response) {
                 response.sendError(500, "unexpected username '${request.remoteUser}'")
             }
@@ -543,6 +519,11 @@ class HttpServer extends ExternalResource {
         }
 
         return new Action() {
+            @Override
+            HttpResourceInteraction getInteraction() {
+                return action.interaction
+            }
+
             String getDisplayName() {
                 return action.displayName
             }
@@ -561,13 +542,13 @@ class HttpServer extends ExternalResource {
         expect(path, false, methods, action, passwordCredentials)
     }
 
-    void expect(String path, boolean matchPrefix, Collection<String> methods, Action action, PasswordCredentials credentials = null) {
+    HttpResourceInteraction expect(String path, boolean matchPrefix, Collection<String> methods, Action action, PasswordCredentials credentials = null) {
         if (credentials != null) {
             action = withAuthentication(path, credentials.username, credentials.password, action)
         }
 
-        ExpectOne expectation = new ExpectOne(action, methods, path)
-        expections << expectation
+        HttpExpectOne expectation = new HttpExpectOne(action, methods, path)
+        expectations << expectation
         add(path, matchPrefix, methods, new AbstractHandler() {
             void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch) {
                 if (expectation.run) {
@@ -578,6 +559,8 @@ class HttpServer extends ExternalResource {
                 request.handled = true
             }
         })
+
+        return action.interaction
     }
 
     private void allow(String path, boolean matchPrefix, Collection<String> methods, Action action) {
@@ -591,7 +574,6 @@ class HttpServer extends ExternalResource {
 
     private void add(String path, boolean matchPrefix, Collection<String> methods, Handler handler) {
         assert path.startsWith('/')
-//        assert path == '/' || !path.endsWith('/')
         def prefix = path == '/' ? '/' : path + '/'
         collection.addHandler(new AbstractHandler() {
             void handle(String target, HttpServletRequest request, HttpServletResponse response, int dispatch) {
@@ -610,30 +592,25 @@ class HttpServer extends ExternalResource {
         return server.connectors[0].localPort
     }
 
-    interface Expection {
-        void assertMet()
-    }
-
-    static class ExpectOne implements Expection {
-        boolean run
+    static class HttpExpectOne extends ExpectOne {
         final Action action
         final Collection<String> methods
         final String path
 
-        ExpectOne(Action action, Collection<String> methods, String path) {
+        HttpExpectOne(Action action, Collection<String> methods, String path) {
             this.action = action
             this.methods = methods
             this.path = path
         }
 
-        void assertMet() {
-            if (!run) {
-                throw new AssertionError("Expected HTTP request not received: ${methods.size() == 1 ? methods[0] : methods} $path and $action.displayName")
-            }
+        String getNotMetMessage() {
+            "Expected HTTP request not received: ${methods.size() == 1 ? methods[0] : methods} $path and $action.displayName"
         }
     }
 
     interface Action {
+        HttpResourceInteraction getInteraction()
+
         String getDisplayName()
 
         void handle(HttpServletRequest request, HttpServletResponse response)
@@ -641,12 +618,23 @@ class HttpServer extends ExternalResource {
 
     static abstract class ActionSupport implements Action {
         final String displayName
+        final HttpResourceInteraction interaction = new DefaultResourceInteraction()
 
         ActionSupport(String displayName) {
             this.displayName = displayName
         }
     }
 
+    static class DefaultResourceInteraction implements HttpResourceInteraction {
+        String contentType
+
+        @Override
+        HttpResourceInteraction contentType(String encoding) {
+            this.contentType = encoding
+            return this
+        }
+    }
+
     static class Utils {
         static JsonElement json(HttpServletRequest request) {
             new Gson().fromJson(request.reader, JsonElement.class)
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyHttpModule.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/IvyHttpModule.groovy
similarity index 68%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyHttpModule.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/IvyHttpModule.groovy
index eb9bae775b83..2778f99e69dc 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyHttpModule.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/IvyHttpModule.groovy
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.ivy
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.test.fixtures.HttpModule
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.maven.HttpArtifact
-import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.test.fixtures.ivy.IvyDescriptor
+import org.gradle.test.fixtures.ivy.IvyFileModule
+import org.gradle.test.fixtures.ivy.RemoteIvyModule
+import org.gradle.test.fixtures.resource.RemoteResource
 
-class IvyHttpModule implements IvyModule, HttpModule {
+class IvyHttpModule implements RemoteIvyModule, HttpModule {
     public final IvyHttpRepository repository
     private final IvyFileModule backingModule
     private final HttpServer server
@@ -105,6 +107,16 @@ class IvyHttpModule implements IvyModule, HttpModule {
         return this
     }
 
+    IvyHttpModule withExtraAttributes(Map extraAttributes) {
+        backingModule.withExtraAttributes(extraAttributes)
+        return this
+    }
+
+    IvyHttpModule withExtraInfo(Map extraInfo) {
+        backingModule.withExtraInfo(extraInfo)
+        return this
+    }
+
     TestFile getIvyFile() {
         return backingModule.ivyFile
     }
@@ -113,32 +125,43 @@ class IvyHttpModule implements IvyModule, HttpModule {
         return backingModule.jarFile
     }
 
-    IvyModuleHttpArtifact getArtifact(Map<String, ?> options) {
-        return new IvyModuleHttpArtifact(server, prefix, backingModule.file(options))
-    }
-
     void allowAll() {
         server.allowGetOrHead(prefix, backingModule.moduleDir)
     }
 
-    HttpArtifact getIvy() {
-        return new IvyModuleHttpArtifact(server, prefix, ivyFile)
+    IvyModuleHttpArtifact getArtifact(Map<String, ?> options) {
+        def backingFile = backingModule.file(options)
+        return new IvyModuleHttpArtifact(server, prefix, backingModule.getArtifactFilePath(options), backingFile)
+    }
+
+    IvyModuleHttpArtifact getIvy() {
+        return new IvyModuleHttpArtifact(server, prefix, backingModule.ivyFilePath, ivyFile)
     }
 
-    HttpArtifact getJar() {
-        return new IvyModuleHttpArtifact(server, prefix, jarFile)
+    IvyModuleHttpArtifact getJar() {
+        return new IvyModuleHttpArtifact(server, prefix, backingModule.jarFilePath, jarFile)
     }
 
+
     void assertIvyAndJarFilePublished() {
         backingModule.assertIvyAndJarFilePublished()
     }
 
-    private class IvyModuleHttpArtifact extends HttpArtifact {
+    private class IvyModuleHttpArtifact extends HttpArtifact implements RemoteResource {
         final TestFile backingFile
+        final String filePath
 
-        IvyModuleHttpArtifact(HttpServer server, String modulePath, TestFile backingFile) {
+        IvyModuleHttpArtifact(HttpServer server, String modulePath, String filePath, TestFile backingFile) {
             super(server, modulePath)
+            this.filePath = filePath;
             this.backingFile = backingFile
+            this.filePath = filePath
+        }
+
+
+        @Override
+        protected String getPath() {
+            "${modulePath}/${filePath}"
         }
 
         @Override
@@ -155,6 +178,30 @@ class IvyHttpModule implements IvyModule, HttpModule {
         protected TestFile getMd5File() {
             return backingModule.getMd5File(backingFile)
         }
+
+        void expectDownload() {
+            expectGet()
+        }
+
+        void expectDownloadMissing() {
+            expectGetMissing()
+        }
+
+        void expectMetadataRetrieve() {
+            expectHead()
+        }
+
+        void expectMetadataRetrieveMissing() {
+            expectHeadMissing()
+        }
+
+        void expectDownloadBroken() {
+            expectGetBroken()
+        }
+
+        void expectMetadataRetrieveBroken() {
+            expectHeadBroken()
+        }
     }
 }
 
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyHttpRepository.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/IvyHttpRepository.groovy
similarity index 71%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyHttpRepository.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/IvyHttpRepository.groovy
index 4f05bce1ac33..04c520c8629e 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/ivy/IvyHttpRepository.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/IvyHttpRepository.groovy
@@ -14,23 +14,26 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.ivy
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.test.fixtures.HttpRepository
-import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.test.fixtures.ivy.IvyFileRepository
+import org.gradle.test.fixtures.ivy.RemoteIvyRepository
 
-class IvyHttpRepository implements IvyRepository, HttpRepository {
+class IvyHttpRepository implements RemoteIvyRepository, HttpRepository {
     private final HttpServer server
     private final IvyFileRepository backingRepository
     private final String contextPath
+    private final boolean m2Compatible
 
-    IvyHttpRepository(HttpServer server, String contextPath = "/repo", IvyFileRepository backingRepository) {
+    IvyHttpRepository(HttpServer server, String contextPath = "/repo", IvyFileRepository backingRepository, boolean m2Compatible = false) {
         if (!contextPath.startsWith("/")) {
             throw new IllegalArgumentException("Context path must start with '/'")
         }
-        this.contextPath = contextPath
         this.server = server
+        this.contextPath = contextPath
         this.backingRepository = backingRepository
+        this.m2Compatible = m2Compatible
     }
 
     URI getUri() {
@@ -53,6 +56,10 @@ class IvyHttpRepository implements IvyRepository, HttpRepository {
         server.expectGetDirectoryListing("$contextPath/$organisation/$module/", backingRepository.module(organisation, module, "1.0").moduleDir.parentFile)
     }
 
+    void expectDirectoryList(String organisation, String module) {
+        expectDirectoryListGet(organisation, module)
+    }
+
     void expectDirectoryListGetMissing(String organisation, String module) {
         server.expectGetMissing("$contextPath/$organisation/$module/")
     }
@@ -62,6 +69,15 @@ class IvyHttpRepository implements IvyRepository, HttpRepository {
     }
 
     IvyHttpModule module(String organisation, String module, Object revision = "1.0") {
-        return new IvyHttpModule(this, server, "$contextPath/$organisation/$module/$revision", backingRepository.module(organisation, module, revision))
+        def path = backingRepository.getDirPath(organisation, module, revision.toString())
+        return new IvyHttpModule(this, server, "$contextPath/$path", backingRepository.module(organisation, module, revision))
+    }
+
+    String getBaseIvyPattern() {
+        backingRepository.baseIvyPattern
+    }
+
+    String getBaseArtifactPattern() {
+        backingRepository.baseArtifactPattern
     }
 }
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpArtifact.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpArtifact.groovy
similarity index 92%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpArtifact.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpArtifact.groovy
index ca35fbfb6f6b..dd9260ee73c2 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpArtifact.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpArtifact.groovy
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.maven
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.test.fixtures.maven.MavenFileModule
 
 class MavenHttpArtifact extends HttpArtifact {
     private final MavenFileModule backingModule;
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpModule.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpModule.groovy
similarity index 95%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpModule.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpModule.groovy
index dfe0ecbbd02f..6a8f56a6894f 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpModule.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpModule.groovy
@@ -16,11 +16,13 @@
 
 
 
-package org.gradle.test.fixtures.maven
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.test.fixtures.HttpModule
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.test.fixtures.maven.MavenFileModule
+import org.gradle.test.fixtures.maven.MavenModule
+import org.gradle.test.fixtures.maven.MavenPom
 
 class MavenHttpModule implements MavenModule, HttpModule {
     private final HttpServer server
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpRepository.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpRepository.groovy
similarity index 93%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpRepository.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpRepository.groovy
index 2b087e278fb0..8de6f023d711 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MavenHttpRepository.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MavenHttpRepository.groovy
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.maven
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.test.fixtures.HttpRepository
-import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.test.fixtures.maven.MavenFileRepository
+import org.gradle.test.fixtures.maven.MavenRepository
 
 /**
  * A fixture for dealing with remote HTTP Maven repositories.
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MetaDataArtifact.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MetaDataArtifact.groovy
similarity index 89%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MetaDataArtifact.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MetaDataArtifact.groovy
index 47fdf617bcf5..7751db0127dd 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/MetaDataArtifact.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/MetaDataArtifact.groovy
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.maven
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.test.fixtures.maven.MavenFileModule
+import org.gradle.test.fixtures.maven.MavenMetaData
 
 class MetaDataArtifact extends HttpArtifact implements MavenMetaData {
     MavenFileModule backingModule
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/PomHttpArtifact.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/PomHttpArtifact.groovy
similarity index 94%
rename from subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/PomHttpArtifact.groovy
rename to subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/PomHttpArtifact.groovy
index 41ee4045e440..c15bb5bebeeb 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/maven/PomHttpArtifact.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/PomHttpArtifact.groovy
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.test.fixtures.maven
+package org.gradle.test.fixtures.server.http
 
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.test.fixtures.maven.MavenFileModule
 
 class PomHttpArtifact extends HttpArtifact {
     MavenFileModule backingModule
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/RepositoryHttpServer.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/RepositoryHttpServer.groovy
new file mode 100644
index 000000000000..4fa4c24a1949
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/http/RepositoryHttpServer.groovy
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server.http
+
+import org.gradle.test.fixtures.file.TestDirectoryProvider
+import org.gradle.test.fixtures.ivy.IvyFileRepository
+import org.gradle.test.fixtures.ivy.RemoteIvyRepository
+import org.gradle.test.fixtures.server.RepositoryServer
+import org.gradle.util.GradleVersion
+
+import static org.gradle.test.matchers.UserAgentMatcher.matchesNameAndVersion
+
+class RepositoryHttpServer extends HttpServer implements RepositoryServer {
+
+    private TestDirectoryProvider testDirectoryProvider
+
+    RepositoryHttpServer(TestDirectoryProvider testDirectoryProvider) {
+        this.testDirectoryProvider = testDirectoryProvider
+    }
+
+    @Override
+    protected void before() throws Throwable {
+        start()
+        expectUserAgent(matchesNameAndVersion("Gradle", GradleVersion.current().getVersion()))
+    }
+
+    private IvyFileRepository getBackingRepository(boolean m2Compatible = false, String dirPattern = null, String ivyFilePattern = null, String artifactFilePattern = null) {
+        new IvyFileRepository(testDirectoryProvider.testDirectory.file('ivy-repo'), m2Compatible, dirPattern, ivyFilePattern, artifactFilePattern)
+    }
+
+    RemoteIvyRepository getRemoteIvyRepo(boolean m2Compatible = false, String dirPattern = null, String ivyFilePattern = null, String artifactFilePattern = null) {
+        return new IvyHttpRepository(this, '/repo', getBackingRepository(m2Compatible, dirPattern, ivyFilePattern, artifactFilePattern), m2Compatible)
+    }
+
+    RemoteIvyRepository getRemoteIvyRepo(String contextPath) {
+        new IvyHttpRepository(this, contextPath, backingRepository)
+    }
+
+    String getValidCredentials() {
+        return ""
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/IvySftpModule.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/IvySftpModule.groovy
new file mode 100644
index 000000000000..4c03809ccabd
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/IvySftpModule.groovy
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server.sftp
+
+import org.gradle.test.fixtures.file.TestFile
+import org.gradle.test.fixtures.ivy.IvyDescriptor
+import org.gradle.test.fixtures.ivy.IvyFileModule
+import org.gradle.test.fixtures.ivy.IvyModule
+import org.gradle.test.fixtures.ivy.RemoteIvyModule
+
+class IvySftpModule implements RemoteIvyModule {
+
+    public final IvySftpRepository repository
+    private SFTPServer server
+    private IvyFileModule backingModule
+    
+    IvySftpModule(IvySftpRepository repository, SFTPServer server, IvyFileModule backingModule) {
+        this.repository = repository
+        this.server = server
+        this.backingModule = backingModule
+    }
+
+    TestFile getIvyFile() {
+        return backingModule.ivyFile
+    }
+
+    TestFile getJarFile() {
+        return backingModule.jarFile
+    }
+
+    IvyModule withNoMetaData() {
+        return backingModule.withNoMetaData()
+    }
+
+    IvyModule withStatus(String status) {
+        return backingModule.withStatus(status)
+    }
+
+    IvyModule dependsOn(String organisation, String module, String revision) {
+        return backingModule.dependsOn(organisation, module, revision)
+    }
+
+    IvyModule extendsFrom(Map<String, ?> attributes) {
+        return backingModule.extendsFrom(attributes)
+    }
+
+    IvyModule dependsOn(Map<String, ?> attributes) {
+        return backingModule.dependsOn(attributes)
+    }
+
+    IvyModule artifact(Map<String, ?> options) {
+        return backingModule.artifact(options)
+    }
+
+    IvyModule undeclaredArtifact(Map<String, ?> options) {
+        return backingModule.undeclaredArtifact(options)
+    }
+
+    IvyModule withXml(Closure action) {
+        return backingModule.withXml(action)
+    }
+
+    IvyModule configuration(String name) {
+        return backingModule.configuration(name)
+    }
+
+    IvyModule configuration(Map<String, ?> options, String name) {
+        return backingModule.configuration(options, name)
+    }
+
+    IvyModule publishWithChangedContent() {
+        return backingModule.publishWithChangedContent()
+    }
+
+    IvyModule publish() {
+        return backingModule.publish()
+    }
+
+    IvyDescriptor getParsedIvy() {
+        return backingModule.parsedIvy
+    }
+
+    void assertIvyAndJarFilePublished() {
+        backingModule.assertIvyAndJarFilePublished()
+    }
+
+    String getOrganisation() {
+        return backingModule.organisation
+    }
+
+    String getModule() {
+        return backingModule.module
+    }
+
+    String getRevision() {
+        return backingModule.revision
+    }
+
+    SftpResource getIvy() {
+        return new SftpResource(server, ivyFile)
+    }
+
+    SftpResource getJar() {
+        return new SftpResource(server, jarFile)
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/IvySftpRepository.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/IvySftpRepository.groovy
new file mode 100644
index 000000000000..6c8a70aaebe4
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/IvySftpRepository.groovy
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server.sftp
+
+import org.gradle.test.fixtures.ivy.IvyFileRepository
+import org.gradle.test.fixtures.ivy.RemoteIvyRepository
+
+class IvySftpRepository implements RemoteIvyRepository {
+
+    private final SFTPServer server
+    private final IvyFileRepository backingRepository
+    private final String contextPath
+
+    IvySftpRepository(SFTPServer server, String contextPath, boolean m2Compatible = false, String dirPattern = null, String ivyFilePattern = null, String artifactFilePattern = null) {
+        if (!contextPath.startsWith("/")) {
+            throw new IllegalArgumentException("Context path must start with '/'")
+        }
+        this.contextPath = contextPath
+        this.server = server
+        this.backingRepository = new IvyFileRepository(server.file(contextPath.substring(1)), m2Compatible, dirPattern, ivyFilePattern, artifactFilePattern)
+    }
+
+    URI getUri() {
+        return new URI("${serverUri}${contextPath}")
+    }
+
+    URI getServerUri() {
+        server.uri
+    }
+
+    String getIvyPattern() {
+        return "$uri/${backingRepository.baseIvyPattern}"
+    }
+
+    String getArtifactPattern() {
+        return "$uri/${backingRepository.baseArtifactPattern}"
+    }
+
+    String getBaseIvyPattern() {
+        return backingRepository.baseIvyPattern
+    }
+
+    String getBaseArtifactPattern() {
+        return backingRepository.baseArtifactPattern
+    }
+
+    void expectDirectoryList(String organisation, String module, String revision) {
+        server.expectDirectoryList("$contextPath/$organisation/$module/$revision")
+    }
+
+    void expectDirectoryList(String organisation, String module) {
+        def path = "$contextPath/$organisation/$module/"
+        server.expectStat(path)
+        server.expectDirectoryList(path)
+    }
+
+    IvySftpModule module(String organisation, String module, Object revision = "1.0") {
+        return new IvySftpModule(this, server, backingRepository.module(organisation, module, revision))
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/MavenSftpModule.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/MavenSftpModule.groovy
new file mode 100644
index 000000000000..4f7852a13fa8
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/MavenSftpModule.groovy
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server.sftp
+
+import org.gradle.test.fixtures.file.TestFile
+import org.gradle.test.fixtures.maven.MavenFileModule
+import org.gradle.test.fixtures.maven.MavenMetaData
+import org.gradle.test.fixtures.maven.MavenModule
+import org.gradle.test.fixtures.maven.MavenPom
+
+class MavenSftpModule implements MavenModule {
+    MavenFileModule backingModule
+    SFTPServer server
+
+    MavenSftpModule(SFTPServer server, MavenFileModule backingModule) {
+        this.server = server
+        this.backingModule = backingModule
+    }
+
+    MavenModule publish() {
+        backingModule.publish()
+    }
+
+    MavenModule publishPom() {
+        backingModule.publishPom()
+    }
+
+    MavenModule publishWithChangedContent() {
+        backingModule.publishWithChangedContent()
+    }
+
+    MavenModule withNonUniqueSnapshots() {
+        backingModule.withNonUniqueSnapshots()
+    }
+
+    MavenModule parent(String group, String artifactId, String version) {
+        backingModule.parent(group, artifactId, version)
+    }
+
+    MavenModule dependsOn(String group, String artifactId, String version) {
+        backingModule.dependsOn(group, artifactId, version)
+    }
+
+    MavenModule dependsOn(String group, String artifactId, String version, String type) {
+        backingModule.dependsOn(group, artifactId, version, type)
+    }
+
+    MavenModule hasPackaging(String packaging) {
+        backingModule.hasPackaging(packaging)
+    }
+
+    MavenModule hasType(String type) {
+        backingModule.hasPackaging(type)
+    }
+
+    TestFile getPomFile() {
+        backingModule.getPomFile()
+    }
+
+    TestFile getArtifactFile() {
+        backingModule.getArtifactFile()
+    }
+
+    TestFile getMetaDataFile() {
+        backingModule.getMetaDataFile()
+    }
+
+    MavenPom getParsedPom() {
+        backingModule.getParsedPom()
+    }
+
+    MavenMetaData getRootMetaData() {
+        backingModule.getRootMetaData()
+    }
+
+    SftpResource getPom() {
+        new SftpResource(server, pomFile)
+    }
+
+    SftpResource getArtifact() {
+        new SftpResource(server, artifactFile)
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/MavenSftpRepository.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/MavenSftpRepository.groovy
new file mode 100644
index 000000000000..0c2ce784f829
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/MavenSftpRepository.groovy
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server.sftp
+
+import org.gradle.test.fixtures.maven.MavenFileRepository
+import org.gradle.test.fixtures.maven.MavenRepository
+
+class MavenSftpRepository implements MavenRepository {
+    private final SFTPServer server
+    private final MavenFileRepository backingRepository
+    private final String contextPath
+
+    MavenSftpRepository(SFTPServer server, String contextPath) {
+        this.server = server
+        this.backingRepository = new MavenFileRepository(server.file(contextPath.substring(1)))
+        this.contextPath = contextPath
+    }
+
+    URI getUri() {
+        new URI("sftp://${server.hostAddress}:${server.port}${contextPath}")
+    }
+
+    MavenSftpModule module(String organisation, String module, Object revision = "1.0") {
+        new MavenSftpModule(server, backingRepository.module(organisation, module, revision))
+    }
+}
\ No newline at end of file
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SFTPServer.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SFTPServer.groovy
index 65d22a8c3834..349ed8e161cd 100644
--- a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SFTPServer.groovy
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SFTPServer.groovy
@@ -17,51 +17,81 @@
 package org.gradle.test.fixtures.server.sftp
 
 import org.apache.commons.io.FileUtils
+import org.apache.commons.io.FilenameUtils
 import org.apache.sshd.SshServer
 import org.apache.sshd.common.NamedFactory
 import org.apache.sshd.common.Session
-import org.apache.sshd.server.*
+import org.apache.sshd.common.file.FileSystemView
+import org.apache.sshd.common.file.virtualfs.VirtualFileSystemFactory
+import org.apache.sshd.common.file.virtualfs.VirtualFileSystemView
+import org.apache.sshd.common.util.Buffer
+import org.apache.sshd.server.Command
+import org.apache.sshd.server.PasswordAuthenticator
+import org.apache.sshd.server.PublickeyAuthenticator
 import org.apache.sshd.server.command.ScpCommandFactory
-import org.apache.sshd.server.filesystem.NativeFileSystemFactory
-import org.apache.sshd.server.filesystem.NativeSshFile
 import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
 import org.apache.sshd.server.session.ServerSession
 import org.apache.sshd.server.sftp.SftpSubsystem
 import org.gradle.test.fixtures.file.TestDirectoryProvider
 import org.gradle.test.fixtures.file.TestFile
+import org.gradle.test.fixtures.ivy.RemoteIvyRepository
+import org.gradle.test.fixtures.server.ExpectOne
+import org.gradle.test.fixtures.server.RepositoryServer
+import org.gradle.test.fixtures.server.ServerExpectation
+import org.gradle.test.fixtures.server.ServerWithExpectations
 import org.gradle.util.AvailablePortFinder
-import org.junit.rules.ExternalResource
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 import java.security.PublicKey
 
-class SFTPServer extends ExternalResource {
-    final String hostAddress;
+class SFTPServer extends ServerWithExpectations implements RepositoryServer {
+
+    private final static Logger logger = LoggerFactory.getLogger(SFTPServer)
+    final String hostAddress
     int port
 
     private final TestDirectoryProvider testDirectoryProvider
-    private TestFile baseDir
     private TestFile configDir
+    private SshServer sshd
 
-    private SshServer sshd;
-
-    def fileRequests = [] as Set
+    TestFile baseDir
+    Map<Integer, String> handleCreatedByRequest = [:]
+    Map<String, Integer> openingRequestIdForPath = [:]
+    List<SftpExpectation> expectations = []
 
     public SFTPServer(TestDirectoryProvider testDirectoryProvider) {
         this.testDirectoryProvider = testDirectoryProvider;
-        def portFinder = AvailablePortFinder.createPrivate()
-        port = portFinder.nextAvailable
         this.hostAddress = "127.0.0.1"
     }
 
+    protected Logger getLogger() {
+        logger
+    }
+
+    @Override
+    void resetExpectations() {
+        try {
+            super.resetExpectations()
+        } finally {
+            handleCreatedByRequest.clear()
+            openingRequestIdForPath.clear()
+            allowInit()
+        }
+    }
+
     protected void before() throws Throwable {
         baseDir = testDirectoryProvider.getTestDirectory().createDir("sshd/files")
         configDir = testDirectoryProvider.getTestDirectory().createDir("sshd/config")
 
-        sshd = setupConfiguredTestSshd();
-        sshd.start();
+        def portFinder = AvailablePortFinder.createPrivate()
+        port = portFinder.nextAvailable
+        sshd = setupConfiguredTestSshd()
+        sshd.start()
+        allowInit()
     }
 
-    protected void after() {
+    public void stop() {
         sshd?.stop()
     }
 
@@ -72,12 +102,12 @@ class SFTPServer extends ExternalResource {
 
         SshServer sshServer = SshServer.setUpDefaultServer();
         sshServer.setPort(port);
-        sshServer.setFileSystemFactory(new TestNativeFileSystemFactory(baseDir.absolutePath, new FileRequestLogger() {
-            void logRequest(String message) {
-                fileRequests << message;
+        sshServer.setFileSystemFactory(new TestVirtualFileSystemFactory());
+        sshServer.setSubsystemFactories(Arrays.<NamedFactory<Command>> asList(new SftpSubsystem.Factory() {
+            Command create() {
+                new TestSftpSubsystem()
             }
         }));
-        sshServer.setSubsystemFactories(Arrays.<NamedFactory<Command>> asList(new SftpSubsystem.Factory()));
         sshServer.setCommandFactory(new ScpCommandFactory());
         sshServer.setKeyPairProvider(new SimpleGeneratorHostKeyProvider("${configDir}/test-dsa.key"));
         sshServer.setPasswordAuthenticator(new DummyPasswordAuthenticator());
@@ -97,111 +127,327 @@ class SFTPServer extends ExternalResource {
         new TestFile(new File(baseDir, expectedPath))
     }
 
-    public Set<String> getFileRequests() {
-        return fileRequests
+    URI getUri() {
+        return new URI("sftp://${hostAddress}:${port}")
     }
 
-    public void clearRequests() {
-        fileRequests.clear();
+    void allowInit() {
+        expectations << new SftpAllow(SftpSubsystem.SSH_FXP_INIT)
     }
 
-    static class DummyPasswordAuthenticator implements PasswordAuthenticator {
-        // every combination where username == password is accepted
-        boolean authenticate(String username, String password, ServerSession session) {
-            return username && password && username == password;
-        }
+    void expectLstat(String path) {
+        expectations << new SftpExpectOnePath(SftpSubsystem.SSH_FXP_LSTAT, "LSTAT", path)
     }
 
-    static abstract class FileRequestLogger {
-        abstract void logRequest(String message)
+    void expectMetadataRetrieve(String path) {
+        expectLstat(path)
     }
 
-    static class TestNativeFileSystemFactory extends NativeFileSystemFactory {
+    void expectOpen(String path) {
+        expectations << new SftpExpectOneOpen(SftpSubsystem.SSH_FXP_OPEN, "OPEN", path)
+    }
 
-        String rootPath
+    void allowRead(String path) {
+        expectations << new SftpAllowHandle(SftpSubsystem.SSH_FXP_READ, path)
+    }
 
-        List<FileRequestLogger> logger
+    void expectClose(String path) {
+        expectations << new SftpExpectOneHandle(SftpSubsystem.SSH_FXP_CLOSE, "CLOSE", path)
+    }
+
+    void expectFileDownload(String path) {
+        expectOpen(path)
+        allowRead(path)
+        expectClose(path)
+    }
+
+    void expectFileUpload(String path) {
+        expectLstat(FilenameUtils.getFullPathNoEndSeparator(path))
+        expectOpen(path)
+        allowWrite(path)
+        expectClose(path)
+    }
+
+    void expectRealpath(String path) {
+        expectations << new SftpExpectOnePath(SftpSubsystem.SSH_FXP_REALPATH, "REALPATH", path)
+    }
+
+    void expectStat(String path) {
+        expectations << new SftpExpectOnePath(SftpSubsystem.SSH_FXP_STAT, "STAT", path)
+    }
 
-        public TestNativeFileSystemFactory(String rootPath, FileRequestLogger... logger) {
-            this.rootPath = rootPath
-            this.logger = Arrays.asList(logger)
+    void expectMkdir(String path) {
+        expectations << new SftpExpectOnePath(SftpSubsystem.SSH_FXP_MKDIR, "MKDIR", path)
+    }
+
+    void expectOpendir(String path) {
+        expectations << new SftpExpectOneOpen(SftpSubsystem.SSH_FXP_OPENDIR, "OPENDIR", path)
+    }
+
+    void allowReaddir(String path) {
+        expectations << new SftpAllowHandle(SftpSubsystem.SSH_FXP_READDIR, path)
+    }
+
+    void allowWrite(String path) {
+        expectations << new SftpAllowHandle(SftpSubsystem.SSH_FXP_WRITE, path)
+    }
+
+    void expectDirectoryList(String path) {
+        expectOpendir(path)
+        allowReaddir(path)
+        expectClose(path)
+    }
+
+    void expectLstatBroken(String path) {
+        expectations << new SftpExpectOnePath(SftpSubsystem.SSH_FXP_LSTAT, "LSTAT", path, true)
+    }
+
+    void expectMkdirBroken(String path) {
+        expectations << new SftpExpectOnePath(SftpSubsystem.SSH_FXP_MKDIR, "MKDIR", path, true)
+    }
+
+    void expectMetadataRetrieveBroken(String path) {
+        expectLstatBroken(path)
+    }
+
+    void expectWriteBroken(String path) {
+        expectations << new SftpExpectOneHandle(SftpSubsystem.SSH_FXP_WRITE, "WRITE", path, true)
+    }
+
+    void expectLstatMissing(String path) {
+        expectations << new SftpExpectOnePath(SftpSubsystem.SSH_FXP_LSTAT, "LSTAT", path, false, true)
+    }
+
+    RemoteIvyRepository getRemoteIvyRepo(boolean m2Compatible = false, String dirPattern = null, String ivyFilePattern = null, String artifactFilePattern = null) {
+        new IvySftpRepository(this, '/repo', m2Compatible, dirPattern, ivyFilePattern, artifactFilePattern)
+    }
+
+    RemoteIvyRepository getRemoteIvyRepo(String contextPath) {
+        new IvySftpRepository(this, contextPath, false, null)
+    }
+
+    String getValidCredentials() {
+        return """
+            credentials {
+                username 'sftp'
+                password 'sftp'
+            }
+        """
+    }
+
+    static class DummyPasswordAuthenticator implements PasswordAuthenticator {
+        // every combination where username == password is accepted
+        boolean authenticate(String username, String password, ServerSession session) {
+            return username && password && username == password;
         }
+    }
 
+    class TestVirtualFileSystemFactory extends VirtualFileSystemFactory {
         /**
          * Create the appropriate user file system view.
          */
         public FileSystemView createFileSystemView(Session session) {
-            String userName = session.getUsername();
-            FileSystemView fsView = new TestNativeFileSystemView(rootPath, userName, logger, caseInsensitive);
-            return fsView;
+            return new VirtualFileSystemView(session.getUsername(), baseDir.absolutePath);
         }
     }
 
-    static class TestNativeFileSystemView implements FileSystemView {
-        // the first and the last character will always be '/'
-        // It is always with respect to the root directory.
-        private String currDir;
+    class TestSftpSubsystem extends SftpSubsystem {
+
+        @Override
+        protected void process(Buffer buffer) throws IOException {
+            int originalBufferPosition = buffer.rpos()
+            int length = buffer.getInt()
+            int type = buffer.getByte()
+            int id = buffer.getInt()
+
+            int pos = buffer.rpos()
+            def command = commandMessage(buffer, type)
+            println "Received SFTP command $command"
+            buffer.rpos(pos)
+
+            def matched = expectations.find { it.matches(buffer, type, id) }
+            if (matched) {
+                if (matched.failing) {
+                    sendStatus(id, SSH_FX_FAILURE, "Failure")
+                    buffer.rpos(originalBufferPosition + length)
+                } else if (matched.missing) {
+                    sendStatus(id, SSH_FX_NO_SUCH_FILE, "No such file")
+                    buffer.rpos(originalBufferPosition + length)
+                } else {
+                    buffer.rpos(originalBufferPosition)
+                    super.process(buffer)
+                }
+            } else {
+                onFailure(new AssertionError("Unexpected SFTP command: $command"))
+                sendStatus(id, SSH_FX_FAILURE, "Unexpected command")
+                buffer.rpos(originalBufferPosition + length)
+            }
+        }
 
-        private String userName;
+        @Override
+        protected void sendHandle(int id, String handle) throws IOException {
+            super.sendHandle(id, handle)
+            handleCreatedByRequest[id] = handle
+        }
 
-        private boolean caseInsensitive = false;
+        private String commandMessage(Buffer buffer, int type) {
+            switch (type) {
+                case SSH_FXP_INIT:
+                    return "INIT"
+                case SSH_FXP_LSTAT:
+                    return "LSTAT for ${buffer.getString()}"
+                case SSH_FXP_OPEN:
+                    return "OPEN for ${buffer.getString()}"
+                case SSH_FXP_READ:
+                    return "READ"
+                case SSH_FXP_CLOSE:
+                    return "CLOSE"
+                case SSH_FXP_REALPATH:
+                    return "REALPATH for ${buffer.getString()}"
+                case SSH_FXP_STAT:
+                    return "STAT for ${buffer.getString()}"
+                case SSH_FXP_OPENDIR:
+                    return "OPENDIR for ${buffer.getString()}"
+                case SSH_FXP_READDIR:
+                    return "READDIR for ${buffer.getString()}"
+                case SSH_FXP_MKDIR:
+                    return "MKDIR for ${buffer.getString()}"
+                case SSH_FXP_WRITE:
+                    return "WRITE"
+            }
+            return type;
+        }
+    }
 
-        List<FileRequestLogger> logger
+    static interface SftpExpectation extends ServerExpectation {
+        boolean matches(Buffer buffer, int type, int id)
 
-        /**
-         * Constructor - internal do not use directly, use {@link NativeFileSystemFactory} instead
-         */
-        public TestNativeFileSystemView(String rootpath, String userName, List<FileRequestLogger> requestLoggerList, boolean caseInsensitive) {
-            if (!rootpath) {
-                throw new IllegalArgumentException("rootPath must be set");
-            }
+        boolean isFailing()
+        boolean isMissing()
+    }
 
-            if (!userName) {
-                throw new IllegalArgumentException("user can not be null");
-            }
+    static class SftpExpectOne extends ExpectOne implements SftpExpectation {
 
-            this.logger = requestLoggerList;
-            this.caseInsensitive = caseInsensitive;
+        final int expectedType
+        final String notMetMessage
+        final Closure matcher
+        final boolean failing
+        final boolean missing
 
-            currDir = rootpath;
-            this.userName = userName;
+        SftpExpectOne(int type, String notMetMessage, boolean failing = false, boolean missing = false) {
+            this.expectedType = type
+            this.notMetMessage = "Expected SFTP command not recieved: $notMetMessage"
+            this.matcher = matcher
+            this.failing = failing
+            this.missing = missing
         }
 
-        /**
-         * Get file object.
-         */
-        public SshFile getFile(String file) {
-            return getFile(currDir, file);
+        boolean matches(Buffer buffer, int type, int id) {
+            if (!run && type == expectedType) {
+                int originalBufferPosition = buffer.rpos()
+                run = bufferMatches(buffer, id)
+                buffer.rpos(originalBufferPosition)
+                return run
+            } else {
+                return false
+            }
         }
 
-        public SshFile getFile(SshFile baseDir, String file) {
-            return getFile(baseDir.getAbsolutePath(), file);
+        protected boolean bufferMatches(Buffer buffer, int id) {
+            true
         }
+    }
+
+    static class SftpExpectOnePath extends SftpExpectOne {
 
-        protected SshFile getFile(String dir, String file) {
-            // get actual file object
+        final String path
 
-            String physicalName = NativeSshFile.getPhysicalName("/", dir, file, caseInsensitive);
-            File fileObj = new File(physicalName);
-            logFileRequest(dir, fileObj.absolutePath);
-            // strip the root directory and return
-            String userFileName = physicalName.substring("/".length() - 1);
-            return new NativeSshFile(userFileName, fileObj, userName);
+        SftpExpectOnePath(int type, String commandName, String path, boolean failing = false, boolean missing = false) {
+            super(type, "$commandName for $path", failing, missing)
+            this.path = path
         }
 
-        void logFileRequest(String dir, String file) {
-            //log xml and jar requests only
-            if (file.endsWith("xml") || file.endsWith(".jar")) {
-                String normalizedPath = (file - dir).replaceAll("\\\\", '/') - "/"
-                logger.each {
-                    it.logRequest(normalizedPath)
-                }
+        protected boolean bufferMatches(Buffer buffer, int id) {
+            buffer.getString() == path
+        }
+    }
+
+    class SftpExpectOneOpen extends SftpExpectOnePath {
+
+        SftpExpectOneOpen(int type, String commandName, String path, boolean failing = false) {
+            super(type, commandName, path, failing)
+        }
+
+        protected boolean bufferMatches(Buffer buffer, int id) {
+            def matched = buffer.getString() == path
+            if (matched) {
+                openingRequestIdForPath[path] = id
             }
+            return matched
+        }
+    }
+
+    class SftpExpectOneHandle extends SftpExpectOnePath {
+
+        SftpExpectOneHandle(int type, String commandName, String path, boolean failing = false) {
+            super(type, commandName, path, failing)
+        }
+
+        protected boolean bufferMatches(Buffer buffer, int id) {
+            def handle = buffer.getString()
+            def openingRequestId = openingRequestIdForPath[path]
+            return openingRequestId && handle == handleCreatedByRequest[openingRequestId]
+        }
+    }
+
+    class SftpAllow implements SftpExpectation {
+
+        final boolean failing = false
+        final boolean missing = false
+        final int expectedType
+
+        SftpAllow(int expectedType) {
+            this.expectedType = expectedType
+        }
+
+        boolean matches(Buffer buffer, int type, int id) {
+            return type == expectedType
+        }
+
+        void assertMet() {
+            //can never be not met
         }
     }
 
+    class SftpAllowHandle implements SftpExpectation {
 
+        final int expectedType
+        final boolean failing = false
+        final boolean missing = false
+        final String path
 
+        SftpAllowHandle(int type, String path) {
+            this.expectedType = type
+            this.path = path
+        }
+
+        void assertMet() {
+            //can never be not met
+        }
+
+        boolean matches(Buffer buffer, int type, int id) {
+            if (type == expectedType) {
+                int originalBufferPosition = buffer.rpos()
+                def handle = buffer.getString()
+                def openingRequestId = openingRequestIdForPath[path]
+                def matched = openingRequestId && handle == handleCreatedByRequest[openingRequestId]
+                buffer.rpos(originalBufferPosition)
+                return matched
+            } else {
+                return false
+            }
+        }
+    }
 }
 
 
diff --git a/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SftpResource.groovy b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SftpResource.groovy
new file mode 100644
index 000000000000..80dd09af2b14
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/main/groovy/org/gradle/test/fixtures/server/sftp/SftpResource.groovy
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.test.fixtures.server.sftp
+
+import org.apache.commons.io.FilenameUtils
+import org.gradle.test.fixtures.file.TestFile
+import org.gradle.test.fixtures.resource.RemoteResource
+import org.gradle.util.GFileUtils
+
+class SftpResource implements RemoteResource {
+
+    SFTPServer server
+    TestFile file
+
+    SftpResource(SFTPServer server, TestFile file) {
+        this.server = server
+        this.file = file
+    }
+
+    String getPathOnServer() {
+        return "/${GFileUtils.relativePath(server.baseDir, file)}"
+    }
+
+    URI getUri() {
+        return new URI("${server.uri}${pathOnServer}")
+    }
+
+    void expectLstat() {
+        server.expectLstat(pathOnServer)
+    }
+
+    void expectStat() {
+        server.expectStat(pathOnServer)
+    }
+
+    void expectOpen() {
+        server.expectOpen(pathOnServer)
+    }
+
+    def allowWrite() {
+        server.allowWrite(pathOnServer)
+    }
+
+    void expectClose() {
+        server.expectClose(pathOnServer)
+    }
+
+    void expectFileDownload() {
+        // TODO - should not do this stat request
+        server.expectStat(pathOnServer)
+        server.expectFileDownload(pathOnServer)
+    }
+
+    void expectFileAndSha1Upload() {
+        server.expectFileUpload(pathOnServer)
+        server.expectFileUpload("${pathOnServer}.sha1")
+    }
+
+    void expectMetadataRetrieveBroken() {
+        server.expectMetadataRetrieveBroken(pathOnServer)
+    }
+
+    void expectMetadataRetrieveMissing() {
+        server.expectLstatMissing(pathOnServer)
+    }
+
+    void expectMkdirs() {
+        def directory = FilenameUtils.getFullPathNoEndSeparator(pathOnServer)
+        withEachDirectory { String path ->
+            if (path != directory) {
+                server.expectLstat(path)
+            }
+            server.expectMkdir(path)
+        }
+    }
+
+    void withEachDirectory(Closure action) {
+        def directory = FilenameUtils.getFullPathNoEndSeparator(pathOnServer)
+        directory.tokenize('/').findAll().inject('') { path, token ->
+            def currentPath = "$path/$token"
+            action(currentPath)
+            currentPath
+        }
+    }
+
+    void expectWriteBroken() {
+        server.expectWriteBroken(pathOnServer)
+    }
+
+    void expectDownload() {
+        expectMetadataRetrieve()
+        expectFileDownload()
+    }
+
+    void expectDownloadMissing() {
+        expectMetadataRetrieveMissing()
+    }
+
+    void expectMetadataRetrieve() {
+        expectLstat()
+    }
+
+    void expectDownloadBroken() {
+        expectMetadataRetrieveBroken()
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/jvm/OsXJavaHomeParserTest.groovy b/subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/jvm/OsXJavaHomeParserTest.groovy
new file mode 100644
index 000000000000..dda253c7a6c1
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/jvm/OsXJavaHomeParserTest.groovy
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.integtests.fixtures.jvm
+
+import org.gradle.api.JavaVersion
+import org.gradle.util.VersionNumber
+import spock.lang.Specification
+
+class OsXJavaHomeParserTest extends Specification {
+    def parser = new OsXJavaHomeParser()
+
+    def "parses new format output"() {
+        def output = """Matching Java Virtual Machines (10):
+    1.8.0, x86_64:\t"Java SE 8"\t/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home
+    1.7.0_17, x86_64:\t"Java SE 7"\t/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home
+    1.7.0_07, x86_64:\t"Java SE 7"\t/Library/Java/JavaVirtualMachines/jdk1.7.0_07.jdk/Contents/Home
+    1.7.0_06, x86_64:\t"Java SE 7"\t/Library/Java/JavaVirtualMachines/jdk1.7.0_06.jdk/Contents/Home
+    1.7.0-ea-b223-ea-b223-ea-b223, x86_64:\t"Java SE 7 Developer Preview"\t/Library/Java/JavaVirtualMachines/JDK 1.7.0 Developer Preview.jdk/Contents/Home
+    1.7.0-ea-b223-ea-b223-ea-b223, i386:\t"Java SE 7 Developer Preview"\t/Library/Java/JavaVirtualMachines/JDK 1.7.0 Developer Preview.jdk/Contents/Home
+    1.7.0, x86_64:\t"OpenJDK 7"\t/Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home
+    1.7.0, i386:\t"OpenJDK 7"\t/Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home
+    1.6.0_65-b14-462, x86_64:\t"Java SE 6"\t/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+    1.6.0_65-b14-462, i386:\t"Java SE 6"\t/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home
+
+"""
+
+        expect:
+        def result = parser.parse(new StringReader(output))
+        result.size() == 10
+        result[0].version == parse("1.8.0")
+        result[0].javaVersion == JavaVersion.VERSION_1_8
+        result[0].jdk
+        result[0].arch == JvmInstallation.Arch.x86_64
+        result[0].javaHome == new File("/Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home").canonicalFile
+
+        result[1].version == parse("1.7.0_17")
+        result[1].javaVersion == JavaVersion.VERSION_1_7
+        result[1].javaHome == new File("/Library/Java/JavaVirtualMachines/jdk1.7.0_17.jdk/Contents/Home").canonicalFile
+
+        result[4].version == parse("1.7.0-ea-b223-ea-b223-ea-b223")
+        result[4].javaVersion == JavaVersion.VERSION_1_7
+        result[4].javaHome == new File("/Library/Java/JavaVirtualMachines/JDK 1.7.0 Developer Preview.jdk/Contents/Home").canonicalFile
+
+        result[6].version == parse("1.7.0")
+        result[6].javaVersion == JavaVersion.VERSION_1_7
+        result[6].javaHome == new File("/Library/Java/JavaVirtualMachines/1.7.0.jdk/Contents/Home").canonicalFile
+
+        result[8].version == parse("1.6.0_65-b14-462")
+        result[8].javaVersion == JavaVersion.VERSION_1_6
+        result[8].jdk
+        result[8].arch == JvmInstallation.Arch.x86_64
+        result[8].javaHome == new File("/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home").canonicalFile
+
+        result[9].version == parse("1.6.0_65-b14-462")
+        result[9].javaVersion == JavaVersion.VERSION_1_6
+        result[9].jdk
+        result[9].arch == JvmInstallation.Arch.i386
+        result[9].javaHome == new File("/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home").canonicalFile
+    }
+
+    def "parses old format output"() {
+        def output ="""Matching Java Virtual Machines (2):
+    1.6.0_17 (x86_64):\t/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home
+    1.6.0_17 (i386):\t/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home
+
+"""
+
+        expect:
+        def result = parser.parse(new StringReader(output))
+        result.size() == 2
+        result[0].version == parse("1.6.0_17")
+        result[0].javaVersion == JavaVersion.VERSION_1_6
+        result[0].jdk
+        result[0].arch == JvmInstallation.Arch.x86_64
+        result[0].javaHome == new File("/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home").canonicalFile
+
+        result[1].version == parse("1.6.0_17")
+        result[1].javaVersion == JavaVersion.VERSION_1_6
+        result[1].jdk
+        result[1].arch == JvmInstallation.Arch.i386
+        result[1].javaHome == new File("/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home").canonicalFile
+    }
+
+    def parse(String version) {
+        return VersionNumber.withPatchNumber().parse(version)
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/jvm/UbuntuJvmLocatorTest.groovy b/subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/jvm/UbuntuJvmLocatorTest.groovy
new file mode 100644
index 000000000000..81e9246f0d38
--- /dev/null
+++ b/subprojects/internal-integ-testing/src/test/groovy/org/gradle/integtests/fixtures/jvm/UbuntuJvmLocatorTest.groovy
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.integtests.fixtures.jvm
+
+import org.gradle.api.JavaVersion
+import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
+import org.gradle.util.VersionNumber
+import org.junit.Rule
+import spock.lang.Specification
+
+class UbuntuJvmLocatorTest extends Specification {
+    @Rule TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider()
+    def libDir = tmpDir.file("lib")
+    def locator = new UbuntuJvmLocator(libDir)
+
+    def "finds no JVMs when lib directory does not exist"() {
+        expect:
+        locator.findJvms().empty
+    }
+
+    def "locates JREs installed in lib directory"() {
+        given:
+        jre("java-1.6.0-openjdk-amd64")
+        jre("java-1.6.0-openjdk-i386")
+        jre("java-1.7.0-openjdk-amd64")
+        jre("java-1.7.0-openjdk-i386")
+        libDir.createDir("not-a-jre")
+        libDir.createDir("java-1.5.0-openjdk-amd64")
+
+        expect:
+        def jvms = locator.findJvms()
+        jvms.size() == 4
+        jvms.sort { it.javaHome.name }
+
+        jvms[0].javaVersion == JavaVersion.VERSION_1_6
+        jvms[0].version == VersionNumber.parse("1.6.0")
+        jvms[0].arch == JvmInstallation.Arch.x86_64
+        !jvms[0].jdk
+        jvms[0].javaHome == libDir.file("java-1.6.0-openjdk-amd64")
+
+        jvms[3].javaVersion == JavaVersion.VERSION_1_7
+        jvms[3].version == VersionNumber.parse("1.7.0")
+        jvms[3].arch == JvmInstallation.Arch.i386
+        !jvms[3].jdk
+        jvms[3].javaHome == libDir.file("java-1.7.0-openjdk-i386")
+    }
+
+    def "locates JDKs installed in lib directory"() {
+        given:
+        jre("java-1.6.0-openjdk-amd64")
+        jdk("java-1.7.0-openjdk-amd64")
+        libDir.createDir("not-a-jre")
+        libDir.createDir("java-1.5.0-openjdk-amd64")
+
+        expect:
+        def jvms = locator.findJvms()
+        jvms.size() == 2
+        jvms.sort { it.javaHome.name }
+
+        jvms[0].javaVersion == JavaVersion.VERSION_1_6
+        !jvms[0].jdk
+
+        jvms[1].javaVersion == JavaVersion.VERSION_1_7
+        jvms[1].jdk
+    }
+
+    def jre(String name) {
+        libDir.createFile("${name}/bin/java")
+        libDir.createFile("${name}/jre/bin/java")
+    }
+
+    def jdk(String name) {
+        jre(name)
+        libDir.createFile("${name}/bin/javac")
+    }
+}
diff --git a/subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenFileModuleTest.groovy b/subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenFileModuleTest.groovy
index 278da446c12e..911071111c2a 100644
--- a/subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenFileModuleTest.groovy
+++ b/subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenFileModuleTest.groovy
@@ -16,39 +16,23 @@
 
 package org.gradle.test.fixtures.maven
 
-import org.gradle.api.Project
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.util.TestUtil
+import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
+import org.junit.Rule
 import spock.lang.Specification
 
 class MavenFileModuleTest extends Specification {
-    Project project
+    @Rule TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider()
     TestFile testFile
     MavenModule mavenFileModule
     MavenModule snapshotMavenFileModule
 
     def setup() {
-        project = TestUtil.createRootProject()
-        testFile = new TestFile(project.projectDir, "build/test")
+        testFile = tmpDir.file("file")
         mavenFileModule = new MavenFileModule(testFile, "my-company", "my-artifact", "1.0")
         snapshotMavenFileModule = new MavenFileModule(testFile, "my-company", "my-artifact", "1.0-SNAPSHOT")
     }
 
-    def "Get parent and its POM section"() {
-        when:
-        MavenFileModule parent = mavenFileModule.parent("my-company", "parent", "0.1")
-
-        then:
-        parent != null
-"""
-<parent>
-  <groupId>my-company</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1</version>
-</parent>
-""" == parent.parentPomSection
-    }
-
     def "Add multiple dependencies without type"() {
         when:
         List dependencies = mavenFileModule.dependsOn("dep1", "dep2").dependencies
@@ -129,8 +113,7 @@ class MavenFileModuleTest extends Specification {
 
     def "On publishing SHA1 and MD5 files are created"() {
         given:
-        TestFile pomTestFile = new TestFile(project.projectDir, "build/test/pom.xml")
-        pomTestFile.createFile()
+        TestFile pomTestFile = tmpDir.createFile("build/test/pom.xml")
 
         when:
         mavenFileModule.onPublish(pomTestFile)
diff --git a/subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenLocalModuleTest.groovy b/subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenLocalModuleTest.groovy
index 8abc8e9921f3..5abf5f3aae2b 100644
--- a/subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenLocalModuleTest.groovy
+++ b/subprojects/internal-integ-testing/src/test/groovy/org/gradle/test/fixtures/maven/MavenLocalModuleTest.groovy
@@ -16,39 +16,23 @@
 
 package org.gradle.test.fixtures.maven
 
-import org.gradle.api.Project
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.util.TestUtil
+import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
+import org.junit.Rule
 import spock.lang.Specification
 
 class MavenLocalModuleTest extends Specification {
-    Project project
+    @Rule TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider()
     TestFile testFile
     MavenModule mavenLocalModule
     MavenModule snapshotMavenLocalModule
 
     def setup() {
-        project = TestUtil.createRootProject()
-        testFile = new TestFile(project.projectDir, "build/test")
+        testFile = tmpDir.file("file")
         mavenLocalModule = new MavenLocalModule(testFile, "my-company", "my-artifact", "1.0")
         snapshotMavenLocalModule = new MavenLocalModule(testFile, "my-company", "my-artifact", "1.0-SNAPSHOT")
     }
 
-    def "Get parent and its POM section"() {
-        when:
-        MavenLocalModule parent = mavenLocalModule.parent("my-company", "parent", "0.1")
-
-        then:
-        parent != null
-        """
-<parent>
-  <groupId>my-company</groupId>
-  <artifactId>parent</artifactId>
-  <version>0.1</version>
-</parent>
-""" == parent.parentPomSection
-    }
-
     def "Add multiple dependencies without type"() {
         when:
         List dependencies = mavenLocalModule.dependsOn("dep1", "dep2").dependencies
@@ -119,10 +103,9 @@ class MavenLocalModuleTest extends Specification {
         mavenModule != null
     }
 
-    def "On publishing SHA1 and MD5 files are created"() {
+    def "On publishing SHA1 and MD5 files are not created"() {
         given:
-        TestFile pomTestFile = new TestFile(project.projectDir, "build/test/pom.xml")
-        pomTestFile.createFile()
+        def pomTestFile = tmpDir.createFile("build/test/pom.xml")
 
         when:
         mavenLocalModule.onPublish(pomTestFile)
diff --git a/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/encoding/Identifier.java b/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/encoding/Identifier.java
index a781534aa980..04f3d3bd8c51 100644
--- a/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/encoding/Identifier.java
+++ b/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/encoding/Identifier.java
@@ -18,38 +18,24 @@
 
 import org.gradle.internal.os.OperatingSystem;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class Identifier {
     private static final String PUNCTUATION_CHARS = "-'!@#$%^&*()_+=,.?{}[]<>";
     private static final String NON_ASCII_CHARS = "-√æず∫ʙぴ₦ガき∆ç√∫";
+    private static final String NON_PRECOMPOSED_NON_ASCII = "-√æ∫ʙ₦∆√∫";
     private static final String FILESYSTEM_RESERVED_CHARS = "-./\\?%*:|\"<>";
     private static final String XML_MARKUP_CHARS = "-<with>some<xml-markup/></with>";
 
     private final String suffix;
+    private final String displayName;
 
-    public Identifier(String suffix) {
+    private Identifier(String suffix, String displayName) {
+        this.displayName = displayName;
         this.suffix = suffix == null ? "" : suffix;
     }
 
-    public Identifier withPunctuation() {
-        return new Identifier(suffix + PUNCTUATION_CHARS);
-    }
-
-    public Identifier withNonAscii() {
-        return new Identifier(suffix + NON_ASCII_CHARS);
-    }
-
-    public Identifier withReservedFileSystemChars() {
-        return new Identifier(suffix + FILESYSTEM_RESERVED_CHARS);
-    }
-
-    public Identifier withMarkup() {
-        return new Identifier(suffix + XML_MARKUP_CHARS);
-    }
-
-    public Identifier withWhiteSpace() {
-        return new Identifier(suffix + " with white space");
-    }
-
     public Identifier safeForFileName() {
         return without(getUnsupportedFileNameCharacters());
     }
@@ -59,7 +45,7 @@ public Identifier without(String toRemove) {
         for (char c : toRemove.toCharArray()) {
             newSuffix = newSuffix.replace(c, '-');
         }
-        return new Identifier(newSuffix);
+        return new Identifier(newSuffix, displayName);
     }
 
     private static String getUnsupportedFileNameCharacters() {
@@ -73,28 +59,40 @@ public String decorate(String prefix) {
         return prefix + suffix;
     }
 
+    public String getDisplayName() {
+        return displayName;
+    }
+
     @Override
     public String toString() {
-        return suffix;
+        return displayName;
+    }
+
+    public static List<Identifier> getAll() {
+        return Arrays.asList(getPunctuation(), getNonAscii(), getFileSystemReserved(), getXmlMarkup(), getWhiteSpace());
     }
 
     public static Identifier getPunctuation() {
-        return new Identifier("").withPunctuation();
+        return new Identifier(PUNCTUATION_CHARS, "punctuation");
     }
 
     public static Identifier getNonAscii() {
-        return new Identifier("").withNonAscii();
+        if (OperatingSystem.current().isMacOsX()) {
+            // The hfs+ file system stores file names in decomposed form. Don't use precomposed characters on OS X, as way too few things normalise text correctly
+            return new Identifier(NON_PRECOMPOSED_NON_ASCII, "non-ascii");
+        }
+        return new Identifier(NON_ASCII_CHARS, "non-ascii");
     }
 
     public static Identifier getFileSystemReserved() {
-        return new Identifier("").withReservedFileSystemChars();
+        return new Identifier(FILESYSTEM_RESERVED_CHARS, "filesystem");
     }
 
     public static Identifier getXmlMarkup() {
-        return new Identifier("").withMarkup();
+        return new Identifier(XML_MARKUP_CHARS, "xml markup");
     }
 
     public static Identifier getWhiteSpace() {
-        return new Identifier("").withWhiteSpace();
+        return new Identifier(" with white space", "whitespace");
     }
 }
diff --git a/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestFile.java b/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestFile.java
index a144917f4539..a55e4ac4af00 100644
--- a/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestFile.java
+++ b/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestFile.java
@@ -24,7 +24,7 @@
 import org.apache.tools.ant.taskdefs.Zip;
 import org.apache.tools.ant.types.EnumeratedAttribute;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
-import org.gradle.internal.nativeplatform.filesystem.*;
+import org.gradle.internal.nativeplatform.filesystem.FileSystem;
 import org.gradle.internal.nativeplatform.services.NativeServices;
 import org.hamcrest.Matcher;
 
@@ -357,11 +357,7 @@ public void createLink(File target) {
     }
 
     public void createLink(String target) {
-        try {
-            NativeServices.getInstance().get(FileSystem.class).createSymbolicLink(this, new File(target));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        NativeServices.getInstance().get(FileSystem.class).createSymbolicLink(this, new File(target));
     }
 
     public String readLink() {
diff --git a/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestNameTestDirectoryProvider.java b/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestNameTestDirectoryProvider.java
index 0209421afdb2..3b2346d05870 100644
--- a/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestNameTestDirectoryProvider.java
+++ b/subprojects/internal-testing/src/main/groovy/org/gradle/test/fixtures/file/TestNameTestDirectoryProvider.java
@@ -79,7 +79,7 @@ private void init(String methodName, String className) {
             methodName = getClass().getSimpleName();
         }
         if (prefix == null) {
-            String safeMethodName = methodName.replaceAll("\\s", "_").replace(File.pathSeparator, "_").replace(":", "_");
+            String safeMethodName = methodName.replaceAll("\\s", "_").replace(File.pathSeparator, "_").replace(":", "_").replace('"', '_');
             if (safeMethodName.length() > 64) {
                 safeMethodName = safeMethodName.substring(0, 32) + "..." + safeMethodName.substring(safeMethodName.length() - 32);
             }
diff --git a/subprojects/internal-testing/src/main/groovy/org/gradle/util/Requires.groovy b/subprojects/internal-testing/src/main/groovy/org/gradle/util/Requires.groovy
index 35d7f3681f1c..9c9045dcb478 100644
--- a/subprojects/internal-testing/src/main/groovy/org/gradle/util/Requires.groovy
+++ b/subprojects/internal-testing/src/main/groovy/org/gradle/util/Requires.groovy
@@ -16,6 +16,7 @@
 package org.gradle.util
 
 import java.lang.annotation.ElementType
+import java.lang.annotation.Inherited
 import java.lang.annotation.Target
 import java.lang.annotation.RetentionPolicy
 import java.lang.annotation.Retention
@@ -24,8 +25,8 @@ import org.spockframework.runtime.extension.ExtensionAnnotation
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target([ElementType.METHOD, ElementType.TYPE])
+@Inherited
 @ExtensionAnnotation(TestPreconditionExtension.class)
 public @interface Requires {
     TestPrecondition[] value()
 }
-
diff --git a/subprojects/internal-testing/src/main/groovy/org/gradle/util/TestPrecondition.groovy b/subprojects/internal-testing/src/main/groovy/org/gradle/util/TestPrecondition.groovy
index 98367f6674cb..9f791a41db9b 100755
--- a/subprojects/internal-testing/src/main/groovy/org/gradle/util/TestPrecondition.groovy
+++ b/subprojects/internal-testing/src/main/groovy/org/gradle/util/TestPrecondition.groovy
@@ -102,7 +102,7 @@ enum TestPrecondition {
     }),
     ONLINE({
         try {
-            new URL("http://google.com").openConnection().openStream()
+            new URL("http://google.com").openConnection().getInputStream().close()
             true
         } catch (IOException) {
             false
diff --git a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/AbstractIvyPublishIntegTest.groovy b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/AbstractIvyPublishIntegTest.groovy
index b55f53ba05ae..7dd03eedf890 100644
--- a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/AbstractIvyPublishIntegTest.groovy
+++ b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/AbstractIvyPublishIntegTest.groovy
@@ -31,7 +31,6 @@ class AbstractIvyPublishIntegTest extends AbstractIntegrationSpec {
 
     private def doResolveArtifacts(def dependency) {
         // Replace the existing buildfile with one for resolving the published module
-        // TODO:DAZ Use a separate directory for resolving
         settingsFile.text = "rootProject.name = 'resolve'"
         buildFile.text = """
             configurations {
diff --git a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishHttpIntegTest.groovy b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishHttpIntegTest.groovy
index 4d2bc24b1d09..37d0e324ece6 100644
--- a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishHttpIntegTest.groovy
+++ b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishHttpIntegTest.groovy
@@ -20,8 +20,8 @@ import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
 import org.gradle.internal.jvm.Jvm
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.ivy.IvyHttpModule
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
+import org.gradle.test.fixtures.server.http.IvyHttpModule
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.gradle.util.GradleVersion
 import org.hamcrest.Matchers
diff --git a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishIdentifierValidationIntegTest.groovy b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishIdentifierValidationIntegTest.groovy
index edafd596f053..2dd476beb1dc 100644
--- a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishIdentifierValidationIntegTest.groovy
+++ b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishIdentifierValidationIntegTest.groovy
@@ -21,7 +21,7 @@ import spock.lang.Unroll
 class IvyPublishIdentifierValidationIntegTest extends AbstractIvyPublishIntegTest {
 
     @Unroll
-    def "can publish with project coordinates containing #title characters"() {
+    def "can publish with project coordinates containing #identifier characters"() {
         given:
         file("content-file") << "some content"
         def organisation = identifier.safeForFileName().decorate("org")
@@ -65,16 +65,11 @@ class IvyPublishIdentifierValidationIntegTest extends AbstractIvyPublishIntegTes
         resolveArtifacts(module) == [moduleName + '-' + version + '.jar']
 
         where:
-        title        | identifier
-        "punctuation"| Identifier.punctuation
-        "non-ascii"  | Identifier.nonAscii
-        "whitespace" | Identifier.whiteSpace
-        "filesystem" | Identifier.fileSystemReserved
-        "xml markup" | Identifier.xmlMarkup
+        identifier << Identifier.all
     }
 
     @Unroll
-    def "can publish artifacts with attributes containing #title characters"() {
+    def "can publish artifacts with attributes containing #identifier characters"() {
         given:
         file("content-file") << "some content"
 
@@ -124,12 +119,7 @@ class IvyPublishIdentifierValidationIntegTest extends AbstractIvyPublishIntegTes
         resolveArtifacts(module, conf) == ["${artifact}-${version}-${classifier}.${extension}"]
 
         where:
-        title        | identifier
-        "punctuation"| Identifier.punctuation
-        "non-ascii"  | Identifier.nonAscii
-        "whitespace" | Identifier.whiteSpace
-        "filesystem" | Identifier.fileSystemReserved
-        "xml markup" | Identifier.xmlMarkup
+        identifier << Identifier.all
     }
 
     def "fails with reasonable error message for invalid identifier value"() {
diff --git a/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishSftpIntegrationTest.groovy b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishSftpIntegrationTest.groovy
new file mode 100644
index 000000000000..67740909abe5
--- /dev/null
+++ b/subprojects/ivy/src/integTest/groovy/org/gradle/api/publish/ivy/IvyPublishSftpIntegrationTest.groovy
@@ -0,0 +1,204 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.publish.ivy
+
+import org.gradle.test.fixtures.server.sftp.IvySftpRepository
+import org.gradle.test.fixtures.server.sftp.SFTPServer
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
+import org.junit.Rule
+import spock.lang.Unroll
+
+@Requires(TestPrecondition.JDK6_OR_LATER)
+@Unroll
+class IvyPublishSftpIntegrationTest extends AbstractIvyPublishIntegTest {
+
+    @Rule
+    final SFTPServer server = new SFTPServer(this)
+
+    IvySftpRepository getIvySftpRepo(boolean m2Compatible = false, String dirPattern = null) {
+        new IvySftpRepository(server, '/repo', m2Compatible, dirPattern)
+    }
+
+    private void buildAndSettingsFilesForPublishing() {
+        settingsFile << 'rootProject.name = "publish"'
+        buildFile << """
+            apply plugin: 'java'
+            apply plugin: 'ivy-publish'
+
+            version = '2'
+            group = 'org.group.name'
+
+            publishing {
+                repositories {
+                    ivy {
+                        url "${ivySftpRepo.uri}"
+                        credentials {
+                            username 'sftp'
+                            password 'sftp'
+                        }
+                    }
+                }
+                publications {
+                    ivy(IvyPublication) {
+                        from components.java
+                    }
+                }
+            }
+        """
+    }
+
+    def "can publish to a SFTP repository with layout #layout"() {
+        given:
+        def ivySftpRepo = getIvySftpRepo(m2Compatible)
+        def module = ivySftpRepo.module("org.group.name", "publish", "2")
+
+        settingsFile << 'rootProject.name = "publish"'
+        buildFile << """
+            apply plugin: 'java'
+            apply plugin: 'ivy-publish'
+
+            version = '2'
+            group = 'org.group.name'
+
+            publishing {
+                repositories {
+                    ivy {
+                        url "${ivySftpRepo.uri}"
+                        credentials {
+                            username 'sftp'
+                            password 'sftp'
+                        }
+                        layout "$layout"
+                    }
+                }
+                publications {
+                    ivy(IvyPublication) {
+                        from components.java
+                    }
+                }
+            }
+        """
+
+        when:
+        module.jar.expectMkdirs()
+        module.jar.expectFileAndSha1Upload()
+        module.ivy.expectFileAndSha1Upload()
+
+        then:
+        succeeds 'publish'
+
+        module.assertIvyAndJarFilePublished()
+        module.jarFile.assertIsCopyOf(file('build/libs/publish-2.jar'))
+
+        where:
+        layout   | m2Compatible
+        'gradle' | false
+        'maven'  | true
+    }
+
+    def "can publish to a SFTP repository with pattern layout and m2Compatible #m2Compatible"() {
+        given:
+        def ivySftpRepo = getIvySftpRepo(m2Compatible, "[module]/[organisation]/[revision]")
+        def module = ivySftpRepo.module("org.group.name", "publish", "2")
+
+        settingsFile << 'rootProject.name = "publish"'
+        buildFile << """
+            apply plugin: 'java'
+            apply plugin: 'ivy-publish'
+
+            version = '2'
+            group = 'org.group.name'
+
+            publishing {
+                repositories {
+                    ivy {
+                        url "${ivySftpRepo.uri}"
+                        credentials {
+                            username 'sftp'
+                            password 'sftp'
+                        }
+                        layout "pattern", {
+                            artifact "${ivySftpRepo.baseArtifactPattern}"
+                            ivy "${ivySftpRepo.baseIvyPattern}"
+                            m2compatible = $m2Compatible
+                        }
+                    }
+                }
+                publications {
+                    ivy(IvyPublication) {
+                        from components.java
+                    }
+                }
+            }
+        """
+
+        when:
+        module.jar.expectMkdirs()
+        module.jar.expectFileAndSha1Upload()
+        module.ivy.expectFileAndSha1Upload()
+
+        then:
+        succeeds 'publish'
+
+        module.assertIvyAndJarFilePublished()
+        module.jarFile.assertIsCopyOf(file('build/libs/publish-2.jar'))
+
+        where:
+        m2Compatible << [true, false]
+    }
+
+    def "publishing to a SFTP repo when directory creation fails"() {
+        given:
+        buildAndSettingsFilesForPublishing()
+
+        when:
+        def directory = '/repo/org.group.name/publish/2'
+        directory.tokenize('/').findAll().inject('') { path, token ->
+            def currentPath = "$path/$token"
+            server.expectLstat(currentPath)
+            currentPath
+        }
+        server.expectMkdirBroken('/repo')
+
+        then:
+        fails 'publish'
+        failure.assertHasDescription("Execution failed for task ':publishIvyPublicationToIvyRepository'.")
+                .assertHasCause("Failed to publish publication 'ivy' to repository 'ivy'")
+                .assertHasCause("Could not create resource 'sftp://$ivySftpRepo.uri.host:$ivySftpRepo.uri.port/repo'.")
+    }
+
+    def "publishing to a SFTP repo when file uploading fails"() {
+        given:
+        buildAndSettingsFilesForPublishing()
+        def module = ivySftpRepo.module('org.group.name', 'publish', '2')
+
+        when:
+        server.expectLstat('/repo/org.group.name/publish/2')
+        module.jar.expectMkdirs()
+        module.jar.expectOpen()
+        module.jar.expectWriteBroken()
+        // TODO - should not need this request, should be CLOSE instead
+        module.jar.expectStat()
+
+        then:
+        fails 'publish'
+        failure.assertHasDescription("Execution failed for task ':publishIvyPublicationToIvyRepository'.")
+                .assertHasCause("Failed to publish publication 'ivy' to repository 'ivy'")
+                .assertHasCause("Could not write to resource 'sftp://${ivySftpRepo.uri.host}:${ivySftpRepo.uri.port}${module.jar.pathOnServer}'.")
+    }
+}
diff --git a/subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyHttpPublishIntegrationTest.groovy b/subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyHttpPublishIntegrationTest.groovy
index d77bb23e7357..64f22dd3a143 100644
--- a/subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyHttpPublishIntegrationTest.groovy
+++ b/subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyHttpPublishIntegrationTest.groovy
@@ -19,12 +19,12 @@ package org.gradle.integtests.publish.ivy
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
+import org.gradle.internal.jvm.Jvm
 import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.ivy.IvyHttpModule
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
+import org.gradle.test.fixtures.server.http.IvyHttpModule
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.gradle.util.GradleVersion
-import org.gradle.util.Jvm
 import org.hamcrest.Matchers
 import org.junit.Rule
 import org.mortbay.jetty.HttpStatus
diff --git a/subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyUrlResolverPublishIntegrationTest.groovy b/subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyUrlResolverPublishIntegrationTest.groovy
index f162e419ac1a..45f247487e62 100644
--- a/subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyUrlResolverPublishIntegrationTest.groovy
+++ b/subprojects/ivy/src/integTest/groovy/org/gradle/integtests/publish/ivy/IvyUrlResolverPublishIntegrationTest.groovy
@@ -17,8 +17,8 @@ package org.gradle.integtests.publish.ivy
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.integtests.fixtures.executer.ProgressLoggingFixture
-import org.gradle.test.fixtures.ivy.IvyHttpModule
-import org.gradle.test.fixtures.ivy.IvyHttpRepository
+import org.gradle.test.fixtures.server.http.IvyHttpModule
+import org.gradle.test.fixtures.server.http.IvyHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.junit.Rule
 
diff --git a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/IvyPublishServices.java b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/IvyPublishServices.java
new file mode 100644
index 000000000000..154f1e1ae84f
--- /dev/null
+++ b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/IvyPublishServices.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.publish.ivy.internal;
+
+import org.gradle.api.internal.artifacts.ivyservice.IvyContextManager;
+import org.gradle.api.publish.ivy.internal.publisher.ContextualizingIvyPublisher;
+import org.gradle.api.publish.ivy.internal.publisher.DependencyResolverIvyPublisher;
+import org.gradle.api.publish.ivy.internal.publisher.IvyPublisher;
+import org.gradle.api.publish.ivy.internal.publisher.ValidatingIvyPublisher;
+import org.gradle.internal.service.ServiceRegistration;
+import org.gradle.internal.service.scopes.PluginServiceRegistry;
+
+public class IvyPublishServices implements PluginServiceRegistry {
+    public void registerGlobalServices(ServiceRegistration registration) {
+        registration.addProvider(new GlobalServices());
+    }
+
+    public void registerBuildServices(ServiceRegistration registration) {
+    }
+
+    public void registerProjectServices(ServiceRegistration registration) {
+    }
+
+    private static class GlobalServices {
+        IvyPublisher createIvyPublisher(IvyContextManager ivyContextManager) {
+            IvyPublisher publisher = new DependencyResolverIvyPublisher();
+            publisher = new ValidatingIvyPublisher(publisher);
+            return new ContextualizingIvyPublisher(publisher, ivyContextManager);
+        }
+    }
+}
diff --git a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/artifact/IvyArtifactNotationParserFactory.java b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/artifact/IvyArtifactNotationParserFactory.java
index b007992d7b95..5866aa47e5a9 100644
--- a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/artifact/IvyArtifactNotationParserFactory.java
+++ b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/internal/artifact/IvyArtifactNotationParserFactory.java
@@ -76,7 +76,6 @@ private DefaultIvyArtifact createDefaultIvyArtifact(File file, String extension,
                 DefaultIvyArtifact.class,
                 file, null, extension, type, classifier
         );
-        // TODO:DAZ Find a good way to handle this with lazy configuration
         new DslObject(ivyArtifact).getConventionMapping().map("name", new Callable<String>() {
             public String call() throws Exception {
                 return publicationIdentity.getModule();
diff --git a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/GenerateIvyDescriptor.java b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/GenerateIvyDescriptor.java
index de374b875091..7ade68e3793f 100644
--- a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/GenerateIvyDescriptor.java
+++ b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/GenerateIvyDescriptor.java
@@ -44,16 +44,16 @@ public class GenerateIvyDescriptor extends DefaultTask {
     private IvyModuleDescriptor descriptor;
     private Object destination;
 
-    private final FileResolver fileResolver;
-
-    @Inject
-    public GenerateIvyDescriptor(FileResolver fileResolver) {
-        this.fileResolver = fileResolver;
-
+    public GenerateIvyDescriptor() {
         // Never up to date; we don't understand the data structures.
         getOutputs().upToDateWhen(Specs.satisfyNone());
     }
 
+    @Inject
+    protected FileResolver getFileResolver() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * The module descriptor metadata.
      *
@@ -74,7 +74,7 @@ public void setDescriptor(IvyModuleDescriptor descriptor) {
      */
     @OutputFile
     public File getDestination() {
-        return destination == null ? null : fileResolver.resolve(destination);
+        return destination == null ? null : getFileResolver().resolve(destination);
     }
 
     /**
diff --git a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/PublishToIvyRepository.java b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/PublishToIvyRepository.java
index 205a1a596bc1..6f865beca765 100644
--- a/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/PublishToIvyRepository.java
+++ b/subprojects/ivy/src/main/java/org/gradle/api/publish/ivy/tasks/PublishToIvyRepository.java
@@ -21,15 +21,16 @@
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.artifacts.repositories.IvyArtifactRepository;
 import org.gradle.api.file.FileCollection;
-import org.gradle.internal.Cast;
-import org.gradle.api.internal.artifacts.ivyservice.IvyContextManager;
 import org.gradle.api.internal.artifacts.repositories.PublicationAwareRepository;
 import org.gradle.api.publish.internal.PublishOperation;
 import org.gradle.api.publish.ivy.IvyPublication;
 import org.gradle.api.publish.ivy.internal.publication.IvyPublicationInternal;
-import org.gradle.api.publish.ivy.internal.publisher.*;
+import org.gradle.api.publish.ivy.internal.publisher.IvyNormalizedPublication;
+import org.gradle.api.publish.ivy.internal.publisher.IvyPublisher;
 import org.gradle.api.tasks.TaskAction;
+import org.gradle.internal.Cast;
 
+import javax.inject.Inject;
 import java.util.concurrent.Callable;
 
 /**
@@ -131,14 +132,17 @@ public void publish() {
         doPublish(publicationInternal, repository);
     }
 
+    @Inject
+    protected IvyPublisher getIvyPublisher() {
+        throw new UnsupportedOperationException();
+    }
+
     private void doPublish(final IvyPublicationInternal publication, final IvyArtifactRepository repository) {
         new PublishOperation(publication, repository) {
             @Override
             protected void publish() throws Exception {
                 IvyNormalizedPublication normalizedPublication = publication.asNormalisedPublication();
-                IvyPublisher publisher = new DependencyResolverIvyPublisher();
-                publisher = new ValidatingIvyPublisher(publisher);
-                publisher = new ContextualizingIvyPublisher(publisher, getServices().get(IvyContextManager.class));
+                IvyPublisher publisher = getIvyPublisher();
                 publisher.publish(normalizedPublication, Cast.cast(PublicationAwareRepository.class, repository));
             }
         }.run();
diff --git a/subprojects/ivy/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry b/subprojects/ivy/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
new file mode 100644
index 000000000000..84cbbf9c6086
--- /dev/null
+++ b/subprojects/ivy/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
@@ -0,0 +1 @@
+org.gradle.api.publish.ivy.internal.IvyPublishServices
\ No newline at end of file
diff --git a/subprojects/ivy/src/test/groovy/org/gradle/api/publish/ivy/internal/publisher/IvyDescriptorFileGeneratorTest.groovy b/subprojects/ivy/src/test/groovy/org/gradle/api/publish/ivy/internal/publisher/IvyDescriptorFileGeneratorTest.groovy
index 268d700da42b..1a3b38c67786 100644
--- a/subprojects/ivy/src/test/groovy/org/gradle/api/publish/ivy/internal/publisher/IvyDescriptorFileGeneratorTest.groovy
+++ b/subprojects/ivy/src/test/groovy/org/gradle/api/publish/ivy/internal/publisher/IvyDescriptorFileGeneratorTest.groovy
@@ -119,18 +119,19 @@ class IvyDescriptorFileGeneratorTest extends Specification {
                 it.@name == "artifact1"
                 it.@type == "type1"
                 it.@ext == "ext1"
-                it.@classifier == "classy"
+                it."@m:classifier" == "classy"
                 it.@conf.isEmpty()
             }
             with (publications[0].artifact[1]) {
                 it.@name.isEmpty()
                 it.@type.isEmpty()
                 it.@ext == ""
-                it.@classifier.isEmpty()
+                it."@m:classifier".isEmpty()
                 it.@conf == "runtime"
             }
         }
     }
+
     def "writes supplied dependencies"() {
         when:
         generator.addDependency(new DefaultIvyDependency('dep-group', 'dep-name-1', 'dep-version', "confMappingProject"))
@@ -187,13 +188,13 @@ class IvyDescriptorFileGeneratorTest extends Specification {
                     it.@name == "artifact-1"
                     it.@type == "type-1"
                     it.@ext == "ext-1"
-                    it.@classifier.isEmpty()
+                    it."@m:classifier".isEmpty()
                 }
                 with (artifact[1]) {
                     it.@name == "artifact-2"
                     it.@type.isEmpty()
                     it.@ext.isEmpty()
-                    it.@classifier == "classy"
+                    it."@m:classifier" == "classy"
                 }
             }
         }
diff --git a/subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoMerge.groovy b/subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoMerge.groovy
index 43df564dbae1..bdbe74ac30bc 100644
--- a/subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoMerge.groovy
+++ b/subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoMerge.groovy
@@ -18,12 +18,15 @@ package org.gradle.testing.jacoco.tasks
 import org.gradle.api.Incubating
 import org.gradle.api.Task
 import org.gradle.api.file.FileCollection
+import org.gradle.api.internal.project.IsolatedAntBuilder
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.tasks.TaskCollection
 import org.gradle.testing.jacoco.plugins.JacocoTaskExtension
 
+import javax.inject.Inject
+
 /**
  * Task to merge multiple execution data files into one.
  */
@@ -41,11 +44,18 @@ class JacocoMerge extends JacocoBase {
     @OutputFile
     File destinationFile
 
+    @Inject
+    protected IsolatedAntBuilder getAntBuilder() {
+        throw new UnsupportedOperationException();
+    }
+
     @TaskAction
     void merge() {
-        getAnt().taskdef(name: 'jacocoMerge', classname: 'org.jacoco.ant.MergeTask', classpath: getJacocoClasspath().asPath)
-        getAnt().jacocoMerge(destfile: getDestinationFile()) {
-            getExecutionData().addToAntBuilder(ant, 'resources')
+        antBuilder.withClasspath(getJacocoClasspath()).execute {
+            ant.taskdef(name: 'jacocoMerge', classname: 'org.jacoco.ant.MergeTask')
+            ant.jacocoMerge(destfile: getDestinationFile()) {
+                getExecutionData().addToAntBuilder(ant, 'resources')
+            }
         }
     }
 
diff --git a/subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoReport.groovy b/subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoReport.groovy
index d55ea27c71aa..d46ce16d5d45 100644
--- a/subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoReport.groovy
+++ b/subprojects/jacoco/src/main/groovy/org/gradle/testing/jacoco/tasks/JacocoReport.groovy
@@ -18,6 +18,7 @@ package org.gradle.testing.jacoco.tasks
 import org.gradle.api.Incubating
 import org.gradle.api.Task
 import org.gradle.api.file.FileCollection
+import org.gradle.api.internal.project.IsolatedAntBuilder
 import org.gradle.api.reporting.Reporting
 import org.gradle.api.tasks.*
 import org.gradle.internal.jacoco.JacocoReportsContainerImpl
@@ -66,34 +67,46 @@ class JacocoReport extends JacocoBase implements Reporting<JacocoReportsContaine
     @Nested
     private final JacocoReportsContainerImpl reports
 
-    @Inject JacocoReport(Instantiator instantiator) {
+    JacocoReport() {
         reports = instantiator.newInstance(JacocoReportsContainerImpl, this)
         onlyIf { getExecutionData().every { it.exists() } }
     }
 
+    @Inject
+    protected Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected IsolatedAntBuilder getAntBuilder() {
+        throw new UnsupportedOperationException();
+    }
+
     @TaskAction
     void generate() {
-        getAnt().taskdef(name: 'jacocoReport', classname: 'org.jacoco.ant.ReportTask', classpath: getJacocoClasspath().asPath)
-        getAnt().jacocoReport {
-            executiondata {
-                getExecutionData().addToAntBuilder(getAnt(), 'resources')
-            }
-            structure(name: getProject().getName()) {
-                classfiles {
-                    getAllClassDirs().filter { it.exists() }.addToAntBuilder(getAnt(), 'resources')
+        antBuilder.withClasspath(getJacocoClasspath()).execute {
+            ant.taskdef(name: 'jacocoReport', classname: 'org.jacoco.ant.ReportTask')
+            ant.jacocoReport {
+                executiondata {
+                    getExecutionData().addToAntBuilder(getAnt(), 'resources')
                 }
-                sourcefiles {
-                    getAllSourceDirs().filter { it.exists() }.addToAntBuilder(getAnt(), 'resources')
+                structure(name: getProject().getName()) {
+                    classfiles {
+                        getAllClassDirs().filter { it.exists() }.addToAntBuilder(ant, 'resources')
+                    }
+                    sourcefiles {
+                        getAllSourceDirs().filter { it.exists() }.addToAntBuilder(ant, 'resources')
+                    }
+                }
+                if(reports.html.isEnabled()) {
+                    html(destdir: reports.html.destination)
+                }
+                if(reports.xml.isEnabled()) {
+                    xml(destfile: reports.xml.destination)
+                }
+                if(reports.csv.isEnabled()) {
+                    csv(destfile: reports.csv.destination)
                 }
-            }
-            if(reports.html.isEnabled()) {
-                html(destdir: reports.html.destination)
-            }
-            if(reports.xml.isEnabled()) {
-                xml(destfile: reports.xml.destination)
-            }
-            if(reports.csv.isEnabled()) {
-                csv(destfile: reports.csv.destination)
             }
         }
     }
diff --git a/subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompile.java b/subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompile.java
index 839cd94fc734..614507134bd9 100644
--- a/subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompile.java
+++ b/subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/coffeescript/CoffeeScriptCompile.java
@@ -40,11 +40,10 @@ public class CoffeeScriptCompile extends SourceTask {
     private Object destinationDir;
     private Object rhinoClasspath;
     private CoffeeScriptCompileOptions options = new CoffeeScriptCompileOptions();
-    private final Factory<WorkerProcessBuilder> workerProcessBuilderFactory;
 
     @Inject
-    public CoffeeScriptCompile(Factory<WorkerProcessBuilder> workerProcessBuilderFactory) {
-        this.workerProcessBuilderFactory = workerProcessBuilderFactory;
+    protected Factory<WorkerProcessBuilder> getWorkerProcessBuilderFactory() {
+        throw new UnsupportedOperationException();
     }
 
     @InputFiles
@@ -88,7 +87,7 @@ public void options(Closure<?> closure) {
 
     @TaskAction
     public void doCompile() {
-        RhinoWorkerHandleFactory handleFactory = new DefaultRhinoWorkerHandleFactory(workerProcessBuilderFactory);
+        RhinoWorkerHandleFactory handleFactory = new DefaultRhinoWorkerHandleFactory(getWorkerProcessBuilderFactory());
 
         CoffeeScriptCompileSpec spec = new DefaultCoffeeScriptCompileSpec();
         spec.setCoffeeScriptJs(getCoffeeScriptJs().getSingleFile());
diff --git a/subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/jshint/JsHint.java b/subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/jshint/JsHint.java
index 6cec11d0251d..503107959797 100644
--- a/subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/jshint/JsHint.java
+++ b/subprojects/javascript/src/main/groovy/org/gradle/plugins/javascript/jshint/JsHint.java
@@ -49,11 +49,10 @@ public class JsHint extends SourceTask {
     private Object jsHint;
     private String encoding = "UTF-8";
     private Object jsonReport;
-    private final Factory<WorkerProcessBuilder> workerProcessBuilderFactory;
 
     @Inject
-    public JsHint(Factory<WorkerProcessBuilder> workerProcessBuilderFactory) {
-        this.workerProcessBuilderFactory = workerProcessBuilderFactory;
+    protected Factory<WorkerProcessBuilder> getWorkerProcessBuilderFactory() {
+        throw new UnsupportedOperationException();
     }
 
     @InputFiles
@@ -94,7 +93,7 @@ public void setJsonReport(Object jsonReport) {
 
     @TaskAction
     public void doJsHint() {
-        RhinoWorkerHandleFactory handleFactory = new DefaultRhinoWorkerHandleFactory(workerProcessBuilderFactory);
+        RhinoWorkerHandleFactory handleFactory = new DefaultRhinoWorkerHandleFactory(getWorkerProcessBuilderFactory());
 
         LogLevel logLevel = getProject().getGradle().getStartParameter().getLogLevel();
         RhinoWorkerHandle<JsHintResult, JsHintSpec> rhinoHandle = handleFactory.create(getRhinoClasspath(), createWorkerSpec(), logLevel, new Action<JavaExecSpec>() {
diff --git a/subprojects/language-base/src/integTest/groovy/org/gradle/language/base/plugins/LifecycleBasePluginTest.groovy b/subprojects/language-base/src/integTest/groovy/org/gradle/language/base/plugins/LifecycleBasePluginTest.groovy
new file mode 100644
index 000000000000..50aea372b712
--- /dev/null
+++ b/subprojects/language-base/src/integTest/groovy/org/gradle/language/base/plugins/LifecycleBasePluginTest.groovy
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.language.base.plugins
+import org.gradle.api.DefaultTask
+import org.gradle.api.Project
+import org.gradle.api.Task
+import org.gradle.api.tasks.Delete
+import org.gradle.util.TestUtil
+import spock.lang.Specification
+
+import static org.gradle.api.tasks.TaskDependencyMatchers.dependsOn
+import static org.hamcrest.Matchers.instanceOf
+
+class LifecycleBasePluginTest extends Specification {
+    private final Project project = TestUtil.createRootProject()
+
+    public void createsTasksAndAppliesMappings() {
+        when:
+        project.plugins.apply(LifecycleBasePlugin)
+
+        then:
+        def clean = project.tasks[LifecycleBasePlugin.CLEAN_TASK_NAME]
+        clean instanceOf(Delete)
+        clean dependsOn()
+        clean.targetFiles.files == [project.buildDir] as Set
+
+        and:
+        def assemble = project.tasks[LifecycleBasePlugin.ASSEMBLE_TASK_NAME]
+        assemble instanceOf(DefaultTask)
+    }
+
+    public void addsACleanRule() {
+        given:
+        Task test = project.task('test')
+        test.outputs.files(project.buildDir)
+
+        when:
+        project.plugins.apply(LifecycleBasePlugin)
+
+        then:
+        Task cleanTest = project.tasks['cleanTest']
+        cleanTest instanceOf(Delete)
+        cleanTest.delete == [test.outputs.files] as Set
+    }
+
+    public void cleanRuleIsCaseSensitive() {
+        given:
+        project.task('testTask')
+        project.task('12')
+
+        when:
+        project.plugins.apply(LifecycleBasePlugin)
+
+        then:
+        project.tasks.findByName('cleantestTask') == null
+        project.tasks.findByName('cleanTesttask') == null
+        project.tasks.findByName('cleanTestTask') instanceof Delete
+        project.tasks.findByName('clean12') instanceof Delete
+    }
+}
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/LanguageSourceSet.java b/subprojects/language-base/src/main/groovy/org/gradle/language/base/LanguageSourceSet.java
index e10639c56a35..11ca1eb53088 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/LanguageSourceSet.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/language/base/LanguageSourceSet.java
@@ -20,6 +20,7 @@
 import org.gradle.api.Named;
 import org.gradle.api.Task;
 import org.gradle.api.file.SourceDirectorySet;
+import org.gradle.runtime.base.BuildableModelElement;
 import org.gradle.internal.HasInternalProtocol;
 
 /**
@@ -42,6 +43,5 @@ public interface LanguageSourceSet extends Named, BuildableModelElement {
      */
     void source(Action<? super SourceDirectorySet> config);
 
-    // TODO:DAZ Maybe add this as an extension property, and only in domains where it is handled (currently in native-binaries)
     void generatedBy(Task generatorTask);
 }
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractLanguageSourceSet.java b/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractLanguageSourceSet.java
index 800ddcb86d5c..e74d0c49f322 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractLanguageSourceSet.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractLanguageSourceSet.java
@@ -20,6 +20,7 @@
 import org.gradle.api.Action;
 import org.gradle.api.Task;
 import org.gradle.api.file.SourceDirectorySet;
+import org.gradle.runtime.base.internal.AbstractBuildableModelElement;
 import org.gradle.language.base.FunctionalSourceSet;
 
 public abstract class AbstractLanguageSourceSet extends AbstractBuildableModelElement implements LanguageSourceSetInternal {
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/LanguageSourceSetInternal.java b/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/LanguageSourceSetInternal.java
index ecde133a3fbf..6a2cd813d9e2 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/LanguageSourceSetInternal.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/LanguageSourceSetInternal.java
@@ -20,8 +20,6 @@
 
 public interface LanguageSourceSetInternal extends LanguageSourceSet {
 
-    // TODO:DAZ This doesn't feel right. Need some better modelling.
-    // TODO:DAZ Use this for ClassDirectoryBinary task names as well: need to hack the naming scheme to maintain back-compatibility
     /**
      * A unique name for this source set across all functional source sets.
      */
@@ -32,6 +30,5 @@ public interface LanguageSourceSetInternal extends LanguageSourceSet {
      */
     boolean getMayHaveSources();
 
-    // TODO:DAZ Maybe use an extension property
     Task getGeneratorTask();
 }
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/CleanRule.java b/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/plugins/CleanRule.java
similarity index 84%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/CleanRule.java
rename to subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/plugins/CleanRule.java
index 4266b35965ed..b6b224c217f4 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/CleanRule.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/plugins/CleanRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.plugins;
+package org.gradle.language.base.internal.plugins;
 
 import org.apache.commons.lang.StringUtils;
+import org.gradle.api.Rule;
 import org.gradle.api.Task;
 import org.gradle.api.tasks.Delete;
 import org.gradle.api.tasks.TaskContainer;
 
-public class CleanRule extends AbstractRule {
+public class CleanRule implements Rule {
 
     public static final String PREFIX = "clean";
 
@@ -35,6 +36,11 @@ public String getDescription() {
         return String.format("Pattern: %s<TaskName>: Cleans the output files of a task.", PREFIX);
     }
 
+    @Override
+    public String toString() {
+        return String.format("Rule: %s", getDescription());
+    }
+
     public void apply(String taskName) {
         if (!taskName.startsWith(PREFIX)) {
             return;
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LanguageBasePlugin.java b/subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LanguageBasePlugin.java
index 1a65640e8273..eb47d2985e38 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LanguageBasePlugin.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LanguageBasePlugin.java
@@ -16,25 +16,31 @@
 package org.gradle.language.base.plugins;
 
 import org.gradle.api.*;
+import org.gradle.api.tasks.TaskContainer;
 import org.gradle.internal.Factory;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.BinaryContainer;
-import org.gradle.language.base.internal.BinaryInternal;
-import org.gradle.language.base.internal.DefaultBinaryContainer;
 import org.gradle.language.base.internal.DefaultProjectSourceSet;
+import org.gradle.model.ModelRule;
 import org.gradle.model.ModelRules;
+import org.gradle.runtime.base.BinaryContainer;
+import org.gradle.runtime.base.ProjectBinary;
+import org.gradle.runtime.base.internal.BinaryInternal;
+import org.gradle.runtime.base.internal.DefaultBinaryContainer;
+import org.gradle.runtime.base.internal.DefaultProjectComponentContainer;
 
 import javax.inject.Inject;
 
 /**
  * Base plugin for language support.
  *
- * Adds a {@link org.gradle.language.base.BinaryContainer} named {@code binaries} to the project.
+ * Adds a {@link org.gradle.runtime.base.ProjectComponentContainer} named {@code softwareComponents} to the project.
+ * Adds a {@link org.gradle.runtime.base.BinaryContainer} named {@code binaries} to the project.
  * Adds a {@link org.gradle.language.base.ProjectSourceSet} named {@code sources} to the project.
+ *
+ * For each binary instance added to the binaries container, registers a lifecycle task to create that binary.
  */
 @Incubating
 public class LanguageBasePlugin implements Plugin<Project> {
-    public static final String BUILD_GROUP = "build";
 
     private final Instantiator instantiator;
     private final ModelRules modelRules;
@@ -46,6 +52,8 @@ public LanguageBasePlugin(Instantiator instantiator, ModelRules modelRules) {
     }
 
     public void apply(final Project target) {
+        // TODO:DAZ Rename to 'components' and merge with Project.components
+        target.getExtensions().create("softwareComponents", DefaultProjectComponentContainer.class, instantiator);
         target.getExtensions().create("sources", DefaultProjectSourceSet.class, instantiator);
         final BinaryContainer binaries = target.getExtensions().create("binaries", DefaultBinaryContainer.class, instantiator);
 
@@ -54,14 +62,27 @@ public BinaryContainer create() {
                 return binaries;
             }
         });
+        modelRules.rule(new AttachBinariesToLifecycle());
 
         binaries.withType(BinaryInternal.class).all(new Action<BinaryInternal>() {
             public void execute(BinaryInternal binary) {
                 Task binaryLifecycleTask = target.task(binary.getNamingScheme().getLifecycleTaskName());
-                binaryLifecycleTask.setGroup(BUILD_GROUP);
+                binaryLifecycleTask.setGroup(LifecycleBasePlugin.BUILD_GROUP);
                 binaryLifecycleTask.setDescription(String.format("Assembles %s.", binary));
-                binary.setLifecycleTask(binaryLifecycleTask);
+                binary.setBuildTask(binaryLifecycleTask);
             }
         });
     }
+
+    private static class AttachBinariesToLifecycle extends ModelRule {
+        @SuppressWarnings("UnusedDeclaration")
+        void attach(TaskContainer tasks, BinaryContainer binaries) {
+            Task assembleTask = tasks.getByName(LifecycleBasePlugin.ASSEMBLE_TASK_NAME);
+            for (ProjectBinary binary : binaries.withType(ProjectBinary.class)) {
+                if (binary.isBuildable()) {
+                    assembleTask.dependsOn(binary);
+                }
+            }
+        }
+    }
 }
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LifecycleBasePlugin.java b/subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LifecycleBasePlugin.java
new file mode 100644
index 000000000000..6615c43577e5
--- /dev/null
+++ b/subprojects/language-base/src/main/groovy/org/gradle/language/base/plugins/LifecycleBasePlugin.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.language.base.plugins;
+
+import org.gradle.api.Incubating;
+import org.gradle.api.Plugin;
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+import org.gradle.api.tasks.Delete;
+import org.gradle.language.base.internal.plugins.CleanRule;
+
+import java.io.File;
+import java.util.concurrent.Callable;
+
+/**
+ * <p>A {@link org.gradle.api.Plugin} which defines a basic project lifecycle.</p>
+ */
+@Incubating
+public class LifecycleBasePlugin implements Plugin<Project> {
+    public static final String CLEAN_TASK_NAME = "clean";
+    public static final String ASSEMBLE_TASK_NAME = "assemble";
+    public static final String BUILD_GROUP = "build";
+
+    public void apply(Project project) {
+        addClean(project);
+        addCleanRule(project);
+        addAssemble(project);
+    }
+
+    private void addClean(final Project project) {
+        Delete clean = project.getTasks().create(CLEAN_TASK_NAME, Delete.class);
+        clean.setDescription("Deletes the build directory.");
+        clean.setGroup(BUILD_GROUP);
+        clean.delete(new Callable<File>() {
+            public File call() throws Exception {
+                return project.getBuildDir();
+            }
+        });
+    }
+
+    private void addCleanRule(Project project) {
+        project.getTasks().addRule(new CleanRule(project.getTasks()));
+    }
+
+    private void addAssemble(Project project) {
+        Task assembleTask = project.getTasks().create(ASSEMBLE_TASK_NAME);
+        assembleTask.setDescription("Assembles the outputs of this project.");
+        assembleTask.setGroup(BUILD_GROUP);
+    }
+}
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Application.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Application.java
new file mode 100644
index 000000000000..737dac1e605d
--- /dev/null
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Application.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.base;
+
+import org.gradle.api.Incubating;
+
+/**
+ * A software application.
+ */
+@Incubating
+public interface Application {
+}
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/Binary.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Binary.java
similarity index 96%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/Binary.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Binary.java
index 7838a17402b0..ccd8bbb88c61 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/Binary.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Binary.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.language.base;
+package org.gradle.runtime.base;
 
 import org.gradle.api.Incubating;
 import org.gradle.api.Named;
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/BinaryContainer.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/BinaryContainer.java
similarity index 96%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/BinaryContainer.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/BinaryContainer.java
index 20d7f1a142ca..189671c132f9 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/BinaryContainer.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/BinaryContainer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.base;
+package org.gradle.runtime.base;
 
 import org.gradle.api.*;
 
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/BuildableModelElement.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/BuildableModelElement.java
similarity index 84%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/BuildableModelElement.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/BuildableModelElement.java
index 62333558593f..ab76f1758aff 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/BuildableModelElement.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/BuildableModelElement.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.gradle.language.base;
+package org.gradle.runtime.base;
 
 import org.gradle.api.Buildable;
 import org.gradle.api.Incubating;
+import org.gradle.api.Nullable;
 import org.gradle.api.Task;
 
 /**
@@ -26,10 +27,16 @@
  */
 @Incubating
 public interface BuildableModelElement extends Buildable {
+    /**
+     * Returns the 'lifecycle' task associated with the construction of this element.
+     */
+    @Nullable
+    Task getBuildTask();
+
     /**
      * Associates a 'lifecycle' task with the construction of this element.
      */
-    void setLifecycleTask(Task lifecycleTask);
+    void setBuildTask(Task lifecycleTask);
 
     /**
      * Adds a task that is required for the construction of this element.
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrarySourcesArtifact.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Library.java
similarity index 76%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrarySourcesArtifact.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Library.java
index 078876860dff..8f6e5df89888 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/JvmLibrarySourcesArtifact.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/Library.java
@@ -13,15 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
+
+package org.gradle.runtime.base;
 
 import org.gradle.api.Incubating;
 
 /**
- * An artifact containing sources for a JVM library software component.
- *
- * @since 1.12
+ * A library that can be linked into or depended on by another software element.
  */
 @Incubating
-public interface JvmLibrarySourcesArtifact extends JvmLibraryArtifact {
+public interface Library {
 }
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectBinary.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectBinary.java
new file mode 100644
index 000000000000..463a8d26d126
--- /dev/null
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectBinary.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.base;
+
+import org.gradle.api.Incubating;
+
+/**
+ * Represents a binary artifact that is the result of building a project component.
+ */
+@Incubating
+public interface ProjectBinary extends Binary {
+    /**
+     * Can this binary be built in the current environment?
+     */
+    boolean isBuildable();
+}
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectComponent.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectComponent.java
new file mode 100644
index 000000000000..07a500bcc7cd
--- /dev/null
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectComponent.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.base;
+
+import org.gradle.api.Incubating;
+import org.gradle.api.Named;
+
+/**
+ * A logical software component that is built by a Gradle project.
+ *
+ * TODO:DAZ Better name/package. Need to decide what a 'component' is.
+ * TODO:DAZ Merge with org.gradle.api.component.SoftwareComponent
+ */
+@Incubating
+public interface ProjectComponent extends Named {
+}
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectComponentContainer.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectComponentContainer.java
new file mode 100644
index 000000000000..3fc02888529b
--- /dev/null
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/ProjectComponentContainer.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.base;
+
+import org.gradle.api.ExtensiblePolymorphicDomainObjectContainer;
+import org.gradle.api.Incubating;
+
+/**
+ * A container of software components.
+ * TODO:DAZ Merge with org.gradle.api.component.SoftwareComponentContainer
+ */
+@Incubating
+public interface ProjectComponentContainer extends ExtensiblePolymorphicDomainObjectContainer<ProjectComponent> {
+}
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractBuildableModelElement.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/AbstractBuildableModelElement.java
similarity index 88%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractBuildableModelElement.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/AbstractBuildableModelElement.java
index 206a2b82337f..58a66ae05573 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/AbstractBuildableModelElement.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/AbstractBuildableModelElement.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.gradle.language.base.internal;
+package org.gradle.runtime.base.internal;
 
 import org.gradle.api.Task;
 import org.gradle.api.internal.tasks.DefaultTaskDependency;
 import org.gradle.api.tasks.TaskDependency;
-import org.gradle.language.base.BuildableModelElement;
+import org.gradle.runtime.base.BuildableModelElement;
 
 import java.util.Collections;
 import java.util.Set;
@@ -28,7 +28,11 @@ public class AbstractBuildableModelElement implements BuildableModelElement {
     private final DefaultTaskDependency buildDependencies = new DefaultTaskDependency();
     private Task lifecycleTask;
 
-    public void setLifecycleTask(Task lifecycleTask) {
+    public Task getBuildTask() {
+        return lifecycleTask;
+    }
+
+    public void setBuildTask(Task lifecycleTask) {
         this.lifecycleTask = lifecycleTask;
         lifecycleTask.dependsOn(buildDependencies);
     }
@@ -49,7 +53,6 @@ public void builtBy(Object... tasks) {
     }
 
     public boolean hasBuildDependencies() {
-        // TODO:DAZ There must be a better way to get independent of a Task
         return buildDependencies.getDependencies(lifecycleTask).size() > 0;
     }
 }
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryInternal.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryInternal.java
similarity index 89%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryInternal.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryInternal.java
index d45b4a55a99f..4f8f05856288 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryInternal.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryInternal.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.language.base.internal;
+package org.gradle.runtime.base.internal;
 
-import org.gradle.language.base.Binary;
+import org.gradle.runtime.base.Binary;
 
 public interface BinaryInternal extends Binary {
     BinaryNamingScheme getNamingScheme();
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingScheme.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryNamingScheme.java
similarity index 95%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingScheme.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryNamingScheme.java
index ff588bdcc94b..a8cfc3875fc4 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingScheme.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryNamingScheme.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.language.base.internal;
+package org.gradle.runtime.base.internal;
 
 import org.gradle.api.Nullable;
 
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingSchemeBuilder.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryNamingSchemeBuilder.java
similarity index 95%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingSchemeBuilder.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryNamingSchemeBuilder.java
index b80581480746..4c7e460cb937 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/BinaryNamingSchemeBuilder.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/BinaryNamingSchemeBuilder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.base.internal;
+package org.gradle.runtime.base.internal;
 
 public interface BinaryNamingSchemeBuilder {
     BinaryNamingSchemeBuilder withComponentName(String name);
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryContainer.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryContainer.java
similarity index 88%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryContainer.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryContainer.java
index 33a9ed01b3d5..143ee3e3b425 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryContainer.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryContainer.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.base.internal;
+package org.gradle.runtime.base.internal;
 
 import org.gradle.api.internal.DefaultPolymorphicDomainObjectContainer;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.BinaryContainer;
-import org.gradle.language.base.Binary;
+import org.gradle.runtime.base.BinaryContainer;
+import org.gradle.runtime.base.Binary;
 
 public class DefaultBinaryContainer extends DefaultPolymorphicDomainObjectContainer<Binary> implements BinaryContainer {
     public DefaultBinaryContainer(Instantiator instantiator) {
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingScheme.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingScheme.java
similarity index 98%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingScheme.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingScheme.java
index 9c8ce210ca1d..8a885486f06c 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingScheme.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingScheme.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.language.base.internal;
+package org.gradle.runtime.base.internal;
 
 import org.gradle.api.Nullable;
 import org.gradle.util.GUtil;
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeBuilder.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingSchemeBuilder.java
similarity index 98%
rename from subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeBuilder.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingSchemeBuilder.java
index 92eb49d7aa42..354ea165d809 100644
--- a/subprojects/language-base/src/main/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeBuilder.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingSchemeBuilder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.language.base.internal;
+package org.gradle.runtime.base.internal;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultProjectComponentContainer.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultProjectComponentContainer.java
new file mode 100644
index 000000000000..6f9db8279fad
--- /dev/null
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/internal/DefaultProjectComponentContainer.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.base.internal;
+
+import org.gradle.api.internal.DefaultPolymorphicDomainObjectContainer;
+import org.gradle.internal.reflect.Instantiator;
+import org.gradle.runtime.base.ProjectComponent;
+import org.gradle.runtime.base.ProjectComponentContainer;
+
+public class DefaultProjectComponentContainer extends DefaultPolymorphicDomainObjectContainer<ProjectComponent> implements ProjectComponentContainer {
+
+    public DefaultProjectComponentContainer(Instantiator instantiator) {
+        super(ProjectComponent.class, instantiator);
+    }
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/package-info.java b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/package-info.java
similarity index 81%
rename from subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/package-info.java
rename to subprojects/language-base/src/main/groovy/org/gradle/runtime/base/package-info.java
index 4465713657ad..b32bbf7247f5 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/package-info.java
+++ b/subprojects/language-base/src/main/groovy/org/gradle/runtime/base/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 
 /**
- * Base plugins that add support for JVM languages.
+ * General purpose types for runtime support.
  */
 @Incubating
-package org.gradle.language.jvm.plugins;
+package org.gradle.runtime.base;
 
 import org.gradle.api.Incubating;
\ No newline at end of file
diff --git a/subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/BuildableModelElementTest.groovy b/subprojects/language-base/src/test/groovy/org/gradle/runtime/base/internal/BuildableModelElementTest.groovy
similarity index 94%
rename from subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/BuildableModelElementTest.groovy
rename to subprojects/language-base/src/test/groovy/org/gradle/runtime/base/internal/BuildableModelElementTest.groovy
index e4a582eda579..a13df27772d5 100644
--- a/subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/BuildableModelElementTest.groovy
+++ b/subprojects/language-base/src/test/groovy/org/gradle/runtime/base/internal/BuildableModelElementTest.groovy
@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.base.internal
-
+package org.gradle.runtime.base.internal
 import org.gradle.api.DefaultTask
 import org.gradle.api.Task
 import org.gradle.util.TestUtil
@@ -38,7 +37,7 @@ public class BuildableModelElementTest extends Specification {
     def "has intervening lifecycle task as dependency when set"() {
         when:
         element.builtBy(dependedOn1)
-        element.setLifecycleTask(lifecycleTask)
+        element.setBuildTask(lifecycleTask)
         element.builtBy(dependedOn2)
 
         then:
diff --git a/subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeTest.groovy b/subprojects/language-base/src/test/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingSchemeTest.groovy
similarity index 98%
rename from subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeTest.groovy
rename to subprojects/language-base/src/test/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingSchemeTest.groovy
index 6f843d0f2a19..d69689586267 100644
--- a/subprojects/language-base/src/test/groovy/org/gradle/language/base/internal/DefaultBinaryNamingSchemeTest.groovy
+++ b/subprojects/language-base/src/test/groovy/org/gradle/runtime/base/internal/DefaultBinaryNamingSchemeTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.language.base.internal
+package org.gradle.runtime.base.internal
 
 import spock.lang.Specification
 
diff --git a/subprojects/language-jvm/language-jvm.gradle b/subprojects/language-jvm/language-jvm.gradle
index 19b65181b8c0..c5c005b28166 100644
--- a/subprojects/language-jvm/language-jvm.gradle
+++ b/subprojects/language-jvm/language-jvm.gradle
@@ -5,3 +5,4 @@ dependencies {
 }
 
 useClassycle()
+useTestFixtures()
diff --git a/subprojects/language-jvm/src/integTest/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPluginGoodBehaviourTest.groovy b/subprojects/language-jvm/src/integTest/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPluginGoodBehaviourTest.groovy
new file mode 100644
index 000000000000..011d08e0e299
--- /dev/null
+++ b/subprojects/language-jvm/src/integTest/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPluginGoodBehaviourTest.groovy
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.plugins
+import org.gradle.integtests.fixtures.WellBehavedPluginTest
+
+class JvmComponentPluginGoodBehaviourTest extends WellBehavedPluginTest {
+    @Override
+    String getMainTask() {
+        return "assemble"
+    }
+
+    @Override
+    String getPluginId() {
+        "jvm-component"
+    }
+}
\ No newline at end of file
diff --git a/subprojects/language-jvm/src/integTest/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPluginIntegrationTest.groovy b/subprojects/language-jvm/src/integTest/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPluginIntegrationTest.groovy
new file mode 100644
index 000000000000..116e056b3a08
--- /dev/null
+++ b/subprojects/language-jvm/src/integTest/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPluginIntegrationTest.groovy
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.plugins
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+
+class JvmComponentPluginIntegrationTest extends AbstractIntegrationSpec {
+    def "does not create library or binaries when not configured"() {
+        when:
+        buildFile << """
+        apply plugin: 'jvm-component'
+        task check << {
+            assert jvm.libraries.empty
+            assert binaries.empty
+        }
+"""
+        then:
+        succeeds "check"
+
+        and:
+        !file("build").exists()
+    }
+
+    def "creates jvm library and binary model objects and lifecycle task"() {
+        when:
+        buildFile << """
+    apply plugin: 'jvm-component'
+
+    jvm {
+        libraries {
+            myLib
+        }
+    }
+
+    task check << {
+        assert jvm.libraries.size() == 1
+        def myLib = jvm.libraries.myLib
+        assert myLib.name == 'myLib'
+        assert myLib == jvm.libraries['myLib']
+        assert myLib instanceof JvmLibrary
+
+        assert binaries.size() == 1
+        def myLibJar = (binaries as List)[0]
+        assert myLibJar instanceof JvmLibraryBinary
+        assert myLibJar.name == 'myLibJar'
+        assert myLibJar.displayName == "jar 'myLib:jar'"
+
+        def binaryTask = tasks['myLibJar']
+        assert binaryTask.group == 'build'
+        assert binaryTask.description == "Assembles jar 'myLib:jar'."
+        assert myLibJar.buildTask == binaryTask
+
+        def jarTask = tasks['createMyLibJar']
+        assert jarTask instanceof Zip
+        assert jarTask.group == null
+        assert jarTask.description == "Creates the binary file for jar 'myLib:jar'."
+    }
+"""
+        then:
+        succeeds "check"
+
+        and:
+        !file("build").exists()
+    }
+
+    def "skips creating binary when binary has no sources"() {
+        given:
+        buildFile << """
+    apply plugin: 'jvm-component'
+
+    jvm {
+        libraries {
+            myJvmLib
+        }
+    }
+"""
+        when:
+        succeeds "myJvmLibJar"
+
+        then:
+        executed ":createMyJvmLibJar", ":myJvmLibJar"
+
+        and:
+        !file("build").exists()
+    }
+
+    def "can specify additional builder tasks for binary"() {
+        given:
+        buildFile << """
+    apply plugin: 'jvm-component'
+
+    jvm {
+        libraries {
+            myJvmLib
+        }
+    }
+    binaries.all { binary ->
+        def logTask = project.tasks.create(binary.namingScheme.getTaskName("log")) {
+            println "Constructing binary: \${binary.displayName}"
+        }
+        binary.builtBy(logTask)
+    }
+"""
+        when:
+        succeeds "myJvmLibJar"
+
+        then:
+        executed ":createMyJvmLibJar", ":logMyJvmLibJar", ":myJvmLibJar"
+
+        and:
+        output.contains("Constructing binary: jar 'myJvmLib:jar'")
+    }
+
+    def "can define multiple jvm libraries in single project"() {
+        when:
+        buildFile << """
+    apply plugin: 'jvm-component'
+
+    jvm {
+        libraries {
+            myLibOne
+            myLibTwo
+        }
+    }
+
+    task check << {
+        assert jvm.libraries.size() == 2
+        assert jvm.libraries.myLibOne instanceof JvmLibrary
+        assert jvm.libraries.myLibTwo instanceof JvmLibrary
+
+        assert binaries.size() == 2
+        assert binaries.myLibOneJar.library == jvm.libraries.myLibOne
+        assert binaries.myLibTwoJar.library == jvm.libraries.myLibTwo
+    }
+"""
+        then:
+        succeeds "check"
+    }
+
+    def "can build multiple jvm libraries in single project"() {
+        given:
+        buildFile << """
+    apply plugin: 'jvm-component'
+
+    jvm {
+        libraries {
+            myLibOne
+            myLibTwo
+        }
+    }
+"""
+        when:
+        succeeds "myLibOneJar"
+
+        then:
+        executed ":createMyLibOneJar", ":myLibOneJar"
+        notExecuted ":myLibTwoJar"
+
+        when:
+        succeeds "assemble"
+
+        then:
+        executed ":createMyLibOneJar", ":myLibOneJar", ":createMyLibTwoJar", ":myLibTwoJar"
+    }
+}
\ No newline at end of file
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/java/JavaSourceSet.java b/subprojects/language-jvm/src/main/groovy/org/gradle/language/java/JavaSourceSet.java
index 1b698a14ccde..d39d026e3db4 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/java/JavaSourceSet.java
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/language/java/JavaSourceSet.java
@@ -16,7 +16,7 @@
 package org.gradle.language.java;
 
 import org.gradle.api.Incubating;
-import org.gradle.language.jvm.Classpath;
+import org.gradle.runtime.jvm.Classpath;
 import org.gradle.language.base.LanguageSourceSet;
 
 /**
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/java/internal/DefaultJavaSourceSet.java b/subprojects/language-jvm/src/main/groovy/org/gradle/language/java/internal/DefaultJavaSourceSet.java
index 1d5235568f43..ce5274b5a02a 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/java/internal/DefaultJavaSourceSet.java
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/language/java/internal/DefaultJavaSourceSet.java
@@ -21,7 +21,7 @@
 import org.gradle.language.base.FunctionalSourceSet;
 import org.gradle.language.base.internal.AbstractLanguageSourceSet;
 import org.gradle.language.java.JavaSourceSet;
-import org.gradle.language.jvm.Classpath;
+import org.gradle.runtime.jvm.Classpath;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/Classpath.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/Classpath.java
similarity index 96%
rename from subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/Classpath.java
rename to subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/Classpath.java
index 3603ba346530..c7ae0d500c55 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/Classpath.java
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/Classpath.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.jvm;
+package org.gradle.runtime.jvm;
 
 import org.gradle.api.Buildable;
 import org.gradle.api.Incubating;
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/UnresolvedSoftwareComponent.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmComponentExtension.java
similarity index 56%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/UnresolvedSoftwareComponent.java
rename to subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmComponentExtension.java
index 530fc7f912bb..cabc50f1b8ac 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/UnresolvedSoftwareComponent.java
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmComponentExtension.java
@@ -13,29 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.artifacts.resolution;
 
+package org.gradle.runtime.jvm;
+
+import org.gradle.api.Action;
 import org.gradle.api.Incubating;
-import org.gradle.api.artifacts.component.ComponentIdentifier;
+import org.gradle.api.NamedDomainObjectContainer;
 
 /**
- * A software component that couldn't be resolved.
- *
- * @since 1.12
+ * The configuration for jvm components created by this build.
  */
 @Incubating
-public interface UnresolvedSoftwareComponent {
+public interface JvmComponentExtension {
     /**
-     * Returns the ID of the component.
-     *
-     * @return the ID of the component
+     * Provides the set of JVM libraries that can be created by this build.
      */
-    ComponentIdentifier getId();
+    NamedDomainObjectContainer<JvmLibrary> getLibraries();
 
     /**
-     * Returns the failure that occurred when trying to resolve the component.
-     *
-     * @return the failure that occurred when trying to resolve the component
+     * Configures the set of JVM libraries.
      */
-    Throwable getFailure();
-}
\ No newline at end of file
+    void libraries(Action<? super NamedDomainObjectContainer<? super JvmLibrary>> action);
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmLibrary.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmLibrary.java
new file mode 100644
index 000000000000..f84a227a0ede
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmLibrary.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm;
+
+import org.gradle.api.Incubating;
+import org.gradle.runtime.base.Library;
+import org.gradle.runtime.base.ProjectComponent;
+
+/**
+ * A Library component that runs on the Java Virtual Machine.
+ */
+@Incubating
+public interface JvmLibrary extends Library, ProjectComponent {
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmLibraryBinary.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmLibraryBinary.java
new file mode 100644
index 000000000000..be3f2e73ae8f
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/JvmLibraryBinary.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm;
+
+import org.gradle.runtime.base.Binary;
+
+/**
+ * A JVM library binary.
+ *
+ * TODO:DAZ Is this a JvmJarFile? JvmLibraryJar? JvmLibraryBinary?
+ * How is this different from a ClassDirectoryBinary: 2 different packagings (linkages?) of the same target variant.
+ */
+public interface JvmLibraryBinary extends Binary {
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClasspath.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultClasspath.java
similarity index 94%
rename from subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClasspath.java
rename to subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultClasspath.java
index 3c8385b73d07..3f7c69c09325 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClasspath.java
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultClasspath.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.jvm.internal;
+package org.gradle.runtime.jvm.internal;
 
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.internal.file.FileResolver;
 import org.gradle.api.internal.file.collections.DefaultConfigurableFileCollection;
 import org.gradle.api.internal.tasks.TaskResolver;
-import org.gradle.language.jvm.Classpath;
+import org.gradle.runtime.jvm.Classpath;
 import org.gradle.api.tasks.TaskDependency;
 
 public class DefaultClasspath implements Classpath {
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibrary.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibrary.java
new file mode 100644
index 000000000000..0f6bfd2da490
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibrary.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal;
+
+
+import org.gradle.runtime.jvm.JvmLibrary;
+
+public class DefaultJvmLibrary implements JvmLibrary {
+    private final String name;
+
+    public DefaultJvmLibrary(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryBinary.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryBinary.java
new file mode 100644
index 000000000000..5641815efc7b
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryBinary.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal;
+
+import org.gradle.runtime.base.ProjectBinary;
+import org.gradle.runtime.base.internal.AbstractBuildableModelElement;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.jvm.JvmLibrary;
+
+public class DefaultJvmLibraryBinary extends AbstractBuildableModelElement implements ProjectBinary, JvmLibraryBinaryInternal {
+    private final JvmLibrary library;
+    private final BinaryNamingScheme namingScheme;
+
+    public DefaultJvmLibraryBinary(JvmLibrary library, BinaryNamingScheme namingScheme) {
+        this.library = library;
+        this.namingScheme = namingScheme;
+    }
+
+    public boolean isBuildable() {
+        return true;
+    }
+
+    public String getDisplayName() {
+        return namingScheme.getDescription();
+    }
+
+    @Override
+    public String toString() {
+        return getDisplayName();
+    }
+
+    public String getName() {
+        return namingScheme.getLifecycleTaskName();
+    }
+
+    public JvmLibrary getLibrary() {
+        return library;
+    }
+
+    public BinaryNamingScheme getNamingScheme() {
+        return namingScheme;
+    }
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/JvmLibraryBinaryInternal.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/JvmLibraryBinaryInternal.java
new file mode 100644
index 000000000000..516ac84f3a01
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/JvmLibraryBinaryInternal.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal;
+
+import org.gradle.runtime.base.internal.BinaryInternal;
+import org.gradle.runtime.jvm.JvmLibrary;
+import org.gradle.runtime.jvm.JvmLibraryBinary;
+
+public interface JvmLibraryBinaryInternal extends JvmLibraryBinary, BinaryInternal {
+    JvmLibrary getLibrary();
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/CreateJvmBinaries.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/CreateJvmBinaries.java
new file mode 100644
index 000000000000..9cf8c9b66618
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/CreateJvmBinaries.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal.plugins;
+
+import org.gradle.api.NamedDomainObjectCollection;
+import org.gradle.model.ModelRule;
+import org.gradle.model.Path;
+import org.gradle.runtime.base.BinaryContainer;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.internal.BinaryNamingSchemeBuilder;
+import org.gradle.runtime.jvm.JvmLibrary;
+import org.gradle.runtime.jvm.internal.DefaultJvmLibraryBinary;
+
+public class CreateJvmBinaries extends ModelRule {
+    private final BinaryNamingSchemeBuilder namingSchemeBuilder;
+
+    public CreateJvmBinaries(BinaryNamingSchemeBuilder namingSchemeBuilder) {
+        this.namingSchemeBuilder = namingSchemeBuilder;
+    }
+
+    void createBinaries(BinaryContainer binaries, @Path("jvm.libraries") NamedDomainObjectCollection<JvmLibrary> libraries) {
+        for (JvmLibrary jvmLibrary : libraries) {
+            BinaryNamingScheme namingScheme = namingSchemeBuilder
+                    .withComponentName(jvmLibrary.getName())
+                    .withTypeString("jar")
+                    .build();
+            binaries.add(new DefaultJvmLibraryBinary(jvmLibrary, namingScheme));
+        }
+    }
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/CreateTasksForJvmBinaries.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/CreateTasksForJvmBinaries.java
new file mode 100644
index 000000000000..2f1ca80def57
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/CreateTasksForJvmBinaries.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal.plugins;
+
+import org.gradle.api.Task;
+import org.gradle.api.tasks.TaskContainer;
+import org.gradle.api.tasks.bundling.Zip;
+import org.gradle.runtime.base.BinaryContainer;
+import org.gradle.runtime.jvm.internal.JvmLibraryBinaryInternal;
+import org.gradle.model.ModelRule;
+
+public class CreateTasksForJvmBinaries extends ModelRule {
+    void createTasks(TaskContainer tasks, BinaryContainer binaries) {
+        for (JvmLibraryBinaryInternal binary : binaries.withType(JvmLibraryBinaryInternal.class)) {
+            Task jarTask = createJarTask(tasks, binary);
+            binary.builtBy(jarTask);
+        }
+    }
+
+    private Task createJarTask(TaskContainer tasks, JvmLibraryBinaryInternal binary) {
+        // TODO:DAZ This should be a Jar task: need to move 'jar' and related infrastructure out of 'plugins' project
+        Zip jarTask = tasks.create(binary.getNamingScheme().getTaskName("create"), Zip.class);
+        jarTask.setDescription(String.format("Creates the binary file for %s.", binary.getDisplayName()));
+        return jarTask;
+    }
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/DefaultJvmComponentExtension.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/DefaultJvmComponentExtension.java
new file mode 100644
index 000000000000..777fe35c4ea1
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/internal/plugins/DefaultJvmComponentExtension.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal.plugins;
+
+import org.gradle.api.Action;
+import org.gradle.api.NamedDomainObjectContainer;
+import org.gradle.runtime.jvm.JvmLibrary;
+import org.gradle.runtime.jvm.JvmComponentExtension;
+
+public class DefaultJvmComponentExtension implements JvmComponentExtension {
+    private final NamedDomainObjectContainer<JvmLibrary> libraries;
+
+    public DefaultJvmComponentExtension(NamedDomainObjectContainer<JvmLibrary> libraries) {
+        this.libraries = libraries;
+    }
+
+    public NamedDomainObjectContainer<JvmLibrary> getLibraries() {
+        return libraries;
+    }
+
+    public void libraries(Action<? super NamedDomainObjectContainer<? super JvmLibrary>> action) {
+        action.execute(libraries);
+    }
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/package-info.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/package-info.java
new file mode 100644
index 000000000000..3e8d6865c427
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Types for support of JVM runtime.
+ */
+@Incubating
+package org.gradle.runtime.jvm;
+
+import org.gradle.api.Incubating;
\ No newline at end of file
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPlugin.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPlugin.java
new file mode 100644
index 000000000000..e768c3ed164c
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/plugins/JvmComponentPlugin.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.runtime.jvm.plugins;
+
+import org.gradle.api.*;
+import org.gradle.language.base.plugins.LanguageBasePlugin;
+import org.gradle.language.base.plugins.LifecycleBasePlugin;
+import org.gradle.model.ModelRules;
+import org.gradle.runtime.base.ProjectComponentContainer;
+import org.gradle.runtime.base.internal.DefaultBinaryNamingSchemeBuilder;
+import org.gradle.runtime.jvm.JvmLibrary;
+import org.gradle.runtime.jvm.internal.DefaultJvmLibrary;
+import org.gradle.runtime.jvm.internal.plugins.CreateJvmBinaries;
+import org.gradle.runtime.jvm.internal.plugins.CreateTasksForJvmBinaries;
+import org.gradle.runtime.jvm.internal.plugins.DefaultJvmComponentExtension;
+
+import javax.inject.Inject;
+
+/**
+ * Base plugin for JVM component support. Applies the {@link org.gradle.language.base.plugins.LanguageBasePlugin}.
+ * Registers the {@link org.gradle.runtime.jvm.JvmLibrary} library type for the {@link org.gradle.runtime.base.ProjectComponentContainer}.
+ */
+@Incubating
+public class JvmComponentPlugin implements Plugin<Project> {
+    private final ModelRules modelRules;
+
+    @Inject
+    public JvmComponentPlugin(ModelRules modelRules) {
+        this.modelRules = modelRules;
+    }
+
+    public void apply(final Project project) {
+        project.getPlugins().apply(LifecycleBasePlugin.class);
+        project.getPlugins().apply(LanguageBasePlugin.class);
+
+        ProjectComponentContainer softwareComponents = project.getExtensions().getByType(ProjectComponentContainer.class);
+        softwareComponents.registerFactory(JvmLibrary.class, new NamedDomainObjectFactory<JvmLibrary>() {
+            public JvmLibrary create(String name) {
+                return new DefaultJvmLibrary(name);
+            }
+        });
+
+        NamedDomainObjectContainer<JvmLibrary> jvmLibraries = softwareComponents.containerWithType(JvmLibrary.class);
+        project.getExtensions().create("jvm", DefaultJvmComponentExtension.class, jvmLibraries);
+
+        modelRules.register("jvm.libraries", jvmLibraries);
+
+        modelRules.rule(new CreateJvmBinaries(new DefaultBinaryNamingSchemeBuilder()));
+        modelRules.rule(new CreateTasksForJvmBinaries());
+    }
+}
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/plugins/package-info.java b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/plugins/package-info.java
new file mode 100644
index 000000000000..312571496867
--- /dev/null
+++ b/subprojects/language-jvm/src/main/groovy/org/gradle/runtime/jvm/plugins/package-info.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+/**
+ * Base plugins that add support for JVM runtime.
+ */
+@Incubating
+package org.gradle.runtime.jvm.plugins;
+
+import org.gradle.api.Incubating;
\ No newline at end of file
diff --git a/subprojects/language-jvm/src/test/groovy/org/gradle/language/java/internal/DefaultJavaSourceSetTest.groovy b/subprojects/language-jvm/src/test/groovy/org/gradle/language/java/internal/DefaultJavaSourceSetTest.groovy
index d55403ecfa57..b95756073154 100644
--- a/subprojects/language-jvm/src/test/groovy/org/gradle/language/java/internal/DefaultJavaSourceSetTest.groovy
+++ b/subprojects/language-jvm/src/test/groovy/org/gradle/language/java/internal/DefaultJavaSourceSetTest.groovy
@@ -16,7 +16,7 @@
 package org.gradle.language.java.internal
 
 import org.gradle.api.file.SourceDirectorySet
-import org.gradle.language.jvm.Classpath
+import org.gradle.runtime.jvm.Classpath
 import org.gradle.language.base.FunctionalSourceSet
 import spock.lang.Specification
 
diff --git a/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryBinaryTest.groovy b/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryBinaryTest.groovy
new file mode 100644
index 000000000000..243f601cc078
--- /dev/null
+++ b/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryBinaryTest.groovy
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal
+import org.gradle.runtime.base.internal.BinaryNamingScheme
+import org.gradle.runtime.jvm.JvmLibrary
+import spock.lang.Specification
+
+class DefaultJvmLibraryBinaryTest extends Specification {
+    def library = Mock(JvmLibrary)
+    def namingScheme = Mock(BinaryNamingScheme)
+
+    def "binary takes name and displayName from naming scheme"() {
+        when:
+        def binary = new DefaultJvmLibraryBinary(library, namingScheme)
+
+        and:
+        namingScheme.lifecycleTaskName >> "jvm-lib-jar"
+        namingScheme.description >> "the jar"
+
+        then:
+        binary.library == library
+        binary.name == "jvm-lib-jar"
+        binary.displayName == "the jar"
+    }
+}
diff --git a/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryTest.groovy b/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryTest.groovy
new file mode 100644
index 000000000000..88a84ef8cf3f
--- /dev/null
+++ b/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/DefaultJvmLibraryTest.groovy
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal
+
+import spock.lang.Specification
+
+class DefaultJvmLibraryTest extends Specification {
+    def "library has name"() {
+        when:
+        def library = new DefaultJvmLibrary("jvm-lib")
+
+        then:
+        library.name == "jvm-lib"
+    }
+}
diff --git a/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/plugins/CreateJvmBinariesTest.groovy b/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/plugins/CreateJvmBinariesTest.groovy
new file mode 100644
index 000000000000..04dfd28c7461
--- /dev/null
+++ b/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/plugins/CreateJvmBinariesTest.groovy
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal.plugins
+
+import org.gradle.runtime.base.Binary
+import org.gradle.runtime.base.BinaryContainer
+import org.gradle.runtime.base.internal.BinaryNamingScheme
+import org.gradle.runtime.base.internal.BinaryNamingSchemeBuilder
+import org.gradle.runtime.jvm.JvmLibrary
+import org.gradle.runtime.jvm.internal.DefaultJvmLibrary
+import org.gradle.runtime.jvm.internal.JvmLibraryBinaryInternal
+import spock.lang.Specification
+
+import static org.gradle.util.WrapUtil.toNamedDomainObjectSet
+
+class CreateJvmBinariesTest extends Specification {
+    def namingSchemeBuilder = Mock(BinaryNamingSchemeBuilder)
+    def rule = new CreateJvmBinaries(namingSchemeBuilder)
+    def binaries = Mock(BinaryContainer)
+
+    def "adds a binary for each jvm library"() {
+        def library = new DefaultJvmLibrary("jvmLibOne")
+        def namingScheme = Mock(BinaryNamingScheme)
+
+        when:
+        rule.createBinaries(binaries, toNamedDomainObjectSet(JvmLibrary, library))
+
+        then:
+        1 * namingSchemeBuilder.withComponentName("jvmLibOne") >> namingSchemeBuilder
+        1 * namingSchemeBuilder.withTypeString("jar") >> namingSchemeBuilder
+        1 * namingSchemeBuilder.build() >> namingScheme
+        1 * binaries.add({ JvmLibraryBinaryInternal binary ->
+            binary.namingScheme == namingScheme
+            binary.library == library
+        } as Binary)
+        0 * _
+    }
+}
diff --git a/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/plugins/CreateTasksForJvmBinariesTest.groovy b/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/plugins/CreateTasksForJvmBinariesTest.groovy
new file mode 100644
index 000000000000..77f44e9e618f
--- /dev/null
+++ b/subprojects/language-jvm/src/test/groovy/org/gradle/runtime/jvm/internal/plugins/CreateTasksForJvmBinariesTest.groovy
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.runtime.jvm.internal.plugins
+import org.gradle.api.tasks.TaskContainer
+import org.gradle.api.tasks.bundling.Zip
+import org.gradle.runtime.base.BinaryContainer
+import org.gradle.runtime.base.internal.BinaryNamingScheme
+import org.gradle.runtime.jvm.JvmLibraryBinary
+import org.gradle.runtime.jvm.internal.JvmLibraryBinaryInternal
+import spock.lang.Specification
+
+import static org.gradle.util.WrapUtil.toNamedDomainObjectSet
+
+class CreateTasksForJvmBinariesTest extends Specification {
+    def rule = new CreateTasksForJvmBinaries()
+    def tasks = Mock(TaskContainer)
+    def binaries = Mock(BinaryContainer)
+
+    def "creates a 'jar' tasks for each jvm library binary"() {
+        def jvmLibraryBinary = Mock(JvmLibraryBinaryInternal)
+        def namingScheme = Mock(BinaryNamingScheme)
+        def jarTask = Mock(Zip)
+
+        when:
+        1 * binaries.withType(JvmLibraryBinaryInternal) >> toNamedDomainObjectSet(JvmLibraryBinary, jvmLibraryBinary)
+
+        and:
+        rule.createTasks(tasks, binaries)
+
+        then:
+        _ * jvmLibraryBinary.name >> "binaryName"
+        _ * jvmLibraryBinary.displayName >> "binaryDisplayName"
+        1 * jvmLibraryBinary.namingScheme >> namingScheme
+        1 * namingScheme.getTaskName("create") >> "theTaskName"
+        1 * tasks.create("theTaskName", Zip) >> jarTask
+        1 * jarTask.setDescription("Creates the binary file for binaryDisplayName.")
+        1 * jvmLibraryBinary.builtBy(jarTask)
+        0 * _
+    }
+
+    def "does nothing for non-jvm binaries"() {
+        when:
+        1 * binaries.withType(JvmLibraryBinaryInternal) >> toNamedDomainObjectSet(JvmLibraryBinary)
+
+        and:
+        rule.createTasks(tasks, binaries)
+
+        then:
+        0 * _
+    }
+}
diff --git a/subprojects/launcher/src/integTest/groovy/org/gradle/launcher/GradleNativeIntegrationTest.groovy b/subprojects/launcher/src/integTest/groovy/org/gradle/launcher/GradleNativeIntegrationTest.groovy
new file mode 100644
index 000000000000..c5226ac570ae
--- /dev/null
+++ b/subprojects/launcher/src/integTest/groovy/org/gradle/launcher/GradleNativeIntegrationTest.groovy
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.launcher
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
+
+@Requires(TestPrecondition.NOT_UNKNOWN_OS)
+class GradleNativeIntegrationTest extends AbstractIntegrationSpec {
+    def "caches native binaries in specified user home"() {
+        given:
+        executer.requireOwnGradleUserHomeDir()
+        executer.requireGradleHome()
+
+        when:
+        succeeds "help"
+
+        then:
+        executer.gradleUserHomeDir.file("native").assertIsDir()
+    }
+}
diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/cli/CommandLineActionFactory.java b/subprojects/launcher/src/main/java/org/gradle/launcher/cli/CommandLineActionFactory.java
index 0dfcce31a822..d21cecb73636 100644
--- a/subprojects/launcher/src/main/java/org/gradle/launcher/cli/CommandLineActionFactory.java
+++ b/subprojects/launcher/src/main/java/org/gradle/launcher/cli/CommandLineActionFactory.java
@@ -15,20 +15,29 @@
  */
 package org.gradle.launcher.cli;
 
+import groovy.lang.GroovySystem;
+import org.apache.ivy.Ivy;
+import org.apache.tools.ant.Main;
 import org.gradle.BuildExceptionReporter;
 import org.gradle.api.Action;
-import org.gradle.internal.Actions;
 import org.gradle.cli.CommandLineArgumentException;
 import org.gradle.cli.CommandLineConverter;
 import org.gradle.cli.CommandLineParser;
 import org.gradle.cli.ParsedCommandLine;
 import org.gradle.configuration.GradleLauncherMetaData;
+import org.gradle.initialization.BuildLayoutParameters;
+import org.gradle.initialization.LayoutCommandLineConverter;
+import org.gradle.internal.Actions;
+import org.gradle.internal.jvm.Jvm;
+import org.gradle.internal.nativeplatform.services.NativeServices;
+import org.gradle.internal.os.OperatingSystem;
 import org.gradle.internal.service.ServiceRegistry;
 import org.gradle.launcher.bootstrap.ExecutionListener;
 import org.gradle.logging.LoggingConfiguration;
 import org.gradle.logging.LoggingManagerInternal;
 import org.gradle.logging.LoggingServiceRegistry;
 import org.gradle.logging.StyledTextOutputFactory;
+import org.gradle.logging.internal.LoggingCommandLineConverter;
 import org.gradle.util.GradleVersion;
 
 import java.io.PrintStream;
@@ -132,7 +141,30 @@ public void run() {
 
     private static class ShowVersionAction implements Runnable {
         public void run() {
-            System.out.println(GradleVersion.current().prettyPrint());
+            GradleVersion currentVersion = GradleVersion.current();
+
+            final StringBuilder sb = new StringBuilder();
+            sb.append("\n------------------------------------------------------------\nGradle ");
+            sb.append(currentVersion.getVersion());
+            sb.append("\n------------------------------------------------------------\n\nBuild time:   ");
+            sb.append(currentVersion.getBuildTime());
+            sb.append("\nBuild number: ");
+            sb.append(currentVersion.getBuildNumber());
+            sb.append("\nRevision:     ");
+            sb.append(currentVersion.getRevision());
+            sb.append("\n\nGroovy:       ");
+            sb.append(GroovySystem.getVersion());
+            sb.append("\nAnt:          ");
+            sb.append(Main.getAntVersion());
+            sb.append("\nIvy:          ");
+            sb.append(Ivy.getIvyVersion());
+            sb.append("\nJVM:          ");
+            sb.append(Jvm.current());
+            sb.append("\nOS:           ");
+            sb.append(OperatingSystem.current());
+            sb.append("\n");
+
+            System.out.println(sb.toString());
         }
     }
 
@@ -150,21 +182,27 @@ private static class WithLogging implements Action<ExecutionListener> {
         }
 
         public void execute(ExecutionListener executionListener) {
-            CommandLineConverter<LoggingConfiguration> loggingConfigurationConverter = (CommandLineConverter<LoggingConfiguration>)loggingServices.get(CommandLineConverter.class);
+            CommandLineConverter<LoggingConfiguration> loggingConfigurationConverter = new LoggingCommandLineConverter();
+            CommandLineConverter<BuildLayoutParameters> buildLayoutConverter = new LayoutCommandLineConverter();
+            BuildLayoutParameters buildLayout = new BuildLayoutParameters();
             CommandLineParser parser = new CommandLineParser();
             loggingConfigurationConverter.configure(parser);
+            buildLayoutConverter.configure(parser);
             parser.allowUnknownOptions();
             parser.allowMixedSubcommandsAndOptions();
             try {
                 ParsedCommandLine parsedCommandLine = parser.parse(args);
                 loggingConfigurationConverter.convert(parsedCommandLine, loggingConfiguration);
+                buildLayoutConverter.convert(parsedCommandLine, buildLayout);
             } catch (CommandLineArgumentException e) {
-                // Ignore
+                // Ignore, deal with this problem later
             }
 
             LoggingManagerInternal loggingManager = loggingServices.getFactory(LoggingManagerInternal.class).create();
             loggingManager.setLevel(loggingConfiguration.getLogLevel());
             loggingManager.start();
+
+            NativeServices.initialize(buildLayout.getGradleUserHomeDir());
             loggingManager.attachConsole(loggingConfiguration.isColorOutput());
 
             action.execute(executionListener);
diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/cli/converter/DaemonCommandLineConverter.java b/subprojects/launcher/src/main/java/org/gradle/launcher/cli/converter/DaemonCommandLineConverter.java
index 80166cf7f0f6..a5ce78c60d0a 100644
--- a/subprojects/launcher/src/main/java/org/gradle/launcher/cli/converter/DaemonCommandLineConverter.java
+++ b/subprojects/launcher/src/main/java/org/gradle/launcher/cli/converter/DaemonCommandLineConverter.java
@@ -20,7 +20,6 @@
 import org.gradle.cli.CommandLineArgumentException;
 import org.gradle.cli.CommandLineParser;
 import org.gradle.cli.ParsedCommandLine;
-import org.gradle.initialization.BuildLayoutParameters;
 import org.gradle.launcher.daemon.configuration.DaemonParameters;
 
 public class DaemonCommandLineConverter extends AbstractCommandLineConverter<DaemonParameters> {
@@ -28,10 +27,6 @@ public class DaemonCommandLineConverter extends AbstractCommandLineConverter<Dae
     private static final String DAEMON = "daemon";
     private static final String NO_DAEMON = "no-daemon";
 
-    protected DaemonParameters newInstance() {
-        return new DaemonParameters(new BuildLayoutParameters());
-    }
-
     public DaemonParameters convert(ParsedCommandLine args, DaemonParameters target) throws CommandLineArgumentException {
         if (args.hasOption(NO_DAEMON)) {
             return target.setEnabled(false);
diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/DaemonGreeter.java b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/DaemonGreeter.java
index eb49e9bb52a5..2369f6395724 100644
--- a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/DaemonGreeter.java
+++ b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/DaemonGreeter.java
@@ -34,7 +34,7 @@ public DaemonDiagnostics parseDaemonOutput(String output, ExecResult result) {
             throw new GradleException(prepareMessage(output, result));
         }
         String[] lines = output.split("\n");
-        //TODO SF don't assume it is the last line
+        //Assuming that the diagnostics were printed out to the last line. It's not bullet-proof but seems to be doing fine.
         String lastLine = lines[lines.length-1];
         return new DaemonStartupCommunication().readDiagnostics(lastLine);
     }
@@ -42,13 +42,6 @@ public DaemonDiagnostics parseDaemonOutput(String output, ExecResult result) {
     private String prepareMessage(String output, ExecResult result) {
         StringBuilder sb = new StringBuilder();
         sb.append(DaemonMessages.UNABLE_TO_START_DAEMON);
-        //TODO SF if possible, include the exit value.
-//        if (result.getExitValue()) {
-//            sb.append("\nThe process has exited with value: ");
-//            sb.append(result.getExecResult().getExitValue()).append(".");
-//        } else {
-//            sb.append("\nThe process may still be running.");
-//        }
         sb.append("\nThis problem might be caused by incorrect configuration of the daemon.");
         sb.append("\nFor example, an unrecognized jvm option is used.");
         sb.append("\nPlease refer to the user guide chapter on the daemon at ");
diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/DaemonStartupCommunication.java b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/DaemonStartupCommunication.java
index 3a8e61c3ff50..2b13bdbfd5e3 100644
--- a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/DaemonStartupCommunication.java
+++ b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/bootstrap/DaemonStartupCommunication.java
@@ -43,7 +43,7 @@ String daemonStartedMessage(Long pid, File daemonLog) {
     }
 
     public DaemonDiagnostics readDiagnostics(String message) {
-        //TODO SF dont assume the message has correct format
+        //Assuming the message has correct format. Not bullet proof, but seems to work ok for now.
         String[] split = message.split(DELIM);
         String pidString = split[1];
         Long pid = pidString.equals("null")? null : Long.valueOf(pidString);
diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonParameters.java b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonParameters.java
index 6f2f025c2d18..2a3e4a806ac8 100644
--- a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonParameters.java
+++ b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/configuration/DaemonParameters.java
@@ -15,7 +15,6 @@
  */
 package org.gradle.launcher.daemon.configuration;
 
-import org.gradle.StartParameter;
 import org.gradle.api.internal.file.IdentityFileResolver;
 import org.gradle.initialization.BuildLayoutParameters;
 import org.gradle.internal.jvm.Jvm;
@@ -33,7 +32,7 @@ public class DaemonParameters {
 
     private final String uid;
 
-    private File baseDir = new File(StartParameter.DEFAULT_GRADLE_USER_HOME, "daemon");
+    private File baseDir;
     private int idleTimeout = DEFAULT_IDLE_TIMEOUT;
     private final JvmOptions jvmOptions = new JvmOptions(new IdentityFileResolver());
     private boolean usingDefaultJvmArgs = true;
diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DefaultIncomingConnectionHandler.java b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DefaultIncomingConnectionHandler.java
index 076b3cbe5313..48b65a619bd3 100644
--- a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DefaultIncomingConnectionHandler.java
+++ b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/server/DefaultIncomingConnectionHandler.java
@@ -144,7 +144,7 @@ private Command receiveCommand(DaemonConnection daemonConnection) {
                 String message = String.format("Unable to receive command from connection: '%s'", connection);
                 LOGGER.warn(message + ". Dispatching the failure to the daemon client...", e);
                 daemonConnection.completed(new DaemonFailure(new RuntimeException(message, e)));
-                //TODO SF exception handling / send typed exception / refactor / unit test and apply the same for below
+                //TODO SF refactor for unit test coverage
                 return null;
             }
         }
diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/exec/InProcessBuildActionExecuter.java b/subprojects/launcher/src/main/java/org/gradle/launcher/exec/InProcessBuildActionExecuter.java
index 4e07adf221b7..c90d5a37a13e 100644
--- a/subprojects/launcher/src/main/java/org/gradle/launcher/exec/InProcessBuildActionExecuter.java
+++ b/subprojects/launcher/src/main/java/org/gradle/launcher/exec/InProcessBuildActionExecuter.java
@@ -17,11 +17,14 @@
 package org.gradle.launcher.exec;
 
 import org.gradle.BuildResult;
-import org.gradle.GradleLauncher;
 import org.gradle.StartParameter;
-import org.gradle.initialization.BuildController;
+import org.gradle.api.internal.GradleInternal;
 import org.gradle.initialization.BuildAction;
+import org.gradle.initialization.BuildController;
+import org.gradle.initialization.DefaultGradleLauncher;
 import org.gradle.initialization.GradleLauncherFactory;
+import org.gradle.internal.concurrent.CompositeStoppable;
+import org.gradle.internal.concurrent.Stoppable;
 
 public class InProcessBuildActionExecuter implements BuildActionExecuter<BuildActionParameters> {
     private final GradleLauncherFactory gradleLauncherFactory;
@@ -32,13 +35,19 @@ public InProcessBuildActionExecuter(GradleLauncherFactory gradleLauncherFactory)
 
     public <T> T execute(BuildAction<T> action, BuildActionParameters actionParameters) {
         DefaultBuildController buildController = new DefaultBuildController(gradleLauncherFactory, actionParameters);
-        return action.run(buildController);
+        try {
+            return action.run(buildController);
+        } finally {
+            buildController.stop();
+        }
     }
 
-    private static class DefaultBuildController implements BuildController {
+    private static class DefaultBuildController implements BuildController, Stoppable {
+        private enum State { NotStarted, Created, Completed }
+        private State state = State.NotStarted;
         private final BuildActionParameters actionParameters;
         private final GradleLauncherFactory gradleLauncherFactory;
-        private GradleLauncher gradleLauncher;
+        private DefaultGradleLauncher gradleLauncher;
         private StartParameter startParameter = new StartParameter();
 
         private DefaultBuildController(GradleLauncherFactory gradleLauncherFactory, BuildActionParameters actionParameters) {
@@ -47,31 +56,45 @@ private DefaultBuildController(GradleLauncherFactory gradleLauncherFactory, Buil
         }
 
         public void setStartParameter(StartParameter startParameter) {
-            if (gradleLauncher != null) {
-                throw new IllegalStateException("Cannot change start parameter after launcher has been created.");
+            if (state != State.NotStarted) {
+                throw new IllegalStateException("Cannot change start parameter after build has started.");
             }
             this.startParameter = startParameter;
         }
 
-        public GradleLauncher getLauncher() {
-            if (gradleLauncher == null) {
-                gradleLauncher = gradleLauncherFactory.newInstance(startParameter, actionParameters.getBuildRequestMetaData());
+        public DefaultGradleLauncher getLauncher() {
+            if (state == State.Completed) {
+                throw new IllegalStateException("Cannot use launcher after build has completed.");
+            }
+            if (state == State.NotStarted) {
+                gradleLauncher = (DefaultGradleLauncher) gradleLauncherFactory.newInstance(startParameter, actionParameters.getBuildRequestMetaData());
+                state = State.Created;
             }
             return gradleLauncher;
         }
 
-        public void run() {
-            check(getLauncher().run());
+        public GradleInternal getGradle() {
+            return getLauncher().getGradle();
         }
 
-        public void configure() {
-            check(getLauncher().getBuildAnalysis());
+        public GradleInternal run() {
+            return check(getLauncher().run());
         }
 
-        private void check(BuildResult buildResult) {
+        public GradleInternal configure() {
+            return check(getLauncher().getBuildAnalysis());
+        }
+
+        private GradleInternal check(BuildResult buildResult) {
+            state = State.Completed;
             if (buildResult.getFailure() != null) {
                 throw new ReportedException(buildResult.getFailure());
             }
+            return (GradleInternal) buildResult.getGradle();
+        }
+
+        public void stop() {
+            CompositeStoppable.stoppable(gradleLauncher).stop();
         }
     }
 }
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTask.java b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTask.java
index 84752e734577..369ffaa5081e 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTask.java
+++ b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTask.java
@@ -16,9 +16,12 @@
 
 package org.gradle.tooling.internal.impl;
 
+import org.gradle.TaskParameter;
+import org.gradle.tooling.internal.protocol.InternalLaunchable;
+
 import java.io.Serializable;
 
-public class LaunchableGradleTask implements Serializable, LaunchableImplementation {
+public class LaunchableGradleTask implements Serializable, InternalLaunchable, TaskParameter {
 
     private String path;
     private String name;
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTaskSelector.java b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTaskSelector.java
index 1a354596f599..5773ae92fcd0 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTaskSelector.java
+++ b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/impl/LaunchableGradleTaskSelector.java
@@ -16,7 +16,9 @@
 
 package org.gradle.tooling.internal.impl;
 
+import org.gradle.TaskParameter;
 import org.gradle.api.Nullable;
+import org.gradle.tooling.internal.protocol.InternalLaunchable;
 import org.gradle.tooling.model.TaskSelector;
 
 import java.io.Serializable;
@@ -24,7 +26,7 @@
 /**
  * Data used for {@link org.gradle.tooling.model.TaskSelector}.
  */
-public class LaunchableGradleTaskSelector implements TaskSelector, LaunchableImplementation, Serializable {
+public class LaunchableGradleTaskSelector implements TaskSelector, InternalLaunchable, TaskParameter, Serializable {
     private String name;
     private String displayName;
     private String description;
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/BuildModelAction.java b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/BuildModelAction.java
index badc54bccc4e..f310dc5fe60b 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/BuildModelAction.java
+++ b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/BuildModelAction.java
@@ -18,7 +18,9 @@
 import org.gradle.api.Action;
 import org.gradle.api.internal.GradleInternal;
 import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.initialization.*;
+import org.gradle.initialization.BuildAction;
+import org.gradle.initialization.BuildController;
+import org.gradle.initialization.ModelConfigurationListener;
 import org.gradle.tooling.internal.protocol.InternalUnsupportedModelException;
 import org.gradle.tooling.model.internal.ProjectSensitiveToolingModelBuilder;
 import org.gradle.tooling.provider.model.ToolingModelBuilder;
@@ -26,7 +28,6 @@
 import org.gradle.tooling.provider.model.UnknownModelException;
 
 import java.io.Serializable;
-import java.util.concurrent.atomic.AtomicReference;
 
 public class BuildModelAction implements BuildAction<BuildActionResult>, Serializable {
     private final boolean runTasks;
@@ -38,57 +39,37 @@ public BuildModelAction(String modelName, boolean runTasks) {
     }
 
     public BuildActionResult run(BuildController buildController) {
-        DefaultGradleLauncher launcher = (DefaultGradleLauncher) buildController.getLauncher();
-        final PayloadSerializer payloadSerializer = launcher.getGradle().getServices().get(PayloadSerializer.class);
-
-        // The following is all very awkward because the contract for BuildController is still just a
-        // rough wrapper around GradleLauncher, which means we can only get at the model and various
-        // services by using listeners.
-
-        final AtomicReference<Object> model = new AtomicReference<Object>();
-        final AtomicReference<RuntimeException> failure = new AtomicReference<RuntimeException>();
-        final Action<GradleInternal> action = new Action<GradleInternal>() {
-            public void execute(GradleInternal gradle) {
-                ToolingModelBuilderRegistry builderRegistry = getToolingModelBuilderRegistry(gradle);
-                ToolingModelBuilder builder;
-                try {
-                    builder = builderRegistry.getBuilder(modelName);
-                } catch (UnknownModelException e) {
-                    failure.set((InternalUnsupportedModelException) (new InternalUnsupportedModelException().initCause(e)));
-                    return;
-                }
-                Object result;
-                if (builder instanceof ProjectSensitiveToolingModelBuilder) {
-                    result = ((ProjectSensitiveToolingModelBuilder) builder).buildAll(modelName, gradle.getDefaultProject(), true);
-                } else {
-                    result = builder.buildAll(modelName, gradle.getDefaultProject());
-                }
-                model.set(result);
-            }
-        };
+        GradleInternal gradle = buildController.getGradle();
 
         if (runTasks) {
-            launcher.addListener(new TasksCompletionListener() {
-                public void onTasksFinished(GradleInternal gradle) {
-                    action.execute(gradle);
-                }
-            });
             buildController.run();
         } else {
-            launcher.addListener(new ModelConfigurationListener() {
+            gradle.addListener(new ModelConfigurationListener() {
                 public void onConfigure(GradleInternal gradle) {
                     // Currently need to force everything to be configured
                     ensureAllProjectsEvaluated(gradle);
-                    action.execute(gradle);
                 }
             });
             buildController.configure();
         }
 
-        if (failure.get() != null) {
-            throw failure.get();
+        ToolingModelBuilderRegistry builderRegistry = getToolingModelBuilderRegistry(gradle);
+        ToolingModelBuilder builder;
+        try {
+            builder = builderRegistry.getBuilder(modelName);
+        } catch (UnknownModelException e) {
+            throw (InternalUnsupportedModelException)new InternalUnsupportedModelException().initCause(e);
         }
-        return new BuildActionResult(payloadSerializer.serialize(model.get()), null);
+
+        Object result;
+        if (builder instanceof ProjectSensitiveToolingModelBuilder) {
+            result = ((ProjectSensitiveToolingModelBuilder) builder).buildAll(modelName, gradle.getDefaultProject(), true);
+        } else {
+            result = builder.buildAll(modelName, gradle.getDefaultProject());
+        }
+
+        PayloadSerializer payloadSerializer = gradle.getServices().get(PayloadSerializer.class);
+        return new BuildActionResult(payloadSerializer.serialize(result), null);
     }
 
     private ToolingModelBuilderRegistry getToolingModelBuilderRegistry(GradleInternal gradle) {
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClientProvidedBuildAction.java b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClientProvidedBuildAction.java
index 004925ec22a7..510752f31ba5 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClientProvidedBuildAction.java
+++ b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ClientProvidedBuildAction.java
@@ -21,14 +21,12 @@
 import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.initialization.BuildAction;
 import org.gradle.initialization.BuildController;
-import org.gradle.initialization.DefaultGradleLauncher;
 import org.gradle.initialization.ModelConfigurationListener;
 import org.gradle.tooling.internal.protocol.InternalBuildAction;
 import org.gradle.tooling.internal.protocol.InternalBuildActionFailureException;
 import org.gradle.tooling.internal.protocol.InternalBuildController;
 
 import java.io.Serializable;
-import java.util.concurrent.atomic.AtomicReference;
 
 class ClientProvidedBuildAction implements BuildAction<BuildActionResult>, Serializable {
     private final SerializedPayload action;
@@ -38,37 +36,31 @@ public ClientProvidedBuildAction(SerializedPayload action) {
     }
 
     public BuildActionResult run(final BuildController buildController) {
-        final DefaultGradleLauncher gradleLauncher = (DefaultGradleLauncher) buildController.getLauncher();
-        final PayloadSerializer payloadSerializer = gradleLauncher.getGradle().getServices().get(PayloadSerializer.class);
+        GradleInternal gradle = buildController.getGradle();
+        PayloadSerializer payloadSerializer = gradle.getServices().get(PayloadSerializer.class);
         final InternalBuildAction<?> action = (InternalBuildAction<?>) payloadSerializer.deserialize(this.action);
 
-        // The following is all very awkward because the contract for BuildController is still just a
-        // rough wrapper around GradleLauncher, which means we can only get at the model and various
-        // services by using listeners.
-
-        final AtomicReference<Object> result = new AtomicReference<Object>();
-        final AtomicReference<RuntimeException> failure = new AtomicReference<RuntimeException>();
-
-        gradleLauncher.addListener(new ModelConfigurationListener() {
+        gradle.addListener(new ModelConfigurationListener() {
             public void onConfigure(final GradleInternal gradle) {
                 // Currently need to force everything to be configured
                 ensureAllProjectsEvaluated(gradle);
-                InternalBuildController internalBuildController = new DefaultBuildController(gradle);
-                Object model = null;
-                try {
-                    model = action.execute(internalBuildController);
-                } catch (RuntimeException e) {
-                    failure.set(new InternalBuildActionFailureException(e));
-                }
-                result.set(model);
             }
         });
         buildController.configure();
 
-        if (failure.get() != null) {
-            return new BuildActionResult(null, payloadSerializer.serialize(failure.get()));
+        InternalBuildController internalBuildController = new DefaultBuildController(gradle);
+        Object model = null;
+        Throwable failure = null;
+        try {
+            model = action.execute(internalBuildController);
+        } catch (RuntimeException e) {
+            failure = new InternalBuildActionFailureException(e);
+        }
+
+        if (failure != null) {
+            return new BuildActionResult(null, payloadSerializer.serialize(failure));
         }
-        return new BuildActionResult(payloadSerializer.serialize(result.get()), null);
+        return new BuildActionResult(payloadSerializer.serialize(model), null);
     }
 
     private void ensureAllProjectsEvaluated(GradleInternal gradle) {
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ConfiguringBuildAction.java b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ConfiguringBuildAction.java
index dce07f0c8884..32025287edfe 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ConfiguringBuildAction.java
+++ b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ConfiguringBuildAction.java
@@ -15,14 +15,17 @@
  */
 package org.gradle.tooling.internal.provider;
 
+import com.google.common.base.Function;
+import com.google.common.collect.Iterables;
 import org.gradle.StartParameter;
+import org.gradle.TaskParameter;
 import org.gradle.api.logging.LogLevel;
 import org.gradle.cli.CommandLineArgumentException;
 import org.gradle.initialization.BuildAction;
 import org.gradle.initialization.BuildController;
 import org.gradle.initialization.DefaultCommandLineConverter;
+import org.gradle.internal.DefaultTaskParameter;
 import org.gradle.launcher.cli.converter.PropertiesToStartParameterConverter;
-import org.gradle.tooling.internal.impl.LaunchableImplementation;
 import org.gradle.tooling.internal.protocol.InternalLaunchable;
 import org.gradle.tooling.internal.protocol.exceptions.InternalUnsupportedBuildArgumentException;
 import org.gradle.tooling.internal.provider.connection.ProviderOperationParameters;
@@ -30,7 +33,6 @@
 
 import java.io.File;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -86,32 +88,23 @@ StartParameter configureStartParameter(PropertiesToStartParameterConverter prope
         }
 
         if (launchables != null) {
-            List<String> allTasks = new ArrayList<String>();
-            String projectPath = null;
-            for (InternalLaunchable launchable : launchables) {
-                if (launchable instanceof LaunchableImplementation) {
-                    LaunchableImplementation launchableImpl = (LaunchableImplementation) launchable;
-                    allTasks.add(launchableImpl.getTaskName());
-                    if (launchableImpl.getProjectPath() != null) {
-                        if (projectPath != null && !projectPath.equals(launchableImpl.getProjectPath())) {
+            startParameter.setTaskParameters(Iterables.transform(
+                    launchables,
+                    new Function<InternalLaunchable, TaskParameter>() {
+                        public TaskParameter apply(InternalLaunchable launchable) {
+                            if (launchable instanceof TaskParameter) {
+                                // make sure we don't send object graph with whole project structure back
+                                TaskParameter originalLaunchable = (TaskParameter) launchable;
+                                TaskParameter launchableImpl = new DefaultTaskParameter(
+                                        originalLaunchable.getTaskName(), originalLaunchable.getProjectPath());
+                                return launchableImpl;
+                            }
                             throw new InternalUnsupportedBuildArgumentException(
                                     "Problem with provided launchable arguments: " + launchables + ". "
-                                            + "\nOnly selector from the same Gradle project can be built."
+                                            + "\nOnly objects from this provider can be built."
                             );
                         }
-                        projectPath = launchableImpl.getProjectPath();
-                    }
-                } else {
-                    throw new InternalUnsupportedBuildArgumentException(
-                            "Problem with provided launchable arguments: " + launchables + ". "
-                                    + "\nOnly objects from this provider can be built."
-                    );
-                }
-            }
-            if (projectPath != null) {
-                startParameter.setProjectPath(projectPath);
-            }
-            startParameter.setTaskNames(allTasks);
+                    }));
         } else if (tasks != null) {
             startParameter.setTaskNames(tasks);
         }
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultConnection.java b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultConnection.java
index a2c19c859654..c5ce9e12cde9 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultConnection.java
+++ b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/DefaultConnection.java
@@ -19,19 +19,16 @@
 import org.gradle.internal.service.ServiceRegistry;
 import org.gradle.internal.service.ServiceRegistryBuilder;
 import org.gradle.logging.LoggingServiceRegistry;
+import org.gradle.tooling.UnsupportedVersionException;
 import org.gradle.tooling.internal.adapter.ProtocolToModelAdapter;
 import org.gradle.tooling.internal.consumer.versioning.ModelMapping;
 import org.gradle.tooling.internal.protocol.*;
 import org.gradle.tooling.internal.protocol.exceptions.InternalUnsupportedBuildArgumentException;
 import org.gradle.tooling.internal.provider.connection.*;
-import org.gradle.util.DeprecationLogger;
 import org.gradle.util.GradleVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
-import java.io.OutputStream;
-
 public class DefaultConnection implements InternalConnection, BuildActionRunner, ConfigurableConnection, ModelBuilder, InternalBuildActionExecutor {
     private static final Logger LOGGER = LoggerFactory.getLogger(DefaultConnection.class);
     private final ProtocolToModelAdapter adapter;
@@ -65,8 +62,7 @@ public void configure(ConnectionParameters parameters) {
      * This method was used by consumers 1.0-rc-1 through to 1.1. Later consumers use {@link #configure(org.gradle.tooling.internal.protocol.ConnectionParameters)} instead.
      */
     public void configureLogging(final boolean verboseLogging) {
-        ProviderConnectionParameters providerConnectionParameters = adapter.adapt(ProviderConnectionParameters.class, new VerboseLoggingOnlyConnectionParameters(verboseLogging));
-        connection.configure(providerConnectionParameters);
+        // Ignore - we don't support these consumer versions any more
     }
 
     /**
@@ -89,9 +85,7 @@ public void stop() {
      */
     @Deprecated
     public void executeBuild(BuildParametersVersion1 buildParameters, BuildOperationParametersVersion1 operationParameters) {
-        sendDeprecationMessage(operationParameters);
-        logTargetVersion();
-        connection.run(ModelIdentifier.NULL_MODEL, new AdaptedOperationParameters(operationParameters, buildParameters.getTasks()));
+        throw unsupportedConnectionException();
     }
 
     /**
@@ -99,9 +93,7 @@ public void executeBuild(BuildParametersVersion1 buildParameters, BuildOperation
      */
     @Deprecated
     public ProjectVersion3 getModel(Class<? extends ProjectVersion3> type, BuildOperationParametersVersion1 parameters) {
-        sendDeprecationMessage(parameters);
-        logTargetVersion();
-        return run(type, parameters);
+        throw unsupportedConnectionException();
     }
 
     /**
@@ -109,9 +101,7 @@ public ProjectVersion3 getModel(Class<? extends ProjectVersion3> type, BuildOper
      */
     @Deprecated
     public <T> T getTheModel(Class<T> type, BuildOperationParametersVersion1 parameters) {
-        sendDeprecationMessage(parameters);
-        logTargetVersion();
-        return run(type, parameters);
+        throw unsupportedConnectionException();
     }
 
     private <T> T run(Class<T> type, BuildOperationParametersVersion1 parameters) {
@@ -155,30 +145,11 @@ private void logTargetVersion() {
         LOGGER.info("Tooling API is using target Gradle version: {}.", GradleVersion.current().getVersion());
     }
 
-    private void sendDeprecationMessage(BuildOperationParametersVersion1 parameters) {
-        OutputStream out = parameters.getStandardOutput();
-        if (out != null) {
-            try {
-                out.write(String.format("Connection from tooling API older than version 1.2 %s%n", DeprecationLogger.getDeprecationMessage()).getBytes());
-            } catch (IOException e) {
-                throw new RuntimeException("Cannot write to stream", e);
-            }
-        }
+    private UnsupportedVersionException unsupportedConnectionException() {
+        return new UnsupportedVersionException("Consumers using version older than 1.2 are not supported.");
     }
 
     private ProviderOperationParameters toProviderParameters(BuildParameters buildParameters) {
         return adapter.adapt(ProviderOperationParameters.class, buildParameters, BuildLogLevelMixIn.class);
     }
-
-    private static class VerboseLoggingOnlyConnectionParameters {
-        private final boolean verboseLogging;
-
-        public VerboseLoggingOnlyConnectionParameters(boolean verboseLogging) {
-            this.verboseLogging = verboseLogging;
-        }
-
-        public boolean getVerboseLogging() {
-            return verboseLogging;
-        }
-    }
 }
\ No newline at end of file
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ProviderConnection.java b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ProviderConnection.java
index 2fd648926b34..867a3afe4691 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ProviderConnection.java
+++ b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/ProviderConnection.java
@@ -16,7 +16,6 @@
 
 package org.gradle.tooling.internal.provider;
 
-import org.gradle.StartParameter;
 import org.gradle.api.logging.LogLevel;
 import org.gradle.initialization.BuildAction;
 import org.gradle.initialization.BuildLayoutParameters;
@@ -41,7 +40,6 @@
 import org.gradle.tooling.internal.protocol.ModelIdentifier;
 import org.gradle.tooling.internal.provider.connection.ProviderConnectionParameters;
 import org.gradle.tooling.internal.provider.connection.ProviderOperationParameters;
-import org.gradle.util.GUtil;
 import org.gradle.util.GradleVersion;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -128,10 +126,12 @@ private BuildActionExecuter<ProviderOperationParameters> createExecuter(Provider
     }
 
     private Parameters initParams(ProviderOperationParameters operationParameters) {
-        BuildLayoutParameters layout = new BuildLayoutParameters()
-                .setGradleUserHomeDir(GUtil.elvis(operationParameters.getGradleUserHomeDir(), StartParameter.DEFAULT_GRADLE_USER_HOME))
-                .setSearchUpwards(operationParameters.isSearchUpwards() != null ? operationParameters.isSearchUpwards() : true)
-                .setProjectDir(operationParameters.getProjectDir());
+        BuildLayoutParameters layout = new BuildLayoutParameters();
+        if (operationParameters.getGradleUserHomeDir() != null) {
+            layout.setGradleUserHomeDir(operationParameters.getGradleUserHomeDir());
+        }
+        layout.setSearchUpwards(operationParameters.isSearchUpwards() != null ? operationParameters.isSearchUpwards() : true);
+        layout.setProjectDir(operationParameters.getProjectDir());
 
         Map<String, String> properties = new HashMap<String, String>();
         new LayoutToPropertiesConverter().convert(layout, properties);
diff --git a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/connection/BuildLogLevelMixIn.java b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/connection/BuildLogLevelMixIn.java
index b7994403f1de..3b9c7c7ad3cc 100644
--- a/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/connection/BuildLogLevelMixIn.java
+++ b/subprojects/launcher/src/main/java/org/gradle/tooling/internal/provider/connection/BuildLogLevelMixIn.java
@@ -41,7 +41,7 @@ public LogLevel getBuildLogLevel() {
             return LogLevel.DEBUG;
         }
 
-        LoggingConfiguration loggingConfiguration = converter.convert(parsedCommandLine);
+        LoggingConfiguration loggingConfiguration = converter.convert(parsedCommandLine, new LoggingConfiguration());
         return loggingConfiguration.getLogLevel();
     }
 }
\ No newline at end of file
diff --git a/subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/CommandLineActionFactoryTest.groovy b/subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/CommandLineActionFactoryTest.groovy
index ea9f0468a546..3a29748583da 100644
--- a/subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/CommandLineActionFactoryTest.groovy
+++ b/subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/CommandLineActionFactoryTest.groovy
@@ -15,14 +15,20 @@
  */
 package org.gradle.launcher.cli
 
+import org.apache.ivy.Ivy
+import org.apache.tools.ant.Main
 import org.gradle.api.Action
 import org.gradle.cli.CommandLineArgumentException
-import org.gradle.cli.CommandLineConverter
 import org.gradle.cli.CommandLineParser
 import org.gradle.internal.Factory
+import org.gradle.internal.jvm.Jvm
+import org.gradle.internal.os.OperatingSystem
 import org.gradle.internal.service.ServiceRegistry
 import org.gradle.launcher.bootstrap.ExecutionListener
-import org.gradle.logging.*
+import org.gradle.logging.LoggingManagerInternal
+import org.gradle.logging.ProgressLoggerFactory
+import org.gradle.logging.StyledTextOutput
+import org.gradle.logging.StyledTextOutputFactory
 import org.gradle.logging.internal.OutputEventListener
 import org.gradle.logging.internal.StreamingStyledTextOutput
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
@@ -41,7 +47,6 @@ class CommandLineActionFactoryTest extends Specification {
     TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider();
     final ExecutionListener executionListener = Mock()
     final ServiceRegistry loggingServices = Mock()
-    final CommandLineConverter<LoggingConfiguration> loggingConfigurationConverter = Mock()
     final LoggingManagerInternal loggingManager = Mock()
     final CommandLineAction actionFactory1 = Mock()
     final CommandLineAction actionFactory2 = Mock()
@@ -61,7 +66,6 @@ class CommandLineActionFactoryTest extends Specification {
     def setup() {
         ProgressLoggerFactory progressLoggerFactory = Mock()
         _ * loggingServices.get(ProgressLoggerFactory) >> progressLoggerFactory
-        _ * loggingServices.get(CommandLineConverter) >> loggingConfigurationConverter
         _ * loggingServices.get(OutputEventListener) >> Mock(OutputEventListener)
         Factory<LoggingManagerInternal> loggingManagerFactory = Mock()
         _ * loggingServices.getFactory(LoggingManagerInternal) >> loggingManagerFactory
@@ -149,7 +153,7 @@ class CommandLineActionFactoryTest extends Specification {
         0 * executionListener._
     }
 
-    def "ignores failure to parse logging configuration"() {
+    def "continues on failure to parse logging configuration"() {
         when:
         def action = factory.convert(["--logging=broken"])
         action.execute(executionListener)
@@ -161,7 +165,6 @@ class CommandLineActionFactoryTest extends Specification {
         outputs.stdErr.contains('--some-option')
 
         and:
-        1 * loggingConfigurationConverter.configure(!null) >> {CommandLineParser parser -> parser.option("logging").hasArgument(String)}
         1 * actionFactory1.configureCommandLineParser(!null) >> {CommandLineParser parser -> parser.option('some-option')}
         1 * executionListener.onFailure({it instanceof CommandLineArgumentException})
         0 * executionListener._
@@ -213,12 +216,29 @@ class CommandLineActionFactoryTest extends Specification {
     }
 
     def "displays version message"() {
+        def version = GradleVersion.current()
+        def expectedText = """
+------------------------------------------------------------
+Gradle ${version.version}
+------------------------------------------------------------
+
+Build time:   $version.buildTime
+Build number: $version.buildNumber
+Revision:     $version.revision
+
+Groovy:       $GroovySystem.version
+Ant:          $Main.antVersion
+Ivy:          ${Ivy.ivyVersion}
+JVM:          ${Jvm.current()}
+OS:           ${OperatingSystem.current()}
+"""
+
         when:
         def action = factory.convert([option])
         action.execute(executionListener)
 
         then:
-        outputs.stdOut.contains(GradleVersion.current().prettyPrint())
+        outputs.stdOut.contains(expectedText)
 
         and:
         1 * loggingManager.start()
diff --git a/subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/converter/DaemonCommandLineConverterTest.groovy b/subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/converter/DaemonCommandLineConverterTest.groovy
index 05873ef643d8..702aec61e228 100644
--- a/subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/converter/DaemonCommandLineConverterTest.groovy
+++ b/subprojects/launcher/src/test/groovy/org/gradle/launcher/cli/converter/DaemonCommandLineConverterTest.groovy
@@ -17,6 +17,7 @@
 package org.gradle.launcher.cli.converter
 
 import org.gradle.cli.CommandLineParser
+import org.gradle.initialization.BuildLayoutParameters
 import org.gradle.launcher.daemon.configuration.DaemonParameters
 import spock.lang.Specification
 
@@ -34,6 +35,6 @@ class DaemonCommandLineConverterTest extends Specification {
         CommandLineParser parser = new CommandLineParser()
         def converter = new DaemonCommandLineConverter()
         converter.configure(parser)
-        converter.convert(args)
+        converter.convert(args, new DaemonParameters(new BuildLayoutParameters()))
     }
 }
diff --git a/subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/configuration/DaemonParametersTest.groovy b/subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/configuration/DaemonParametersTest.groovy
index be8f20b84c5f..81fd1ee6c761 100644
--- a/subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/configuration/DaemonParametersTest.groovy
+++ b/subprojects/launcher/src/test/groovy/org/gradle/launcher/daemon/configuration/DaemonParametersTest.groovy
@@ -15,7 +15,6 @@
  */
 package org.gradle.launcher.daemon.configuration
 
-import org.gradle.StartParameter
 import org.gradle.initialization.BuildLayoutParameters
 import spock.lang.Specification
 
@@ -37,7 +36,7 @@ class DaemonParametersTest extends Specification {
     void assertDefaultValues() {
         assert !parameters.enabled
         assert parameters.idleTimeout == DaemonParameters.DEFAULT_IDLE_TIMEOUT
-        def baseDir = new File(StartParameter.DEFAULT_GRADLE_USER_HOME, "daemon")
+        def baseDir = new File(new BuildLayoutParameters().getGradleUserHomeDir(), "daemon")
         assert parameters.baseDir == baseDir
         assert parameters.systemProperties.isEmpty()
         assert parameters.effectiveJvmArgs.containsAll(parameters.defaultJvmArgs)
diff --git a/subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/InProcessBuildActionExecuterTest.groovy b/subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/InProcessBuildActionExecuterTest.groovy
index a3768a3567d2..bc68e7f248b6 100644
--- a/subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/InProcessBuildActionExecuterTest.groovy
+++ b/subprojects/launcher/src/test/groovy/org/gradle/launcher/exec/InProcessBuildActionExecuterTest.groovy
@@ -16,29 +16,40 @@
 
 package org.gradle.launcher.exec
 
-import org.gradle.initialization.BuildController
-import spock.lang.Specification
-import org.gradle.initialization.GradleLauncherFactory
-import org.gradle.initialization.BuildAction
-
-import org.gradle.initialization.BuildRequestMetaData
-import org.gradle.GradleLauncher
 import org.gradle.BuildResult
-
 import org.gradle.StartParameter
+import org.gradle.api.internal.GradleInternal
+import org.gradle.initialization.*
+import spock.lang.Specification
 
 class InProcessBuildActionExecuterTest extends Specification {
     final GradleLauncherFactory factory = Mock()
-    final GradleLauncher launcher = Mock()
+    final DefaultGradleLauncher launcher = Mock()
     final BuildActionParameters param = Mock()
     final BuildRequestMetaData metaData = Mock()
     final BuildResult buildResult = Mock()
+    final GradleInternal gradle = Mock()
     final InProcessBuildActionExecuter executer = new InProcessBuildActionExecuter(factory)
 
     def setup() {
         _ * param.buildRequestMetaData >> metaData
     }
 
+    def "does nothing when action does not use the build"() {
+        BuildAction<String> action = Mock()
+
+        when:
+        def result = executer.execute(action, param)
+
+        then:
+        result == '<result>'
+
+        and:
+        1 * action.run(!null) >> { BuildController controller ->
+            return '<result>'
+        }
+    }
+
     def "creates a launcher using a default StartParameter when the action does not specify any"() {
         BuildAction<String> action = Mock()
 
@@ -54,6 +65,7 @@ class InProcessBuildActionExecuterTest extends Specification {
             assert controller.launcher == launcher
             return '<result>'
         }
+        1 * launcher.stop()
     }
 
     def "creates a launcher using StartParameter specified by the action"() {
@@ -73,6 +85,7 @@ class InProcessBuildActionExecuterTest extends Specification {
             assert controller.launcher == launcher
             return '<result>'
         }
+        1 * launcher.stop()
     }
 
     def "cannot set start parameters after launcher created"() {
@@ -91,7 +104,29 @@ class InProcessBuildActionExecuterTest extends Specification {
 
         then:
         IllegalStateException e = thrown()
-        e.message == 'Cannot change start parameter after launcher has been created.'
+        e.message == 'Cannot change start parameter after build has started.'
+
+        and:
+        1 * launcher.stop()
+    }
+
+    def "creates launcher when Gradle instance is requested"() {
+        BuildAction<String> action = Mock()
+
+        when:
+        def result = executer.execute(action, param)
+
+        then:
+        result == '<result>'
+
+        and:
+        1 * factory.newInstance(!null, metaData) >> launcher
+        1 * launcher.getGradle() >> gradle
+        1 * action.run(!null) >> { BuildController controller ->
+            assert controller.getGradle() == gradle
+            return '<result>'
+        }
+        1 * launcher.stop()
     }
 
     def "runs build when requested by action"() {
@@ -107,10 +142,12 @@ class InProcessBuildActionExecuterTest extends Specification {
         1 * factory.newInstance(!null, metaData) >> launcher
         1 * launcher.run() >> buildResult
         _ * buildResult.failure >> null
+        _ * buildResult.gradle >> gradle
         1 * action.run(!null) >> { BuildController controller ->
-            controller.run()
+            assert controller.run() == gradle
             return '<result>'
         }
+        1 * launcher.stop()
     }
 
     def "configures build when requested by action"() {
@@ -126,10 +163,34 @@ class InProcessBuildActionExecuterTest extends Specification {
         1 * factory.newInstance(!null, metaData) >> launcher
         1 * launcher.getBuildAnalysis() >> buildResult
         _ * buildResult.failure >> null
+        _ * buildResult.gradle >> gradle
         1 * action.run(!null) >> { BuildController controller ->
-            controller.configure()
+            assert controller.configure() == gradle
             return '<result>'
         }
+        1 * launcher.stop()
+    }
+
+    def "cannot request configuration after build has been run"() {
+        BuildAction<String> action = Mock()
+
+        given:
+        action.run(!null) >> { BuildController controller ->
+            controller.run()
+            controller.configure()
+        }
+
+        when:
+        executer.execute(action, param)
+
+        then:
+        IllegalStateException e = thrown()
+        e.message == 'Cannot use launcher after build has completed.'
+
+        and:
+        1 * factory.newInstance(!null, metaData) >> launcher
+        1 * launcher.run() >> buildResult
+        1 * launcher.stop()
     }
 
     def "wraps build failure"() {
@@ -152,5 +213,6 @@ class InProcessBuildActionExecuterTest extends Specification {
         1 * action.run(!null) >> { BuildController controller ->
             controller.run()
         }
+        1 * launcher.stop()
     }
 }
diff --git a/subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/AbstractClassGraphSpec.groovy b/subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/AbstractClassGraphSpec.groovy
index 246d80b31671..2a979afe7b63 100644
--- a/subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/AbstractClassGraphSpec.groovy
+++ b/subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/AbstractClassGraphSpec.groovy
@@ -48,14 +48,14 @@ abstract class AbstractClassGraphSpec extends Specification {
     }
 
     /**
-     * Returns a URLClassLoader with the given classpath and parent. Parent defaults to system ClassLoader.
+     * Returns a URLClassLoader with the given classpath and root. Parent defaults to system ClassLoader.
      */
     URLClassLoader urlClassLoader(ClassLoader parent = ClassLoader.systemClassLoader.parent, List<File> classpath) {
         return new URLClassLoader(classpath.collect { it.toURI().toURL() } as URL[], parent)
     }
 
     /**
-     * Returns a custom ClassLoader with the given classpath and parent. Parent defaults to system ClassLoader.
+     * Returns a custom ClassLoader with the given classpath and root. Parent defaults to system ClassLoader.
      */
     ClassLoader customClassLoader(ClassLoader parent = ClassLoader.systemClassLoader.parent, List<File> classpath) {
         return new TestClassLoader(parent, classpath)
diff --git a/subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ConfiguringBuildActionTest.groovy b/subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ConfiguringBuildActionTest.groovy
index 0bcd189e3ba1..61c8745cbf0b 100644
--- a/subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ConfiguringBuildActionTest.groovy
+++ b/subprojects/launcher/src/test/groovy/org/gradle/tooling/internal/provider/ConfiguringBuildActionTest.groovy
@@ -18,9 +18,10 @@
 
 package org.gradle.tooling.internal.provider
 
+import org.gradle.TaskParameter
 import org.gradle.launcher.cli.converter.PropertiesToStartParameterConverter
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
-import org.gradle.tooling.internal.impl.LaunchableImplementation
+import org.gradle.tooling.internal.protocol.InternalLaunchable
 import org.gradle.tooling.internal.provider.connection.ProviderOperationParameters
 import org.junit.Rule
 import spock.lang.Specification
@@ -102,9 +103,11 @@ class ConfiguringBuildActionTest extends Specification {
         assertThat(new ConfiguringBuildAction({} as ProviderOperationParameters, null, [foo: 'bar']), isSerializable())
     }
 
+    abstract class LaunchableParameter implements InternalLaunchable, TaskParameter {}
+
     def "accepts launchables from consumer"() {
         given:
-        def selector = Mock(LaunchableImplementation)
+        def selector = Mock(LaunchableParameter)
         _ * selector.taskName >> 'myTask'
         _ * selector.projectPath >> ':child'
 
@@ -117,6 +120,6 @@ class ConfiguringBuildActionTest extends Specification {
         def start = action.configureStartParameter()
 
         then:
-        start.projectPath == ':child'
+        start.taskParameters.size() == 1
     }
 }
diff --git a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/AbstractMavenPublishIntegTest.groovy b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/AbstractMavenPublishIntegTest.groovy
index 16c3321540bf..8262117b8179 100644
--- a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/AbstractMavenPublishIntegTest.groovy
+++ b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/AbstractMavenPublishIntegTest.groovy
@@ -43,7 +43,7 @@ class AbstractMavenPublishIntegTest extends AbstractIntegrationSpec {
         resolve(group: '${sq(module.groupId)}', name: '${sq(module.artifactId)}', version: '${sq(module.version)}') {
 """
         additionalArtifacts.each {
-            // TODO:DAZ Docs say type defaults to 'jar', but seems it must be set explicitly
+            // Docs say type defaults to 'jar', but seems it must be set explicitly
             def type = it.type == null ? 'jar' : it.type
             dependencies += """
             artifact {
@@ -62,7 +62,6 @@ class AbstractMavenPublishIntegTest extends AbstractIntegrationSpec {
 
     protected def doResolveArtifacts(def dependencies) {
         // Replace the existing buildfile with one for resolving the published module
-        // TODO:DAZ Use a separate directory for resolving
         settingsFile.text = "rootProject.name = 'resolve'"
         buildFile.text = """
             configurations {
@@ -80,7 +79,6 @@ class AbstractMavenPublishIntegTest extends AbstractIntegrationSpec {
 
 """
 
-        // TODO:DAZ Remove this requirement (by always publishing a jar/war/ear in tests?: Maven doesn't really support other file types as main artifact)
         executer.withDeprecationChecksDisabled()
         run "resolveArtifacts"
         def artifactsList = file("artifacts").exists() ? file("artifacts").list() : []
diff --git a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy
index 9bad3713bc79..d42123fdc533 100644
--- a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy
+++ b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishArtifactCustomizationIntegTest.groovy
@@ -194,7 +194,7 @@ class MavenPublishArtifactCustomizationIntegTest extends AbstractMavenPublishInt
         module.assertPublished()
         module.assertArtifactsPublished("projectText-1.0.pom", "projectText-1.0.jar", "projectText-1.0-classified")
 
-        // TODO:DAZ Find a way to resolve Maven artifact with no extension
+        // TODO Find a way to resolve Maven artifact with no extension
 //        and:
 //        resolveArtifact(module, '', 'classified') == ["projectText-1.0-classifier"]
     }
diff --git a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishBasicIntegTest.groovy b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishBasicIntegTest.groovy
index 85a36b9d6e15..be69832753c5 100644
--- a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishBasicIntegTest.groovy
+++ b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishBasicIntegTest.groovy
@@ -83,6 +83,9 @@ class MavenPublishBasicIntegTest extends AbstractMavenPublishIntegTest {
         def module = mavenRepo.module('org.gradle.test', 'empty-project', '1.0')
         module.assertPublishedAsPomModule()
         module.parsedPom.scopes.isEmpty()
+
+        and:
+        resolveArtifacts(module) == []
     }
 
     def "can publish simple jar"() {
diff --git a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishHttpIntegTest.groovy b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishHttpIntegTest.groovy
index 3ece02b72c0d..66b2585debdf 100644
--- a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishHttpIntegTest.groovy
+++ b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishHttpIntegTest.groovy
@@ -18,8 +18,8 @@ package org.gradle.api.publish.maven
 
 import org.gradle.api.internal.artifacts.repositories.DefaultPasswordCredentials
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
-import org.gradle.test.fixtures.maven.MavenHttpModule
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpModule
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.hamcrest.Matchers
 import org.junit.Rule
diff --git a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishIdentifierValidationIntegTest.groovy b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishIdentifierValidationIntegTest.groovy
index 4fcca2fc401d..042f7bd5f1bf 100644
--- a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishIdentifierValidationIntegTest.groovy
+++ b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishIdentifierValidationIntegTest.groovy
@@ -25,7 +25,7 @@ class MavenPublishIdentifierValidationIntegTest extends AbstractMavenPublishInte
     def artifactId = 'valid_artifact.name'
 
     @Unroll
-    def "can publish with version and description containing #title characters"() {
+    def "can publish with version and description containing #identifier characters"() {
         given:
         def version = identifier.safeForFileName().decorate("version")
         def description = identifier.decorate("description")
@@ -63,16 +63,11 @@ class MavenPublishIdentifierValidationIntegTest extends AbstractMavenPublishInte
         resolveArtifacts(module) == ["${artifactId}-${version}.jar"]
 
         where:
-        title        | identifier
-        "punctuation"| Identifier.punctuation
-        "non-ascii"  | Identifier.nonAscii
-        "whitespace" | Identifier.whiteSpace
-        "filesystem" | Identifier.fileSystemReserved
-        "xml markup" | Identifier.xmlMarkup
+        identifier << Identifier.all
     }
 
     @Unroll
-    def "can publish artifacts with version, extension and classifier containing #title characters"() {
+    def "can publish artifacts with version, extension and classifier containing #identifier characters"() {
         given:
         file("content-file") << "some content"
         def version = identifier.safeForFileName().decorate("version")
@@ -113,12 +108,7 @@ class MavenPublishIdentifierValidationIntegTest extends AbstractMavenPublishInte
         resolveArtifact(module, extension, classifier) == ["${artifactId}-${version}-${classifier}.${extension}"]
 
         where:
-        title        | identifier
-        "punctuation"| Identifier.punctuation
-        "non-ascii"  | Identifier.nonAscii
-        "whitespace" | Identifier.whiteSpace
-        "filesystem" | Identifier.fileSystemReserved
-        "xml markup" | Identifier.xmlMarkup
+        identifier << Identifier.all
     }
 
     def "fails with reasonable error message for invalid identifier value"() {
diff --git a/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishSftpIntegrationTest.groovy b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishSftpIntegrationTest.groovy
new file mode 100644
index 000000000000..b669ddc4012d
--- /dev/null
+++ b/subprojects/maven/src/integTest/groovy/org/gradle/api/publish/maven/MavenPublishSftpIntegrationTest.groovy
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.publish.maven
+
+import org.gradle.test.fixtures.server.sftp.MavenSftpRepository
+import org.gradle.test.fixtures.server.sftp.SFTPServer
+import org.junit.Rule
+import spock.lang.Ignore
+
+class MavenPublishSftpIntegrationTest extends AbstractMavenPublishIntegTest {
+    @Rule
+    final SFTPServer server = new SFTPServer(this)
+
+    MavenSftpRepository getMavenSftpRepo() {
+        new MavenSftpRepository(server, '/repo')
+    }
+
+    // TODO: Ben - probably need to register Wagon SSH dependencies
+    @Ignore
+    def "can publish to a SFTP repository"() {
+        given:
+        def mavenSftpRepo = getMavenSftpRepo()
+        mavenSftpRepo.module('org.group.name', 'publish', '2')
+
+        settingsFile << 'rootProject.name = "publish"'
+        buildFile << """
+            apply plugin: 'java'
+            apply plugin: 'maven-publish'
+
+            version = '2'
+            group = 'org.group.name'
+
+            publishing {
+                repositories {
+                    maven {
+                        url "${mavenSftpRepo.uri}"
+                        credentials {
+                            username 'sftp'
+                            password 'sftp'
+                        }
+                    }
+                }
+                publications {
+                    maven(MavenPublication) {
+                        from components.java
+                    }
+                }
+            }
+        """
+
+        when:
+        succeeds 'publish'
+
+        then:
+        file('libs').assertHasDescendants 'publish-2.jar'
+    }
+}
diff --git a/subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishIntegrationTest.groovy b/subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishIntegrationTest.groovy
index dbb5de02bfed..0b90f3e95e4d 100644
--- a/subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishIntegrationTest.groovy
+++ b/subprojects/maven/src/integTest/groovy/org/gradle/integtests/publish/maven/MavenPublishIntegrationTest.groovy
@@ -17,7 +17,7 @@ package org.gradle.integtests.publish.maven
 
 import org.gradle.integtests.fixtures.AbstractIntegrationSpec
 import org.gradle.test.fixtures.maven.M2Installation
-import org.gradle.test.fixtures.maven.MavenHttpRepository
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
 import org.gradle.test.fixtures.maven.MavenLocalRepository
 import org.gradle.test.fixtures.server.http.HttpServer
 import org.gradle.util.GradleVersion
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java
index 3ba0bd54d823..788a68c69413 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/ant/AbstractMavenResolver.java
@@ -40,12 +40,11 @@
 import org.apache.maven.settings.Settings;
 import org.apache.tools.ant.Project;
 import org.gradle.api.Action;
-import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.artifacts.PublishArtifact;
 import org.gradle.api.artifacts.maven.*;
 import org.gradle.api.internal.ClosureBackedAction;
 import org.gradle.api.internal.artifacts.ModuleVersionPublisher;
-import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleVersionRepository;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.ConfiguredModuleComponentRepository;
 import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.NoOpRepositoryCacheManager;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionArtifactPublishMetaData;
 import org.gradle.api.internal.artifacts.metadata.ModuleVersionPublishMetaData;
@@ -83,7 +82,7 @@ public AbstractMavenResolver(PomFilterContainer pomFilterContainer, ArtifactPomC
         this.loggingManager = loggingManager;
     }
 
-    public ConfiguredModuleVersionRepository createResolver() {
+    public ConfiguredModuleComponentRepository createResolver() {
         throw new UnsupportedOperationException("A Maven deployer cannot be used to resolve dependencies. It can only be used to publish artifacts.");
     }
 
@@ -174,7 +173,6 @@ public void commitPublishTransaction() throws IOException {
     }
 
     public void publish(ModuleVersionPublishMetaData moduleVersion) {
-        ModuleVersionIdentifier id = moduleVersion.getId();
         for (ModuleVersionArtifactPublishMetaData artifact : moduleVersion.getArtifacts()) {
             collectArtifact(artifact.toIvyArtifact(), artifact.getFile());
         }
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publication/MavenPublicationInternal.java b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publication/MavenPublicationInternal.java
index 7d30dee6fd27..5a6445e2b9a1 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publication/MavenPublicationInternal.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/internal/publication/MavenPublicationInternal.java
@@ -39,7 +39,7 @@ public interface MavenPublicationInternal extends MavenPublication, PublicationI
 
     MavenNormalizedPublication asNormalisedPublication();
 
-    // TODO:DAZ Remove this attempt to guess packaging from artifacts. Packaging should come from component, or be explicitly set.
+    // TODO Remove this attempt to guess packaging from artifacts. Packaging should come from component, or be explicitly set.
     String determinePackagingFromArtifacts();
 
 }
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/GenerateMavenPom.java b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/GenerateMavenPom.java
index e821dd42817d..1156193140d9 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/GenerateMavenPom.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/GenerateMavenPom.java
@@ -38,18 +38,19 @@
 @Incubating
 public class GenerateMavenPom extends DefaultTask {
 
-    private final FileResolver fileResolver;
     private MavenPom pom;
     private Object destination;
 
-    @Inject
-    public GenerateMavenPom(FileResolver fileResolver) {
-        this.fileResolver = fileResolver;
-
+    public GenerateMavenPom() {
         // Never up to date; we don't understand the data structures.
         getOutputs().upToDateWhen(Specs.satisfyNone());
     }
 
+    @Inject
+    protected FileResolver getFileResolver() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * The Maven POM.
      *
@@ -70,7 +71,7 @@ public void setPom(MavenPom pom) {
      */
     @OutputFile
     public File getDestination() {
-        return destination == null ? null : fileResolver.resolve(destination);
+        return destination == null ? null : getFileResolver().resolve(destination);
     }
 
     /**
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenLocal.java b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenLocal.java
index 64e87f8bf248..9a8ef2f21feb 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenLocal.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenLocal.java
@@ -26,8 +26,6 @@
 import org.gradle.api.publish.maven.internal.publisher.MavenPublisher;
 import org.gradle.api.publish.maven.internal.publisher.StaticLockingMavenPublisher;
 import org.gradle.api.publish.maven.internal.publisher.ValidatingMavenPublisher;
-import org.gradle.internal.Factory;
-import org.gradle.logging.LoggingManagerInternal;
 
 import javax.inject.Inject;
 
@@ -38,20 +36,16 @@
  */
 @Incubating
 public class PublishToMavenLocal extends PublishToMavenRepository {
-
-    private final BaseRepositoryFactory baseRepositoryFactory;
-
     @Inject
-    public PublishToMavenLocal(Factory<LoggingManagerInternal> loggingManagerFactory, BaseRepositoryFactory baseRepositoryFactory) {
-        super(loggingManagerFactory);
-        this.baseRepositoryFactory = baseRepositoryFactory;
+    protected BaseRepositoryFactory getBaseRepositoryFactory() {
+        throw new UnsupportedOperationException();
     }
 
     @Override
     public MavenArtifactRepository getRepository() {
         if (super.getRepository() == null) {
             // Instantiate the default MavenLocal repository if none has been set explicitly
-            MavenArtifactRepository mavenLocalRepository = baseRepositoryFactory.createMavenLocalRepository();
+            MavenArtifactRepository mavenLocalRepository = getBaseRepositoryFactory().createMavenLocalRepository();
             mavenLocalRepository.setName(ArtifactRepositoryContainer.DEFAULT_MAVEN_LOCAL_REPO_NAME);
             setRepository(mavenLocalRepository);
         }
diff --git a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenRepository.java b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenRepository.java
index 854418418e2b..c945b88ae75a 100644
--- a/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenRepository.java
+++ b/subprojects/maven/src/main/groovy/org/gradle/api/publish/maven/tasks/PublishToMavenRepository.java
@@ -46,13 +46,7 @@ public class PublishToMavenRepository extends DefaultTask {
     private MavenPublicationInternal publication;
     private MavenArtifactRepository repository;
 
-    private final Factory<LoggingManagerInternal> loggingManagerFactory;
-
-    @Inject
-    public PublishToMavenRepository(Factory<LoggingManagerInternal> loggingManagerFactory) {
-        this.loggingManagerFactory = loggingManagerFactory;
-
-
+    public PublishToMavenRepository() {
         // Allow the publication to participate in incremental build
         getInputs().files(new Callable<FileCollection>() {
             public FileCollection call() throws Exception {
@@ -139,15 +133,16 @@ public void publish() {
         doPublish(publicationInternal, repository);
     }
 
+    @Inject
     protected Factory<LoggingManagerInternal> getLoggingManagerFactory() {
-        return loggingManagerFactory;
+        throw new UnsupportedOperationException();
     }
 
     protected void doPublish(final MavenPublicationInternal publication, final MavenArtifactRepository repository) {
         new PublishOperation(publication, repository) {
             @Override
             protected void publish() throws Exception {
-                MavenPublisher antBackedPublisher = new AntTaskBackedMavenPublisher(loggingManagerFactory, getTemporaryDirFactory());
+                MavenPublisher antBackedPublisher = new AntTaskBackedMavenPublisher(getLoggingManagerFactory(), getTemporaryDirFactory());
                 MavenPublisher staticLockingPublisher = new StaticLockingMavenPublisher(antBackedPublisher);
                 MavenPublisher validatingPublisher = new ValidatingMavenPublisher(staticLockingPublisher);
                 validatingPublisher.publish(publication.asNormalisedPublication(), repository);
diff --git a/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/MessagingServices.java b/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/MessagingServices.java
index dde040e11de4..a77534f8183b 100644
--- a/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/MessagingServices.java
+++ b/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/MessagingServices.java
@@ -143,8 +143,8 @@ protected OutgoingBroadcast createOutgoingBroadcast(MessageOriginator messageOri
                 messageClassLoader);
     }
 
-    protected AsyncConnection<DiscoveryMessage> createMulticastConnection(ExecutorFactory executorFactory) {
-        MulticastConnection<DiscoveryMessage> connection = new MulticastConnection<DiscoveryMessage>(broadcastAddress, new DiscoveryProtocolSerializer());
+    protected AsyncConnection<DiscoveryMessage> createMulticastConnection(ExecutorFactory executorFactory, InetAddressFactory addressFactory) {
+        MulticastConnection<DiscoveryMessage> connection = new MulticastConnection<DiscoveryMessage>(broadcastAddress, new DiscoveryProtocolSerializer(), addressFactory);
         return new AsyncConnectionAdapter<DiscoveryMessage>(
                 connection,
                 new DiscardingFailureHandler<DiscoveryMessage>(LoggerFactory.getLogger(MulticastConnection.class)),
diff --git a/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/InetAddressFactory.java b/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/InetAddressFactory.java
index 83e3acc1d009..0615f2a4f65f 100644
--- a/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/InetAddressFactory.java
+++ b/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/InetAddressFactory.java
@@ -15,6 +15,9 @@
  */
 package org.gradle.messaging.remote.internal.inet;
 
+import org.gradle.api.Transformer;
+import org.gradle.internal.UncheckedException;
+import org.gradle.util.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,7 +27,10 @@
 import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.net.UnknownHostException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
 
 /**
  * Provides some information about the network addresses of the local machine.
@@ -34,6 +40,7 @@ public class InetAddressFactory {
     private final Object lock = new Object();
     private List<InetAddress> localAddresses;
     private List<InetAddress> remoteAddresses;
+    private List<NetworkInterface> multicastInterfaces;
 
     /**
      * Determines the name of the local machine.
@@ -98,37 +105,46 @@ public List<InetAddress> findRemoteAddresses() {
         }
     }
 
+    /**
+     * Locates the network interfaces that should be used for multicast, in order of preference.
+     */
+    public List<NetworkInterface> findMulticastInterfaces() {
+        try {
+            synchronized (lock) {
+                init();
+                if (multicastInterfaces.isEmpty()) {
+                    LOGGER.debug("No multicast interfaces, using fallback");
+                    return CollectionUtils.toList(NetworkInterface.getNetworkInterfaces());
+                }
+                return multicastInterfaces;
+            }
+        } catch (Exception e) {
+            throw new RuntimeException("Could not determine the multicast network interfaces for this machine.", e);
+        }
+    }
+
     private void init() throws Exception {
         if (localAddresses != null) {
             return;
         }
 
-        Method loopbackMethod;
-        try {
-            loopbackMethod = NetworkInterface.class.getMethod("isLoopback");
-        } catch (NoSuchMethodException e) {
-            loopbackMethod = null;
-        }
+        Transformer<Boolean, NetworkInterface> loopback = loopback();
+        Transformer<Boolean, NetworkInterface> multicast = multicast();
 
         localAddresses = new ArrayList<InetAddress>();
         remoteAddresses = new ArrayList<InetAddress>();
+        multicastInterfaces = new ArrayList<NetworkInterface>();
 
         Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces();
         while (interfaces.hasMoreElements()) {
             NetworkInterface networkInterface = interfaces.nextElement();
-            LOGGER.debug("Adding IP addresses for network interface {}", networkInterface.getName());
+            LOGGER.debug("Adding IP addresses for network interface {}", networkInterface.getDisplayName());
             try {
-                Boolean isLoopbackInterface;
-                try {
-                    isLoopbackInterface = loopbackMethod == null ? null : (Boolean) loopbackMethod.invoke(networkInterface);
-                } catch (InvocationTargetException e) {
-                    if (!(e.getCause() instanceof SocketException)) {
-                        throw e.getCause();
-                    }
-                    // Ignore - treat as if we don't know
-                    isLoopbackInterface = null;
-                }
+                Boolean isLoopbackInterface = loopback.transform(networkInterface);
                 LOGGER.debug("Is this a loopback interface? {}", isLoopbackInterface);
+                Boolean isMulticast = multicast.transform(networkInterface);
+                LOGGER.debug("Is this a multicast interface? {}", isMulticast);
+                boolean isRemote = false;
 
                 Enumeration<InetAddress> candidates = networkInterface.getInetAddresses();
                 while (candidates.hasMoreElements()) {
@@ -139,28 +155,90 @@ private void init() throws Exception {
                             LOGGER.debug("Adding loopback address {}", candidate);
                             localAddresses.add(candidate);
                         } else {
-                            LOGGER.debug("Adding non-loopback address {}", candidate);
+                            LOGGER.debug("Adding remote address {}", candidate);
                             remoteAddresses.add(candidate);
+                            isRemote = true;
                         }
                     } else if (isLoopbackInterface) {
                         if (candidate.isLoopbackAddress()) {
                             LOGGER.debug("Adding loopback address {}", candidate);
                             localAddresses.add(candidate);
                         } else {
-                            LOGGER.debug("Ignoring non-loopback address on loopback interface {}", candidate);
+                            LOGGER.debug("Ignoring remote address on loopback interface {}", candidate);
                         }
                     } else {
                         if (candidate.isLoopbackAddress()) {
-                            LOGGER.debug("Ignoring loopback address on non-loopback interface {}", candidate);
+                            LOGGER.debug("Ignoring loopback address on remote interface {}", candidate);
                         } else {
-                            LOGGER.debug("Adding non-loopback address {}", candidate);
+                            LOGGER.debug("Adding remote address {}", candidate);
                             remoteAddresses.add(candidate);
+                            isRemote = true;
                         }
                     }
                 }
+
+                if (!Boolean.FALSE.equals(isMulticast)) {
+                    // Prefer remotely reachable interfaces over loopback interfaces for multicast
+                    if (isRemote) {
+                        LOGGER.debug("Adding remote multicast interface {}", networkInterface.getDisplayName());
+                        multicastInterfaces.add(0, networkInterface);
+                    } else {
+                        LOGGER.debug("Adding loopback multicast interface {}", networkInterface.getDisplayName());
+                        multicastInterfaces.add(networkInterface);
+                    }
+                }
             } catch (Throwable e) {
                 throw new RuntimeException(String.format("Could not determine the IP addresses for network interface %s", networkInterface.getName()), e);
             }
         }
     }
+
+    private Transformer<Boolean, NetworkInterface> loopback() {
+        try {
+            Method method = NetworkInterface.class.getMethod("isLoopback");
+            return new MethodBackedTransformer(method);
+        } catch (NoSuchMethodException e) {
+            return new Unknown();
+        }
+    }
+
+    private Transformer<Boolean, NetworkInterface> multicast() {
+        try {
+            Method method = NetworkInterface.class.getMethod("supportsMulticast");
+            return new MethodBackedTransformer(method);
+        } catch (NoSuchMethodException e) {
+            return new Unknown();
+        }
+
+    }
+
+    private static class Unknown implements Transformer<Boolean, NetworkInterface> {
+        public Boolean transform(NetworkInterface original) {
+            return null;
+        }
+    }
+
+    private static class MethodBackedTransformer implements Transformer<Boolean, NetworkInterface> {
+        private final Method method;
+
+        public MethodBackedTransformer(Method method) {
+            this.method = method;
+        }
+
+        public Boolean transform(NetworkInterface original) {
+            try {
+                try {
+                    return (Boolean) method.invoke(original);
+                } catch (InvocationTargetException e) {
+                    if (!(e.getCause() instanceof SocketException)) {
+                        throw e.getCause();
+                    }
+                    // Ignore - treat as if we don't know
+                    return null;
+                }
+            } catch (Throwable throwable) {
+                throw UncheckedException.throwAsUncheckedException(throwable);
+            }
+        }
+    }
 }
diff --git a/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/MulticastConnection.java b/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/MulticastConnection.java
index 2a55df27e738..805738e0d93b 100644
--- a/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/MulticastConnection.java
+++ b/subprojects/messaging/src/main/java/org/gradle/messaging/remote/internal/inet/MulticastConnection.java
@@ -15,31 +15,50 @@
  */
 package org.gradle.messaging.remote.internal.inet;
 
-import org.gradle.internal.UncheckedException;
 import org.gradle.messaging.remote.internal.Connection;
 import org.gradle.messaging.remote.internal.MessageIOException;
 import org.gradle.messaging.remote.internal.MessageSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.io.*;
-import java.net.DatagramPacket;
-import java.net.MulticastSocket;
-import java.net.SocketException;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.*;
 
 public class MulticastConnection<T> implements Connection<T> {
+    private static final Logger LOGGER = LoggerFactory.getLogger(MulticastConnection.class);
     private static final int MAX_MESSAGE_SIZE = 32*1024;
     private final MulticastSocket socket;
     private final SocketInetAddress address;
     private final MessageSerializer<T> serializer;
     private final SocketInetAddress localAddress;
 
-    public MulticastConnection(SocketInetAddress address, MessageSerializer<T> serializer) {
+    public MulticastConnection(SocketInetAddress address, MessageSerializer<T> serializer, InetAddressFactory addressFactory) {
         this.address = address;
         this.serializer = serializer;
         try {
             socket = new MulticastSocket(address.getPort());
-            socket.joinGroup(address.getAddress());
+            boolean bound = false;
+            SocketException bindFailure = null;
+            // Should attempt both ip4 and ip6 multicast addresses, as some interfaces don't accept ipv4
+            for (NetworkInterface networkInterface : addressFactory.findMulticastInterfaces()) {
+                try {
+                    socket.joinGroup(new InetSocketAddress(address.getAddress(), address.getPort()), networkInterface);
+                    LOGGER.debug("Joined multicast address {} on network interface {}.", address, networkInterface.getDisplayName());
+                    bound = true;
+                } catch (SocketException e) {
+                    LOGGER.debug("Failed to join multicast address {} on network interface {}.", address, networkInterface.getDisplayName());
+                    if (bindFailure == null) {
+                        bindFailure = e;
+                    }
+                }
+            }
+            if (!bound) {
+                throw bindFailure;
+            }
         } catch (IOException e) {
-            throw UncheckedException.throwAsUncheckedException(e);
+            throw new RuntimeException(String.format("Could not create multicast socket for %s", address.getDisplayName()), e);
         }
         localAddress = new SocketInetAddress(socket.getInetAddress(), socket.getLocalPort());
     }
diff --git a/subprojects/messaging/src/main/java/org/gradle/messaging/serialize/MapSerializer.java b/subprojects/messaging/src/main/java/org/gradle/messaging/serialize/MapSerializer.java
index 6764ab27085b..03b7459bdf7b 100644
--- a/subprojects/messaging/src/main/java/org/gradle/messaging/serialize/MapSerializer.java
+++ b/subprojects/messaging/src/main/java/org/gradle/messaging/serialize/MapSerializer.java
@@ -18,6 +18,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import static java.lang.String.format;
+
 public class MapSerializer<U, V> implements Serializer<Map<U, V>> {
     private final Serializer<U> keySerializer;
     private final Serializer<V> valueSerializer;
@@ -41,8 +43,32 @@ public Map<U, V> read(Decoder decoder) throws Exception {
     public void write(Encoder encoder, Map<U, V> value) throws Exception {
         encoder.writeInt(value.size());
         for (Map.Entry<U, V> entry : value.entrySet()) {
-            keySerializer.write(encoder, entry.getKey());
-            valueSerializer.write(encoder, entry.getValue());
+            try {
+                keySerializer.write(encoder, entry.getKey());
+                valueSerializer.write(encoder, entry.getValue());
+            } catch (Exception e) {
+                throw new EntrySerializationException(entry.getKey(), entry.getValue(), e);
+            }
+        }
+    }
+
+    public static class EntrySerializationException extends RuntimeException {
+
+        private final Object key;
+        private final Object value;
+
+        EntrySerializationException(Object key, Object value, Exception cause) {
+            super(format("Unable to write entry with key: '%s' and value: '%s'.", key, value), cause);
+            this.key = key;
+            this.value = value;
+        }
+
+        public Object getKey() {
+            return key;
+        }
+
+        public Object getValue() {
+            return value;
         }
     }
 }
diff --git a/subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/InetAddressFactoryTest.groovy b/subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/InetAddressFactoryTest.groovy
index 8b985f7ff412..84bc47afe4d1 100644
--- a/subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/InetAddressFactoryTest.groovy
+++ b/subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/InetAddressFactoryTest.groovy
@@ -16,6 +16,8 @@
 
 package org.gradle.messaging.remote.internal.inet
 
+import org.gradle.util.Requires
+import org.gradle.util.TestPrecondition
 import spock.lang.Specification
 
 class InetAddressFactoryTest extends Specification {
@@ -31,6 +33,11 @@ class InetAddressFactoryTest extends Specification {
         !factory.findRemoteAddresses().empty
     }
 
+    def "always contains at least multicast interface"() {
+        expect:
+        !factory.findMulticastInterfaces().empty
+    }
+
     def "all local address is considered local"() {
         expect:
         factory.findLocalAddresses().every {
@@ -38,6 +45,7 @@ class InetAddressFactoryTest extends Specification {
         }
     }
 
+    @Requires(TestPrecondition.ONLINE)
     def "no remote address is considered local"() {
         expect:
         factory.findRemoteAddresses().every {
diff --git a/subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/MulticastConnectionTest.groovy b/subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/MulticastConnectionTest.groovy
new file mode 100644
index 000000000000..26f093db0e94
--- /dev/null
+++ b/subprojects/messaging/src/test/groovy/org/gradle/messaging/remote/internal/inet/MulticastConnectionTest.groovy
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.messaging.remote.internal.inet
+
+import org.gradle.messaging.remote.internal.DefaultMessageSerializer
+import org.gradle.test.fixtures.concurrent.ConcurrentSpec
+import org.gradle.util.AvailablePortFinder
+import spock.lang.Timeout
+
+@Timeout(30)
+class MulticastConnectionTest extends ConcurrentSpec {
+    def "can send multicast messages between peers"() {
+        def address = new SocketInetAddress(InetAddress.getByName("233.253.17.122"), AvailablePortFinder.createPrivate().nextAvailable)
+        def serializer = new DefaultMessageSerializer<String>(getClass().classLoader)
+        def addressFactory = new InetAddressFactory()
+
+        // Some sanity checking
+        // TODO - remove this
+        when:
+        def socket1 = new MulticastSocket(address.getPort());
+        addressFactory.findMulticastInterfaces().each { networkInterface ->
+            try {
+                println "Joining group ${address.address}:${address.port} on ${networkInterface}"
+                socket1.joinGroup(new InetSocketAddress(address.getAddress(), address.getPort()), networkInterface);
+            } catch (SocketException e) {
+                e.printStackTrace(System.out)
+            }
+        }
+        def socket2 = new MulticastSocket(address.getPort());
+        addressFactory.findMulticastInterfaces().each { networkInterface ->
+            try {
+                println "Joining group ${address.address}:${address.port} on ${networkInterface}"
+                socket2.joinGroup(new InetSocketAddress(address.getAddress(), address.getPort()), networkInterface);
+            } catch (SocketException e) {
+                e.printStackTrace(System.out)
+            }
+        }
+
+        def message = "hi".getBytes()
+        socket1.send(new DatagramPacket(message, message.length, address.address, address.port))
+
+        socket2.setSoTimeout(10000);
+
+        def packet = new DatagramPacket(new byte[1024], 1024)
+        try {
+            socket2.receive(packet)
+        } catch (SocketTimeoutException e) {
+            throw new RuntimeException("""Timeout waiting to receive message.
+network interfaces: ${NetworkInterface.networkInterfaces.collect { it.displayName }.join(', ')}
+selected: ${addressFactory.findMulticastInterfaces().collect { it.displayName }.join(', ')}
+""", e)
+        }
+
+        then:
+        new String(packet.data, packet.offset, packet.length) == "hi"
+
+        when:
+        def connection1 = new MulticastConnection<String>(address, serializer, addressFactory)
+        def connection2 = new MulticastConnection<String>(address, serializer, addressFactory)
+        connection1.dispatch("hi!")
+
+        then:
+        connection2.receive() == "hi!"
+
+        cleanup:
+        connection1?.stop()
+        connection2?.stop()
+    }
+}
diff --git a/subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/MapSerializerTest.groovy b/subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/MapSerializerTest.groovy
index 6f6156956b59..b67fed0eadc0 100644
--- a/subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/MapSerializerTest.groovy
+++ b/subprojects/messaging/src/test/groovy/org/gradle/messaging/serialize/MapSerializerTest.groovy
@@ -44,4 +44,37 @@ class MapSerializerTest extends SerializerSpec {
         then:
         serialize([1L: "one", 2L: null], serializer) == [1L: "one", 2L: null]
     }
+
+    def "informs which value are not serializable"() {
+        def encoder = Mock(Encoder); def keySerializer = Mock(Serializer); def valueSerializer = Mock(Serializer)
+        def serializer = new MapSerializer(keySerializer, valueSerializer)
+
+        when: serializer.write(encoder, [a: 1, b: 2])
+
+        then:
+        1 * valueSerializer.write(encoder, 2) >> { throw new RuntimeException("Boom!")}
+
+        and:
+        def ex = thrown(MapSerializer.EntrySerializationException)
+        ex.key == 'b'
+        ex.value == 2
+        ex.message == "Unable to write entry with key: 'b' and value: '2'."
+        ex.cause.message == "Boom!"
+    }
+
+    def "informs which key is not serializable"() {
+        def encoder = Mock(Encoder); def keySerializer = Mock(Serializer); def valueSerializer = Mock(Serializer)
+        def serializer = new MapSerializer(keySerializer, valueSerializer)
+
+        when: serializer.write(encoder, [a: 1, b: 2])
+
+        then:
+        1 * keySerializer.write(encoder, 'a') >> { throw new RuntimeException("Boom!")}
+
+        and:
+        def ex = thrown(MapSerializer.EntrySerializationException)
+        ex.key == 'a'
+        ex.value == 1
+        ex.cause.message == "Boom!"
+    }
 }
diff --git a/subprojects/native/native.gradle b/subprojects/native/native.gradle
index 4677efe7b855..1639a64107e2 100755
--- a/subprojects/native/native.gradle
+++ b/subprojects/native/native.gradle
@@ -7,9 +7,6 @@ dependencies {
     compile libraries.slf4j_api
     compile libraries.jna
     compile libraries.nativePlatform
-    compile module('org.jruby.ext.posix:jna-posix:1.0.3') {
-        dependency libraries.jna
-    }
     compile module('org.fusesource.jansi:jansi:1.2.1') {
         dependency libraries.jna
     }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Chmod.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Chmod.java
index 66a7c6847c9e..52c8ed36ac1a 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Chmod.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Chmod.java
@@ -17,7 +17,6 @@
 package org.gradle.internal.nativeplatform.filesystem;
 
 import java.io.File;
-import java.io.IOException;
 
 public interface Chmod {
     /**
@@ -26,8 +25,7 @@ public interface Chmod {
      *
      * @param file the file to change permissions on
      * @param mode the permissions, e.g. 0755
-     * @throws java.io.FileNotFoundException if {@code file} doesn't exist
-     * @throws IOException if the permissions can't be changed
+     * @throws FileException if the permissions can't be changed for some reason.
      */
-    public void chmod(File file, int mode) throws IOException;
+    public void chmod(File file, int mode) throws FileException;
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/DefaultFilePathEncoder.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/DefaultFilePathEncoder.java
deleted file mode 100644
index 35be6a4c023d..000000000000
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/DefaultFilePathEncoder.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.internal.nativeplatform.filesystem;
-
-import com.sun.jna.WString;
-import org.gradle.internal.nativeplatform.jna.LibC;
-
-import java.io.File;
-
-class DefaultFilePathEncoder implements FilePathEncoder {
-    private final LibC libC;
-
-    DefaultFilePathEncoder(LibC libC) {
-        this.libC = libC;
-    }
-
-    public byte[] encode(File file) {
-        byte[] path = new byte[file.getAbsolutePath().length() * 3 + 1];
-        int pathLength = libC.wcstombs(path, new WString(file.getAbsolutePath()), path.length);
-        if (pathLength < 0) {
-            throw new RuntimeException(String.format("Could not encode file path '%s'.", file.getAbsolutePath()));
-        }
-        byte[] zeroTerminatedByteArray = new byte[pathLength + 1];
-        System.arraycopy(path, 0, zeroTerminatedByteArray, 0, pathLength);
-        zeroTerminatedByteArray[pathLength] = 0;
-        return zeroTerminatedByteArray;
-    }
-}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/EmptyChmod.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/EmptyChmod.java
index 65bc53c80759..a5bf0d328cc6 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/EmptyChmod.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/EmptyChmod.java
@@ -17,9 +17,12 @@
 package org.gradle.internal.nativeplatform.filesystem;
 
 import java.io.File;
-import java.io.IOException;
+import java.io.FileNotFoundException;
 
-class EmptyChmod implements Chmod {
-    public void chmod(File f, int mode) throws IOException {
+class EmptyChmod implements FileModeMutator {
+    public void chmod(File f, int mode) throws FileNotFoundException {
+        if (!f.exists()) {
+            throw new FileNotFoundException(String.format("File '%s' does not exist.", f));
+        }
     }
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackStat.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackStat.java
index 110803912398..900152437add 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackStat.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackStat.java
@@ -17,14 +17,17 @@
 package org.gradle.internal.nativeplatform.filesystem;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 
-class FallbackStat implements Stat {
+class FallbackStat implements FileModeAccessor {
     public int getUnixMode(File f) throws IOException {
         if (f.isDirectory()) {
             return FileSystem.DEFAULT_DIR_MODE;
-        } else {
+        } else if (f.exists()) {
             return FileSystem.DEFAULT_FILE_MODE;
+        } else {
+            throw new FileNotFoundException(String.format("File '%s' not found.", f));
         }
     }
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileException.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileException.java
new file mode 100644
index 000000000000..0ba866e61469
--- /dev/null
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileException.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.nativeplatform.filesystem;
+
+public class FileException extends RuntimeException {
+    public FileException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FilePathEncoder.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileModeAccessor.java
similarity index 82%
rename from subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FilePathEncoder.java
rename to subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileModeAccessor.java
index b671c202c98e..5c73141c4c4a 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FilePathEncoder.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileModeAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,6 @@
 
 import java.io.File;
 
-interface FilePathEncoder {
-    byte[] encode(File file);
+public interface FileModeAccessor {
+    public int getUnixMode(File f) throws Exception;
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileModeMutator.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileModeMutator.java
new file mode 100644
index 000000000000..d56fd1374cc9
--- /dev/null
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileModeMutator.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.nativeplatform.filesystem;
+
+import java.io.File;
+
+public interface FileModeMutator {
+    public void chmod(File file, int mode) throws Exception;
+}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystem.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystem.java
index 20ab02999273..c2ae50b9e30b 100755
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystem.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystem.java
@@ -16,7 +16,6 @@
 package org.gradle.internal.nativeplatform.filesystem;
 
 import java.io.File;
-import java.io.IOException;
 
 /**
  * A file system accessible to Gradle.
@@ -50,33 +49,9 @@ public interface FileSystem extends Chmod, Stat {
     /**
      * Creates a symbolic link to a target file.
      *
-     *
      * @param link the link to be created
      * @param target the file to link to
-     * @exception java.io.IOException if the operation fails
-     */
-    void createSymbolicLink(File link, File target) throws IOException;
-
-    /**
-     * Tries to create a symbolic link to a target file.
-     *
-     * @param link the link to be created
-     * @param target the file to link to
-     * @return <tt>true</tt> if the operation was successful, <tt>false</tt> otherwise
-     */
-    boolean tryCreateSymbolicLink(File link, File target);
-
-    /**
-     * Returns the Unix permissions for a provided file. Some file systems may not
-     * support Unix permissions, in which case sensible default values are returned
-     * instead.
-     *
-     * @param file the file to read permissions from
-     * @throws java.io.FileNotFoundException if {@code file} doesn't exist
-     * @throws IOException if the permissions can't be read
-     * @return the file's Unix permissions, e.g. 0755
-     * @see #DEFAULT_DIR_MODE
-     * @see #DEFAULT_FILE_MODE
+     * @exception FileException if the operation fails
      */
-    int getUnixMode(File file) throws IOException;
+    void createSymbolicLink(File link, File target) throws FileException;
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
index 7e23061cbae5..c47b8ae58ccd 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
@@ -16,16 +16,10 @@
 
 package org.gradle.internal.nativeplatform.filesystem;
 
-import com.sun.jna.Native;
 import net.rubygrapefruit.platform.NativeIntegrationUnavailableException;
 import net.rubygrapefruit.platform.PosixFiles;
 import org.gradle.api.JavaVersion;
-import org.gradle.internal.UncheckedException;
-import org.gradle.internal.nativeplatform.jna.LibC;
 import org.gradle.internal.os.OperatingSystem;
-import org.jruby.ext.posix.BaseNativePOSIX;
-import org.jruby.ext.posix.JavaPOSIX;
-import org.jruby.ext.posix.POSIX;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,84 +27,44 @@ public class FileSystemServices {
     private static final Logger LOGGER = LoggerFactory.getLogger(FileSystemServices.class);
 
     @SuppressWarnings("UnusedDeclaration")
-    public FileSystem createFileSystem(OperatingSystem operatingSystem) {
+    public FileSystem createFileSystem(OperatingSystem operatingSystem) throws Exception {
         // Use no-op implementations for windows
         if (operatingSystem.isWindows()) {
-            return new GenericFileSystem(new EmptyChmod(), new FallbackStat(), new FallbackSymlink());
+            return new GenericFileSystem(new EmptyChmod(), new FallbackStat(), new WindowsSymlink());
         }
 
+        // Use the native-platform integration, if available
         try {
             PosixFiles posixFiles = net.rubygrapefruit.platform.Native.get(PosixFiles.class);
             Symlink symlink = new NativePlatformBackedSymlink(posixFiles);
-            Chmod chmod = new NativePlatformBackedChmod(posixFiles);
-            Stat stat = new NativePlatformBackedStat(posixFiles);
+            FileModeMutator chmod = new NativePlatformBackedChmod(posixFiles);
+            FileModeAccessor stat = new NativePlatformBackedStat(posixFiles);
             return new GenericFileSystem(chmod, stat, symlink);
         } catch (NativeIntegrationUnavailableException ex) {
             LOGGER.debug("Native-platform file system integration is not available. Continuing with fallback.");
         }
 
-        LibC libC = loadLibC();
-        Symlink symlink = symlink(libC);
-
-        // Use libc backed implementations on Linux, if libc available
-        POSIX posix = PosixUtil.current();
-        if ((libC != null && (operatingSystem.isLinux())) && posix instanceof BaseNativePOSIX) {
-            FilePathEncoder filePathEncoder = new DefaultFilePathEncoder(libC);
-            Chmod chmod = new LibcChmod(libC, filePathEncoder);
-            Stat stat = new LibCStat(libC, operatingSystem, (BaseNativePOSIX) posix, filePathEncoder);
-            return new GenericFileSystem(chmod, stat, symlink);
-        }
+        LOGGER.debug("Using UnsupportedSymlink implementation.");
+        Symlink symlink = new UnsupportedSymlink();
 
         // Use java 7 APIs, if available
         if (JavaVersion.current().isJava7()) {
             String jdkFilePermissionclass = "org.gradle.internal.nativeplatform.filesystem.jdk7.PosixJdk7FilePermissionHandler";
+            Class<?> handlerClass = null;
             try {
-                Object handler = FileSystemServices.class.getClassLoader().loadClass(jdkFilePermissionclass).newInstance();
-                return new GenericFileSystem((Chmod) handler, (Stat) handler, symlink);
+                handlerClass = FileSystemServices.class.getClassLoader().loadClass(jdkFilePermissionclass);
             } catch (ClassNotFoundException e) {
                 LOGGER.warn(String.format("Unable to load %s. Continuing with fallback.", jdkFilePermissionclass));
-            } catch (Exception e) {
-                throw UncheckedException.throwAsUncheckedException(e);
+            }
+            if (handlerClass != null) {
+                LOGGER.debug("Using JDK 7 file services.");
+                Object handler = handlerClass.newInstance();
+                return new GenericFileSystem((FileModeMutator) handler, (FileModeAccessor) handler, symlink);
             }
         }
 
-        // Attempt to use libc for chmod and posix for stat, and fallback to no-op implementations if not available
-        return new GenericFileSystem(chmod(libC), stat(), symlink);
-    }
-
-    private Symlink symlink(LibC libC) {
-        if (libC != null) {
-            return new LibcSymlink(libC);
-        }
-        LOGGER.debug("Using FallbackSymlink implementation.");
-        return new FallbackSymlink();
-    }
-
-    private Stat stat() {
-        POSIX posix = PosixUtil.current();
-        if (posix instanceof JavaPOSIX) {
-            return new FallbackStat();
-        } else {
-            return new PosixStat(posix);
-        }
-    }
-
-    private Chmod chmod(LibC libC) {
-        if (libC != null) {
-            return new LibcChmod(libC, new DefaultFilePathEncoder(libC));
-        }
-        LOGGER.debug("Using EmptyChmod implementation.");
-        return new EmptyChmod();
+        // Fallback to no-op implementations if not available
+        UnsupportedFilePermissions filePermissionsHandler = new UnsupportedFilePermissions();
+        return new GenericFileSystem(filePermissionsHandler, filePermissionsHandler, symlink);
     }
-
-    private static LibC loadLibC() {
-        try {
-            return (LibC) Native.loadLibrary("c", LibC.class);
-        } catch (LinkageError e) {
-            LOGGER.debug("Unable to load LibC library. Continuing with fallback filesystem implementations.");
-            return null;
-        }
-    }
-
 }
-
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/GenericFileSystem.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/GenericFileSystem.java
index 6327e41d6e9a..1f10eb9e0404 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/GenericFileSystem.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/GenericFileSystem.java
@@ -22,18 +22,17 @@
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.UUID;
 
-public class GenericFileSystem implements FileSystem {
+class GenericFileSystem implements FileSystem {
     private static final Logger LOGGER = LoggerFactory.getLogger(GenericFileSystem.class);
 
     final boolean caseSensitive;
     final boolean canCreateSymbolicLink;
 
-    private final Chmod chmod;
-    private final Stat stat;
+    private final FileModeMutator chmod;
+    private final FileModeAccessor stat;
     private final Symlink symlink;
 
     public boolean isCaseSensitive() {
@@ -44,46 +43,41 @@ public boolean canCreateSymbolicLink() {
         return canCreateSymbolicLink;
     }
 
-    public void createSymbolicLink(File link, File target) throws IOException {
-        symlink.symlink(link, target);
-    }
-
-    public boolean tryCreateSymbolicLink(File link, File target) {
+    public void createSymbolicLink(File link, File target) {
         try {
             symlink.symlink(link, target);
-            return true;
-        } catch (IOException e) {
-            return false;
+        } catch (Exception e) {
+            throw new FileException(String.format("Could not create symlink from '%s' to '%s'.", link.getPath(), target.getPath()), e);
         }
     }
 
-    public int getUnixMode(File f) throws IOException {
-        assertFileExists(f);
-        return stat.getUnixMode(f);
-    }
-
-    public void chmod(File f, int mode) throws IOException {
-        assertFileExists(f);
-        chmod.chmod(f, mode);
+    public int getUnixMode(File f) {
+        try {
+            return stat.getUnixMode(f);
+        } catch (Exception e) {
+            throw new FileException(String.format("Could not get file mode for '%s'.", f), e);
+        }
     }
 
-    protected final void assertFileExists(File f) throws FileNotFoundException {
-        if (!f.exists()) {
-            throw new FileNotFoundException(f + " does not exist");
+    public void chmod(File f, int mode) {
+        try {
+            chmod.chmod(f, mode);
+        } catch (Exception e) {
+            throw new FileException(String.format("Could not set file mode %o on '%s'.", mode, f), e);
         }
     }
 
-    public GenericFileSystem(Chmod chmod, Stat stat, Symlink symlink) {
+    public GenericFileSystem(FileModeMutator chmod, FileModeAccessor stat, Symlink symlink) {
         this.stat = stat;
         this.symlink = symlink;
         this.chmod = chmod;
+        canCreateSymbolicLink = symlink.isSymlinkSupported();
         String content = generateUniqueContent();
         File file = null;
         try {
             checkJavaIoTmpDirExists();
             file = createFile(content);
             caseSensitive = probeCaseSensitive(file, content);
-            canCreateSymbolicLink = probeCanCreateSymbolicLink(file, content);
         } catch (IOException e) {
             throw new RuntimeException(e);
         } finally {
@@ -114,27 +108,10 @@ private boolean probeCaseSensitive(File file, String content) {
         }
     }
 
-    private boolean probeCanCreateSymbolicLink(File file, String content) {
-        File link = null;
-        try {
-            link = generateUniqueTempFileName();
-            return tryCreateSymbolicLink(link, file) && hasContent(link, content);
-        } catch (IOException e) {
-            LOGGER.info("Failed to determine if file system can create symbolic links. Assuming it can't.");
-            return false;
-        } finally {
-            FileUtils.deleteQuietly(link);
-        }
-    }
-
     private boolean hasContent(File file, String content) throws IOException {
         return file.exists() && Files.readFirstLine(file, Charsets.UTF_8).equals(content);
     }
 
-    private File generateUniqueTempFileName() throws IOException {
-        return new File(System.getProperty("java.io.tmpdir"), "gradle_unique_file_name" + UUID.randomUUID().toString());
-    }
-
     private void checkJavaIoTmpDirExists() throws IOException {
         File dir = new File(System.getProperty("java.io.tmpdir"));
         if (!dir.exists()) {
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
deleted file mode 100644
index a9ad76cfd778..000000000000
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.internal.nativeplatform.filesystem;
-
-import org.gradle.internal.nativeplatform.jna.LibC;
-import org.gradle.internal.os.OperatingSystem;
-import org.jruby.ext.posix.BaseNativePOSIX;
-import org.jruby.ext.posix.FileStat;
-import org.jruby.ext.posix.Linux64FileStat;
-
-import java.io.File;
-import java.io.IOException;
-
-class LibCStat implements Stat {
-    private final LibC libc;
-    private final FilePathEncoder encoder;
-    private final OperatingSystem operatingSystem;
-    private final BaseNativePOSIX nativePOSIX;
-
-    public LibCStat(LibC libc, OperatingSystem operatingSystem, BaseNativePOSIX nativePOSIX, FilePathEncoder encoder) {
-        this.libc = libc;
-        this.operatingSystem = operatingSystem;
-        this.nativePOSIX = nativePOSIX;
-        this.encoder = encoder;
-    }
-
-    public int getUnixMode(File f) throws IOException {
-        FileStat stat = nativePOSIX.allocateStat();
-        initPlatformSpecificStat(stat, encoder.encode(f));
-        return stat.mode() & 0777;
-    }
-
-    private void initPlatformSpecificStat(FileStat stat, byte[] encodedFilePath) {
-        if (operatingSystem.isMacOsX()) {
-            libc.stat(encodedFilePath, stat);
-        } else {
-            final int statVersion = stat instanceof Linux64FileStat ? 3 : 0;
-            libc.__xstat64(statVersion, encodedFilePath, stat);
-        }
-    }
-}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibcChmod.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibcChmod.java
deleted file mode 100644
index aee292134a4b..000000000000
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibcChmod.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.internal.nativeplatform.filesystem;
-
-import com.sun.jna.LastErrorException;
-import org.gradle.internal.nativeplatform.jna.LibC;
-
-import java.io.File;
-import java.io.IOException;
-
-class LibcChmod implements Chmod {
-    private final LibC libc;
-    private final FilePathEncoder encoder;
-
-    public LibcChmod(LibC libc, FilePathEncoder encoder) {
-        this.libc = libc;
-        this.encoder = encoder;
-    }
-
-    public void chmod(File f, int mode) throws IOException {
-        try {
-            byte[] encodedFilePath = encoder.encode(f);
-            libc.chmod(encodedFilePath, mode);
-        } catch (LastErrorException exception) {
-            throw new IOException(String.format("Failed to set file permissions %s on file %s. errno: %d", mode, f.getName(), exception.getErrorCode()));
-        }
-    }
-}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibcSymlink.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibcSymlink.java
deleted file mode 100644
index a54432f2bdf6..000000000000
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibcSymlink.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.internal.nativeplatform.filesystem;
-
-import com.sun.jna.LastErrorException;
-import org.gradle.internal.nativeplatform.jna.LibC;
-
-import java.io.File;
-import java.io.IOException;
-
-public class LibcSymlink implements Symlink {
-    private final LibC libC;
-
-    public LibcSymlink(LibC libC) {
-        this.libC = libC;
-    }
-
-    public void symlink(File link, File target) throws IOException {
-        link.getParentFile().mkdirs();
-        try {
-            libC.symlink(target.getPath(), link.getPath());
-        } catch (LastErrorException e) {
-            throw new IOException(String.format("Could not create symlink from '%s' to '%s'. Errno is %s.", link.getPath(), target.getPath(), e.getErrorCode()));
-        }
-    }
-}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedChmod.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedChmod.java
index 6c1cc310c416..766374ac433c 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedChmod.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedChmod.java
@@ -19,16 +19,15 @@
 import net.rubygrapefruit.platform.PosixFiles;
 
 import java.io.File;
-import java.io.IOException;
 
-class NativePlatformBackedChmod implements Chmod {
+class NativePlatformBackedChmod implements FileModeMutator {
     private final PosixFiles posixFiles;
 
     public NativePlatformBackedChmod(PosixFiles posixFiles) {
         this.posixFiles = posixFiles;
     }
 
-    public void chmod(File file, int mode) throws IOException {
+    public void chmod(File file, int mode) {
         posixFiles.setMode(file, mode);
     }
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedStat.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedStat.java
index 984ff4ff2d43..33fb039c795c 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedStat.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedStat.java
@@ -21,7 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 
-class NativePlatformBackedStat implements Stat {
+class NativePlatformBackedStat implements FileModeAccessor {
     private final PosixFiles posixFiles;
 
     public NativePlatformBackedStat(PosixFiles posixFiles) {
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedSymlink.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedSymlink.java
index 5bae05e6f9e2..122699a0683d 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedSymlink.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/NativePlatformBackedSymlink.java
@@ -28,6 +28,10 @@ public NativePlatformBackedSymlink(PosixFiles posixFiles) {
         this.posixFiles = posixFiles;
     }
 
+    public boolean isSymlinkSupported() {
+        return true;
+    }
+
     public void symlink(File link, File target) throws IOException {
         link.getParentFile().mkdirs();
         posixFiles.symlink(link, target.getPath());
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
deleted file mode 100644
index 7d236b335571..000000000000
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.internal.nativeplatform.filesystem;
-
-import org.jruby.ext.posix.POSIX;
-import org.jruby.ext.posix.POSIXFactory;
-import org.jruby.ext.posix.POSIXHandler;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.PrintStream;
-
-public class PosixUtil {
-    private static final POSIX POSIX = POSIXFactory.getPOSIX(new POSIXHandlerImpl(), true);
-
-    public static POSIX current() {
-        return POSIX;
-    }
-
-    private static class POSIXHandlerImpl implements POSIXHandler {
-        public void error(POSIX.ERRORS error, String message) {
-            throw new UnsupportedOperationException(error + " - " + message);
-        }
-
-        public void unimplementedError(String message) {
-            throw new UnsupportedOperationException(message);
-        }
-
-        public void warn(WARNING_ID warningId, String message, Object... objects) {
-        }
-
-        public boolean isVerbose() {
-            return false;
-        }
-
-        public File getCurrentWorkingDirectory() {
-            throw new UnsupportedOperationException();
-        }
-
-        public String[] getEnv() {
-            throw new UnsupportedOperationException();
-        }
-
-        public InputStream getInputStream() {
-            return System.in;
-        }
-
-        public PrintStream getOutputStream() {
-            return System.out;
-        }
-
-        public int getPID() {
-            throw new UnsupportedOperationException();
-        }
-
-        public PrintStream getErrorStream() {
-            return System.err;
-        }
-    }
-
-}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Stat.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Stat.java
index f201a2bfb676..7c21ff7f4731 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Stat.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Stat.java
@@ -17,8 +17,7 @@
 package org.gradle.internal.nativeplatform.filesystem;
 
 import java.io.File;
-import java.io.IOException;
 
 public interface Stat {
-    public int getUnixMode(File f) throws IOException;
+    public int getUnixMode(File f) throws FileException;
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Symlink.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Symlink.java
index f2925b291683..2d589c64c5f9 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Symlink.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/Symlink.java
@@ -17,8 +17,9 @@
 package org.gradle.internal.nativeplatform.filesystem;
 
 import java.io.File;
-import java.io.IOException;
 
 public interface Symlink {
-    void symlink(File link, File target) throws IOException;
+    boolean isSymlinkSupported();
+
+    void symlink(File link, File target) throws Exception;
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/UnsupportedFilePermissions.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/UnsupportedFilePermissions.java
new file mode 100644
index 000000000000..eabe78fd9015
--- /dev/null
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/UnsupportedFilePermissions.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.nativeplatform.filesystem;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class UnsupportedFilePermissions implements FileModeAccessor, FileModeMutator {
+    private static final Logger LOGGER = LoggerFactory.getLogger(UnsupportedFilePermissions.class);
+    private final AtomicBoolean warned = new AtomicBoolean();
+    private final FallbackStat stat = new FallbackStat();
+    private final EmptyChmod chmod = new EmptyChmod();
+
+    public int getUnixMode(File f) throws IOException {
+        maybeWarn();
+        return stat.getUnixMode(f);
+    }
+
+    public void chmod(File file, int mode) throws Exception {
+        maybeWarn();
+        chmod.chmod(file, mode);
+    }
+
+    private void maybeWarn() {
+        if (warned.compareAndSet(false, true)) {
+            LOGGER.warn("Support for reading or changing file permissions is only available on this platform using Java 7 or later.");
+        }
+    }
+}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixStat.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/UnsupportedSymlink.java
similarity index 70%
rename from subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixStat.java
rename to subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/UnsupportedSymlink.java
index a43221c4bcf2..d1ad422468e9 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixStat.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/UnsupportedSymlink.java
@@ -16,19 +16,15 @@
 
 package org.gradle.internal.nativeplatform.filesystem;
 
-import org.jruby.ext.posix.POSIX;
-
 import java.io.File;
 import java.io.IOException;
 
-class PosixStat implements Stat {
-    private final POSIX posix;
-
-    public PosixStat(POSIX posix) {
-        this.posix = posix;
+class UnsupportedSymlink implements Symlink {
+    public boolean isSymlinkSupported() {
+        return false;
     }
 
-    public int getUnixMode(File f) throws IOException {
-        return this.posix.stat(f.getAbsolutePath()).mode() & 0777;
+    public void symlink(File link, File target) throws IOException {
+        throw new IOException("Support for the creation of symlinks is only available on this platform using Java 7 or later.");
     }
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackSymlink.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/WindowsSymlink.java
similarity index 81%
rename from subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackSymlink.java
rename to subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/WindowsSymlink.java
index 053ba76f197a..b4711ff5623e 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FallbackSymlink.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/WindowsSymlink.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,12 @@
 import java.io.File;
 import java.io.IOException;
 
-public class FallbackSymlink implements Symlink {
+class WindowsSymlink implements Symlink {
+    public boolean isSymlinkSupported() {
+        return false;
+    }
+
     public void symlink(File link, File target) throws IOException {
-        throw new IOException("Creation of symlinks is not supported on the platform.");
+        throw new IOException("Creation of symlinks is not supported on this platform.");
     }
 }
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixJdk7FilePermissionHandler.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixJdk7FilePermissionHandler.java
index c96de84c280f..476b782975db 100644
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixJdk7FilePermissionHandler.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/jdk7/PosixJdk7FilePermissionHandler.java
@@ -16,28 +16,23 @@
 
 package org.gradle.internal.nativeplatform.filesystem.jdk7;
 
+import org.gradle.internal.nativeplatform.filesystem.FileModeAccessor;
+import org.gradle.internal.nativeplatform.filesystem.FileModeMutator;
+
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.attribute.PosixFileAttributeView;
 import java.nio.file.attribute.PosixFileAttributes;
 
-import org.gradle.internal.nativeplatform.NativeIntegrationException;
-import org.gradle.internal.nativeplatform.filesystem.Chmod;
-import org.gradle.internal.nativeplatform.filesystem.Stat;
-
 import static org.gradle.internal.nativeplatform.filesystem.jdk7.PosixFilePermissionConverter.convertToInt;
 import static org.gradle.internal.nativeplatform.filesystem.jdk7.PosixFilePermissionConverter.convertToPermissionsSet;
 
-public class PosixJdk7FilePermissionHandler implements Stat, Chmod {
+public class PosixJdk7FilePermissionHandler implements FileModeAccessor, FileModeMutator {
 
-    public int getUnixMode(File file) {
-        try {
-            final PosixFileAttributes posixFileAttributes = Files.readAttributes(file.toPath(), PosixFileAttributes.class);
-            return convertToInt(posixFileAttributes.permissions());
-        }catch (Exception e) {
-            throw new NativeIntegrationException(String.format("Failed to read File permissions for %s", file.getAbsolutePath()), e);
-        }
+    public int getUnixMode(File file) throws IOException {
+        final PosixFileAttributes posixFileAttributes = Files.readAttributes(file.toPath(), PosixFileAttributes.class);
+        return convertToInt(posixFileAttributes.permissions());
     }
 
     public void chmod(File f, int mode) throws IOException {
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibC.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibC.java
deleted file mode 100644
index bf3cd4173457..000000000000
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibC.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.internal.nativeplatform.jna;
-
-import com.sun.jna.LastErrorException;
-import com.sun.jna.Library;
-import com.sun.jna.WString;
-import org.jruby.ext.posix.FileStat;
-
-public interface LibC extends Library {
-    //CHECKSTYLE:OFF
-    public int setenv(String name, String value, int overwrite) throws LastErrorException;
-    public String getcwd(byte[] out, int size) throws LastErrorException;
-    public int chdir(String dirAbsolutePath) throws LastErrorException;
-    public int getpid();
-    public int isatty(int fdes);
-    public int stat(byte[] filePath, FileStat fileStat) throws LastErrorException;
-    public int __xstat64(int version, byte[] filePath, FileStat fileStat) throws LastErrorException;
-    public int chmod(byte[] filePath, int mode) throws LastErrorException;
-    public int wcstombs(byte[] dest, WString source, int size) throws LastErrorException;
-    public int symlink(String target, String link) throws LastErrorException;
-    //CHECKSTYLE:ON
-}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibCBackedConsoleDetector.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibCBackedConsoleDetector.java
deleted file mode 100644
index 6f8499c1ef2f..000000000000
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibCBackedConsoleDetector.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.internal.nativeplatform.jna;
-
-import org.gradle.internal.UncheckedException;
-import org.gradle.internal.nativeplatform.console.ConsoleMetaData;
-import org.gradle.internal.nativeplatform.console.UnixConsoleMetaData;
-import org.gradle.internal.nativeplatform.console.ConsoleDetector;
-
-import java.io.FileDescriptor;
-import java.lang.reflect.Field;
-
-public class LibCBackedConsoleDetector implements ConsoleDetector {
-    private final LibC libC;
-
-    public LibCBackedConsoleDetector(LibC libC) {
-        this.libC = libC;
-    }
-
-    public ConsoleMetaData getConsole() {
-        boolean stdout = checkIsConsole(FileDescriptor.out);
-        boolean stderr = checkIsConsole(FileDescriptor.err);
-        if (!stdout && !stderr) {
-            return null;
-        }
-
-        // Dumb terminal doesn't support ANSI control codes. Should really be using termcap database.
-        String term = System.getenv("TERM");
-        if (term != null && term.equals("dumb")) {
-            return null;
-        }
-
-        // Assume a terminal
-        return new UnixConsoleMetaData(stdout, stderr);
-    }
-
-    private boolean checkIsConsole(FileDescriptor fileDescriptor) {
-        int osFileDesc;
-        try {
-            Field fdField = FileDescriptor.class.getDeclaredField("fd");
-            fdField.setAccessible(true);
-            osFileDesc = fdField.getInt(fileDescriptor);
-        } catch (Exception e) {
-            throw UncheckedException.throwAsUncheckedException(e);
-        }
-
-        // Determine if we're connected to a terminal
-        return libC.isatty(osFileDesc) != 0;
-    }
-}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibCBackedProcessEnvironment.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibCBackedProcessEnvironment.java
deleted file mode 100755
index 95e75a411cf7..000000000000
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/LibCBackedProcessEnvironment.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-package org.gradle.internal.nativeplatform.jna;
-
-import com.sun.jna.LastErrorException;
-import com.sun.jna.Native;
-import org.gradle.internal.nativeplatform.NativeIntegrationException;
-import org.gradle.internal.nativeplatform.processenvironment.AbstractProcessEnvironment;
-
-import java.io.File;
-
-/**
- * Uses JNA to drive the POSIX API provided by libc
- */
-public class LibCBackedProcessEnvironment extends AbstractProcessEnvironment {
-    private static final int LOTS_OF_CHARS = 2048;
-    private final LibC libc;
-
-    public LibCBackedProcessEnvironment(LibC libc) {
-        this.libc = libc;
-    }
-
-    public void setNativeEnvironmentVariable(String name, String value) {
-        try {
-            libc.setenv(name, value, 1);
-        } catch (LastErrorException lastErrorException) {
-            throw new NativeIntegrationException(String.format("Could not set environment variable '%s'. errno: %d", name, lastErrorException.getErrorCode()));
-        }
-    }
-
-    public void removeNativeEnvironmentVariable(String name) {
-        setNativeEnvironmentVariable(name, "");
-    }
-
-    public void setNativeProcessDir(File dir) {
-        try {
-            libc.chdir(dir.getAbsolutePath());
-        } catch (LastErrorException lastErrorException) {
-            throw new NativeIntegrationException(String.format("Could not set process working directory to '%s'. errno: %d", dir, lastErrorException.getErrorCode()));
-        }
-    }
-
-    public File getProcessDir() {
-        byte[] out = new byte[LOTS_OF_CHARS];
-        try {
-            libc.getcwd(out, LOTS_OF_CHARS);
-        } catch (LastErrorException lastErrorException) {
-            throw new NativeIntegrationException(String.format("Could not get process working directory. errno: %d", lastErrorException.getErrorCode()));
-        }
-        return new File(Native.toString(out));
-    }
-
-    public Long getPid() {
-        return Long.valueOf(libc.getpid());
-    }
-}
diff --git a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/NativeServices.java b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/NativeServices.java
index cefc2cd14ee0..003dcce9c3d3 100755
--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/NativeServices.java
+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/NativeServices.java
@@ -15,7 +15,6 @@
  */
 package org.gradle.internal.nativeplatform.services;
 
-import com.sun.jna.Native;
 import net.rubygrapefruit.platform.*;
 import net.rubygrapefruit.platform.Process;
 import net.rubygrapefruit.platform.internal.DefaultProcessLauncher;
@@ -27,7 +26,8 @@
 import org.gradle.internal.nativeplatform.console.NoOpConsoleDetector;
 import org.gradle.internal.nativeplatform.console.WindowsConsoleDetector;
 import org.gradle.internal.nativeplatform.filesystem.FileSystemServices;
-import org.gradle.internal.nativeplatform.jna.*;
+import org.gradle.internal.nativeplatform.jna.JnaBootPathConfigurer;
+import org.gradle.internal.nativeplatform.jna.UnsupportedEnvironment;
 import org.gradle.internal.nativeplatform.processenvironment.NativePlatformBackedProcessEnvironment;
 import org.gradle.internal.os.OperatingSystem;
 import org.gradle.internal.service.DefaultServiceRegistry;
@@ -64,7 +64,10 @@ public static void initialize(File userHomeDir) {
                 useNativePlatform = false;
             }
         }
-        new JnaBootPathConfigurer().configure(nativeDir);
+        if (OperatingSystem.current().isWindows()) {
+            // JNA is still being used by jansi
+            new JnaBootPathConfigurer().configure(nativeDir);
+        }
     }
 
     public static NativeServices getInstance() {
@@ -98,17 +101,7 @@ protected ProcessEnvironment createProcessEnvironment(OperatingSystem operatingS
             }
         }
 
-        try {
-            if (operatingSystem.isUnix()) {
-                return new LibCBackedProcessEnvironment(get(LibC.class));
-            } else {
-                return new UnsupportedEnvironment();
-            }
-        } catch (LinkageError e) {
-            // Thrown when jna cannot initialize the native stuff
-            LOGGER.debug("Unable to load native library. Continuing with fallback. Failure: {}", format(e));
-            return new UnsupportedEnvironment();
-        }
+        return new UnsupportedEnvironment();
     }
 
     protected ConsoleDetector createConsoleDetector(OperatingSystem operatingSystem) {
@@ -127,12 +120,11 @@ protected ConsoleDetector createConsoleDetector(OperatingSystem operatingSystem)
             if (operatingSystem.isWindows()) {
                 return new WindowsConsoleDetector();
             }
-            return new LibCBackedConsoleDetector(get(LibC.class));
         } catch (LinkageError e) {
             // Thrown when jna cannot initialize the native stuff
             LOGGER.debug("Unable to load native library. Continuing with fallback. Failure: {}", format(e));
-            return new NoOpConsoleDetector();
         }
+        return new NoOpConsoleDetector();
     }
 
     protected WindowsRegistry createWindowsRegistry(OperatingSystem operatingSystem) {
@@ -168,10 +160,6 @@ private <T> T notAvailable(Class<T> type) {
         return (T) Proxy.newProxyInstance(type.getClassLoader(), new Class[]{type}, new BrokenService(type.getSimpleName()));
     }
 
-    protected LibC createLibC() {
-        return (LibC) Native.loadLibrary("c", LibC.class);
-    }
-
     private static String format(Throwable throwable) {
         StringBuilder builder = new StringBuilder();
         builder.append(throwable.toString());
diff --git a/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/CommonFileSystemTest.groovy b/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/CommonFileSystemTest.groovy
index 1b755b8794d4..4f592d0f50f8 100644
--- a/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/CommonFileSystemTest.groovy
+++ b/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/CommonFileSystemTest.groovy
@@ -28,19 +28,25 @@ class CommonFileSystemTest extends Specification {
     def fs = NativeServices.instance.get(FileSystem)
 
     def "unix permissions cannot be read on non existing file"() {
+        def file = tmpDir.file("someFile")
+
         when:
-        fs.getUnixMode(tmpDir.file("someFile"))
+        fs.getUnixMode(file)
 
         then:
-        thrown(FileNotFoundException)
+        FileException e = thrown()
+        e.message == "Could not get file mode for '$file'."
     }
 
     def "unix permissions cannot be set on non existing file"() {
+        def file = tmpDir.file("someFile")
+
         when:
-        fs.chmod(tmpDir.file("someFile"), 0644)
+        fs.chmod(file, 0644)
 
         then:
-        thrown(FileNotFoundException)
+        FileException e = thrown()
+        e.message == "Could not set file mode 644 on '$file'."
     }
 
     @Requires(TestPrecondition.FILE_PERMISSIONS)
@@ -108,6 +114,6 @@ class CommonFileSystemTest extends Specification {
         fs.createSymbolicLink(link, target)
 
         then:
-        thrown(IOException)
+        thrown(FileException)
     }
 }
diff --git a/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/GenericFileSystemTest.groovy b/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/GenericFileSystemTest.groovy
new file mode 100644
index 000000000000..7a3a93f0b8b8
--- /dev/null
+++ b/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/GenericFileSystemTest.groovy
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.nativeplatform.filesystem
+
+import spock.lang.Specification
+
+class GenericFileSystemTest extends Specification {
+    def fileModeMutator = Stub(FileModeMutator)
+    def fileModeAccessor = Stub(FileModeAccessor)
+    def symlink = Stub(Symlink)
+    def fileSystem = new GenericFileSystem(fileModeMutator, fileModeAccessor, symlink)
+
+    def "wraps failure to set file mode"() {
+        def failure = new RuntimeException()
+        def file = new File("does-not-exist")
+
+        given:
+        fileModeMutator.chmod(_, _) >> { throw failure }
+
+        when:
+        fileSystem.chmod(file, 0640)
+
+        then:
+        FileException e = thrown()
+        e.message == "Could not set file mode 640 on '$file'."
+    }
+
+    def "wraps failure to get file mode"() {
+        def failure = new RuntimeException()
+        def file = new File("does-not-exist")
+
+        given:
+        fileModeAccessor.getUnixMode(_) >> { throw failure }
+
+        when:
+        fileSystem.getUnixMode(file)
+
+        then:
+        FileException e = thrown()
+        e.message == "Could not get file mode for '$file'."
+    }
+
+    def "wraps failure to get create symlink"() {
+        def failure = new RuntimeException()
+        def file = new File("does-not-exist")
+        def target = new File("target")
+
+        given:
+        symlink.symlink(_, _) >> { throw failure }
+
+        when:
+        fileSystem.createSymbolicLink(file, target)
+
+        then:
+        FileException e = thrown()
+        e.message == "Could not create symlink from '$file' to '$target'."
+    }
+}
diff --git a/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/LibcStatTest.groovy b/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/LibcStatTest.groovy
deleted file mode 100644
index 6c1437cc258a..000000000000
--- a/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/LibcStatTest.groovy
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.internal.nativeplatform.filesystem;
-
-import spock.lang.Specification
-import org.gradle.internal.os.OperatingSystem
-import org.gradle.internal.nativeplatform.jna.LibC
-import org.jruby.ext.posix.BaseNativePOSIX
-import spock.lang.Unroll
-import org.jruby.ext.posix.FileStat;
-
-class LibcStatTest extends Specification {
-
-    OperatingSystem os = Mock();
-    LibC libc = Mock()
-    BaseNativePOSIX posix = Mock()
-    FilePathEncoder encoder = Mock()
-
-    @Unroll
-    def "LibCStat on #osname maps to libc #libcMethodName"(){
-        given:
-        1 * os.isMacOsX() >> (osname == "macosx");
-        1 * posix.allocateStat() >> Mock(FileStat)
-        File testFile = new File("a/file/path")
-        LibCStat libCStat = new LibCStat(libc, os, posix, encoder);
-        
-        when:
-        libCStat.getUnixMode(testFile)
-
-        then:
-        1 * libc."${libcMethodName}"(*_);
-        where:
-        osname   | libcMethodName
-        "macosx" | "stat"
-        "linux"  | "__xstat64"
-    }
-}
diff --git a/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/UnsupportedFilePermissionsTest.groovy b/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/UnsupportedFilePermissionsTest.groovy
new file mode 100644
index 000000000000..14509e321bb6
--- /dev/null
+++ b/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/filesystem/UnsupportedFilePermissionsTest.groovy
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.internal.nativeplatform.filesystem
+
+import org.gradle.logging.ConfigureLogging
+import org.gradle.logging.TestAppender
+import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
+import org.junit.Rule
+import spock.lang.Specification
+
+class UnsupportedFilePermissionsTest extends Specification {
+    def appender = new TestAppender()
+    @Rule ConfigureLogging logging = new ConfigureLogging(appender)
+    @Rule TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider()
+    def permissions = new UnsupportedFilePermissions()
+
+    def "warns on first attempt to stat a file"() {
+        when:
+        permissions.getUnixMode(tmpDir.createFile("file"))
+        permissions.getUnixMode(tmpDir.createDir("dir"))
+
+        then:
+        appender.toString() == '[WARN Support for reading or changing file permissions is only available on this platform using Java 7 or later.]'
+    }
+
+    def "warns on first attempt to chmod a file"() {
+        when:
+        permissions.chmod(tmpDir.createFile("file"), 0644)
+        permissions.chmod(tmpDir.createDir("dir"), 0644)
+
+        then:
+        appender.toString() == '[WARN Support for reading or changing file permissions is only available on this platform using Java 7 or later.]'
+    }
+
+    def "warns at most once"() {
+        when:
+        permissions.chmod(tmpDir.createFile("file"), 0644)
+        permissions.getUnixMode(tmpDir.createDir("dir"))
+        permissions.getUnixMode(tmpDir.createFile("file"))
+
+        then:
+        appender.toString() == '[WARN Support for reading or changing file permissions is only available on this platform using Java 7 or later.]'
+    }
+}
diff --git a/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/jna/LibCBackedProcessEnvironmentTest.groovy b/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/jna/LibCBackedProcessEnvironmentTest.groovy
deleted file mode 100644
index b643fcb69079..000000000000
--- a/subprojects/native/src/test/groovy/org/gradle/internal/nativeplatform/jna/LibCBackedProcessEnvironmentTest.groovy
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.internal.nativeplatform.jna
-
-import org.gradle.internal.nativeplatform.NativeIntegrationException
-import org.gradle.internal.nativeplatform.services.NativeServices
-import spock.lang.Specification
-import org.gradle.util.Requires
-import org.gradle.util.TestPrecondition
-
-class LibCBackedProcessEnvironmentTest extends Specification {
-
-    NativeServices registry = NativeServices.getInstance();
-
-    @Requires(TestPrecondition.FILE_PERMISSIONS) //MACOSX & UNIX
-    def "setNativeEnvironmentVariable throws NativeEnvironmentException for NULL value on env name with errno code"() {
-        setup:
-        LibCBackedProcessEnvironment processEnvironment = new LibCBackedProcessEnvironment(registry.get(LibC.class))
-        when:
-        processEnvironment.setNativeEnvironmentVariable(null, "TEST_ENV_VAR");
-        then:
-        def e = thrown(NativeIntegrationException);
-        e.message == "Could not set environment variable 'null'. errno: 22"
-    }
-}
diff --git a/subprojects/open-api/open-api.gradle b/subprojects/open-api/open-api.gradle
index 99965bb84881..859524cdd8f2 100644
--- a/subprojects/open-api/open-api.gradle
+++ b/subprojects/open-api/open-api.gradle
@@ -1,6 +1,5 @@
 dependencies {
-    testCompile libraries.groovy
-
+    integTestCompile libraries.groovy
     integTestCompile libraries.slf4j_api
     integTestCompile libraries.commons_lang
 }
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/CrossVersionBuilder.java b/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/CrossVersionBuilder.java
deleted file mode 100644
index 14a6ebe970dd..000000000000
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/CrossVersionBuilder.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.integtests.openapi;
-
-import org.gradle.openapi.external.foundation.GradleInterfaceVersion2;
-import org.gradle.openapi.external.foundation.ProjectVersion1;
-import org.gradle.openapi.external.foundation.RequestVersion1;
-import org.gradle.openapi.external.ui.CommandLineArgumentAlteringListenerVersion1;
-import org.gradle.openapi.external.ui.SinglePaneUIVersion1;
-import org.gradle.openapi.external.ui.UIFactory;
-
-import java.io.File;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-public class CrossVersionBuilder {
-    private File targetGradleHomeDir;
-    private File currentDir;
-    private String version;
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public File getCurrentDir() {
-        return currentDir;
-    }
-
-    public void setCurrentDir(File currentDir) {
-        this.currentDir = currentDir;
-    }
-
-    public File getTargetGradleHomeDir() {
-        return targetGradleHomeDir;
-    }
-
-    public void setTargetGradleHomeDir(File targetGradleHomeDir) {
-        this.targetGradleHomeDir = targetGradleHomeDir;
-    }
-
-    public void build() throws Exception {
-        assert targetGradleHomeDir != null;
-        assert currentDir != null;
-
-        TestSingleDualPaneUIInteractionVersion1 testSingleDualPaneUIInteractionVersion1 = new TestSingleDualPaneUIInteractionVersion1(new TestAlternateUIInteractionVersion1(), new TestSettingsNodeVersion1());
-        SinglePaneUIVersion1 singlePane = UIFactory.createSinglePaneUI(getClass().getClassLoader(), targetGradleHomeDir, testSingleDualPaneUIInteractionVersion1, false);
-        singlePane.addCommandLineArgumentAlteringListener(new CommandLineArgumentAlteringListenerVersion1() {
-            public String getAdditionalCommandLineArguments(String commandLineArguments) {
-                return "'-g=" + new File(currentDir, "gradle-user-home").getAbsolutePath() + "'";
-            }
-        });
-
-        String actualVersion = ((GradleInterfaceVersion2) singlePane.getGradleInterfaceVersion1()).getVersion();
-        assertEquals(version, actualVersion);
-
-        singlePane.setCurrentDirectory(currentDir);
-
-        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) singlePane.getGradleInterfaceVersion1();
-
-        BlockingRequestObserver testRequestObserver = new BlockingRequestObserver(RequestVersion1.REFRESH_TYPE);
-        gradleInterface.addRequestObserver(testRequestObserver);
-
-        singlePane.aboutToShow();
-
-        gradleInterface.refreshTaskTree();
-
-        testRequestObserver.waitForRequestExecutionComplete(80, TimeUnit.SECONDS);
-
-        assertEquals(String.format("Execution failed%n%s", testRequestObserver.getOutput()), 0, (long) testRequestObserver.getResult());
-
-        List<ProjectVersion1> rootProjects = gradleInterface.getRootProjects();
-        assertTrue(!rootProjects.isEmpty());
-
-        ProjectVersion1 rootProject = rootProjects.get(0);
-        assertEquals(3, rootProject.getSubProjects().size());
-
-        assertTrue(rootProject.getTasks().size() > 4);
-    }
-}
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest.groovy b/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest.groovy
index 72e4707927b3..afc57deec1ad 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest.groovy
+++ b/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest.groovy
@@ -16,50 +16,85 @@
 package org.gradle.integtests.openapi
 
 import org.gradle.integtests.fixtures.CrossVersionIntegrationSpec
+import org.gradle.integtests.fixtures.IgnoreVersions
 import org.gradle.integtests.fixtures.TestResources
 import org.gradle.integtests.fixtures.executer.GradleDistribution
-import org.gradle.internal.classloader.ClasspathUtil
 import org.gradle.internal.classloader.DefaultClassLoaderFactory
-import org.gradle.util.Requires
-import org.gradle.util.TestPrecondition
-import org.junit.Assert
 import org.junit.Rule
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 
-@Requires(TestPrecondition.SWING)
+import java.lang.reflect.InvocationTargetException
+
+@IgnoreVersions({!it.openApiSupported})
 class CrossVersionCompatibilityIntegrationTest extends CrossVersionIntegrationSpec {
     private final Logger logger = LoggerFactory.getLogger(CrossVersionCompatibilityIntegrationTest)
     @Rule public final TestResources resources = new TestResources(temporaryFolder)
 
-    public void canUseOpenApiFromCurrentVersionToBuildUsingAnOlderVersion() {
-        expect:
-        checkCanBuildUsing(current, previous)
+    public void cannotUseOpenApiFromOlderVersionToBuildUsingCurrentVersion() {
+        def classloader = loadOpenApi(previous)
+
+        when:
+        attemptToCreateSinglePaneUI(classloader)
+
+        then:
+        InvocationTargetException e = thrown()
+        e.cause.message == 'Support for the Gradle Open API was removed in the Gradle 2.0 release. You should use the Gradle tooling API instead.'
+
+        when:
+        attemptToCreateDualPaneUI(classloader)
+
+        then:
+        e = thrown()
+        e.cause.message == 'Support for the Gradle Open API was removed in the Gradle 2.0 release. You should use the Gradle tooling API instead.'
+
+        when:
+        attemptToCreateRunner(classloader)
+
+        then:
+        e = thrown()
+        e.cause.message == 'Support for the Gradle Open API was removed in the Gradle 2.0 release. You should use the Gradle tooling API instead.'
     }
 
-    public void canUseOpenApiFromOlderVersionToBuildUsingCurrentVersion() {
-        expect:
-        checkCanBuildUsing(previous, current)
+    void attemptToCreateSinglePaneUI(ClassLoader classloader) {
+        def interactionType = classloader.loadClass("org.gradle.openapi.external.ui.SinglePaneUIInteractionVersion1")
+        def interaction = [:].asType(interactionType)
+        def factory = classloader.loadClass("org.gradle.openapi.external.ui.UIFactory")
+        def method = factory.getMethods().find { it.name == 'createSinglePaneUI' }
+        try {
+            method.invoke(null, classloader, current.gradleHomeDir, interaction, true)
+        } catch (InvocationTargetException e) {
+            throw e.cause
+        }
     }
 
-    void checkCanBuildUsing(GradleDistribution openApiVersion, GradleDistribution buildVersion) {
-        if (!buildVersion.openApiSupported) {
-            System.out.println("skipping $buildVersion as it does not support the open API.")
-            return
+    void attemptToCreateDualPaneUI(ClassLoader classloader) {
+        def interactionType = classloader.loadClass("org.gradle.openapi.external.ui.DualPaneUIInteractionVersion1")
+        def interaction = [:].asType(interactionType)
+        def factory = classloader.loadClass("org.gradle.openapi.external.ui.UIFactory")
+        def method = factory.getMethods().find { it.name == 'createDualPaneUI' }
+        try {
+            method.invoke(null, classloader, current.gradleHomeDir, interaction, true)
+        } catch (InvocationTargetException e) {
+            throw e.cause
         }
-        if (!openApiVersion.openApiSupported) {
-            System.out.println("skipping $openApiVersion as it does not support the open API.")
-            return
+    }
+
+    void attemptToCreateRunner(ClassLoader classloader) {
+        def interactionType = classloader.loadClass("org.gradle.openapi.external.runner.GradleRunnerInteractionVersion1")
+        def interaction = [:].asType(interactionType)
+        def factory = classloader.loadClass("org.gradle.openapi.external.runner.GradleRunnerFactory")
+        def method = factory.getMethods().find { it.name == 'createGradleRunner' }
+        try {
+            method.invoke(null, classloader, current.gradleHomeDir, interaction, true)
+        } catch (InvocationTargetException e) {
+            throw e.cause
         }
-        def testClasses = ClasspathUtil.getClasspathForClass(CrossVersionBuilder.class)
-        def junitJar = ClasspathUtil.getClasspathForClass(Assert.class)
-        def classpath = [testClasses, junitJar] + openApiVersion.gradleHomeDir.file('lib').listFiles().findAll { it.name =~ /gradle-open-api.*\.jar/ }
+    }
+
+    private ClassLoader loadOpenApi(GradleDistribution openApiVersion) {
+        def classpath = openApiVersion.gradleHomeDir.file('lib').listFiles().findAll { it.name =~ /gradle-open-api.*\.jar/ }
         logger.info('Using Open API classpath {}', classpath)
-        def classloader = new DefaultClassLoaderFactory().createIsolatedClassLoader(classpath.collect { it.toURI() })
-        def builder = classloader.loadClass(CrossVersionBuilder.class.name).newInstance()
-        builder.targetGradleHomeDir = buildVersion.gradleHomeDir
-        builder.currentDir = testDirectory
-        builder.version = buildVersion.version.version
-        builder.build()
+        new DefaultClassLoaderFactory().createIsolatedClassLoader(classpath.collect { it.toURI() })
     }
 }
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/GradleRunnerTest.groovy b/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/GradleRunnerTest.groovy
deleted file mode 100644
index d2c94c64cd80..000000000000
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/GradleRunnerTest.groovy
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * 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.
- */
-package org.gradle.integtests.openapi
-
-import org.apache.commons.lang.builder.ReflectionToStringBuilder
-import org.gradle.integtests.fixtures.TestResources
-import org.gradle.integtests.fixtures.executer.GradleDistribution
-import org.gradle.integtests.fixtures.executer.UnderDevelopmentGradleDistribution
-import org.gradle.openapi.external.runner.GradleRunnerFactory
-import org.gradle.openapi.external.runner.GradleRunnerInteractionVersion1
-import org.gradle.openapi.external.runner.GradleRunnerVersion1
-import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
-import org.junit.Assert
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-
-class GradleRunnerTest {
-
-  static final String JAVA_PROJECT_NAME = 'javaproject'
-  static final String SHARED_NAME = 'shared'
-  static final String API_NAME = 'api'
-  static final String WEBAPP_NAME = 'webservice'
-  static final String SERVICES_NAME = 'services'
-  static final String WEBAPP_PATH = "$SERVICES_NAME/$WEBAPP_NAME" as String
-
-  private File javaprojectDir
-    File gradleUserHomeDir
-
-  @Rule public final TestNameTestDirectoryProvider temporaryFolder = new TestNameTestDirectoryProvider()
-  final GradleDistribution dist = new UnderDevelopmentGradleDistribution()
-  @Rule public final TestResources resources = new TestResources(temporaryFolder, 'testproject')
-
-  @Before
-  void setUp() {
-      javaprojectDir = temporaryFolder.testDirectory
-      gradleUserHomeDir = temporaryFolder.file("gradle-user-home")
-
-  }
-
-    String toCommand(String command) {
-        "'-g=$gradleUserHomeDir.absolutePath' $command"
-    }
-
-  /**
-   * We just want to make sure we can instantiate a GradleRunner here. That's all
-  */
-  @Test
-  public void testInstantiation()
-  {
-    TestGradleRunnerInteractionVersion1 interaction = new TestGradleRunnerInteractionVersion1(javaprojectDir)
-
-    GradleRunnerVersion1 runner = GradleRunnerFactory.createGradleRunner(getClass().getClassLoader(), dist.getGradleHomeDir(), interaction, true)
-
-    Assert.assertNotNull( "Failed to instantiate runner", runner )
-  }
-
-  /**
-   * This does a basic execution. It also checks to make sure that the notifications were fired
-   * correctly.
-  */
-  @Test
-  public void testExecution()
-  {
-      def gradleUserHome = temporaryFolder.file("gradle-user-home")
-    TestGradleRunnerInteractionVersion1 interaction = new TestGradleRunnerInteractionVersion1( javaprojectDir )
-
-    GradleRunnerVersion1 runner = GradleRunnerFactory.createGradleRunner(getClass().getClassLoader(), dist.getGradleHomeDir(), interaction, true)
-
-    Assert.assertNotNull( "Failed to instantiate runner", runner )
-
-    runner.executeCommand(toCommand("clean build"))
-
-        //wait for it to complete
-    int totalWaitTime = 0;
-    int maximumWaitTime = 80
-    while ( !interaction.executionFinished && totalWaitTime <= maximumWaitTime ) {
-        try {
-            Thread.sleep(1000);
-        }
-        catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        totalWaitTime += 1;
-    }
-
-    if( totalWaitTime > maximumWaitTime ) {
-      throw new AssertionError( "Waited $totalWaitTime seconds and failed to finish executing command. This is taking too long, so assuming something is wrong.\n. Interaction: $interaction" )
-    }
-
-    //now make sure we were notified of things correctly:
-
-    //it should have fired a message that execution has started
-    Assert.assertTrue( "Execution did not report started. Interaction: $interaction", interaction.executionStarted )
-    
-    //it should have finished
-    Assert.assertTrue( "Execution did not report finished. Interaction: $interaction", interaction.executionFinished )
-
-    //it should have been successful
-    Assert.assertTrue( "Did not execute command successfully. Interaction: $interaction", interaction.wasSuccessful )
-
-    //we should have output
-    Assert.assertTrue( "Missing output. Interaction: $interaction", interaction.output.length() > 0 )
-
-    //we should have a message when we finished (basically the full output)
-    Assert.assertTrue( "Missing finish message. Interaction: $interaction", interaction.finishMessage != null )
-
-    //there should have been multiple tasks to execute
-    Assert.assertTrue( "Not enough tasks executed. Expected multiple. Found $interaction.numberOfTasksToExecute. Interaction: $interaction", interaction.numberOfTasksToExecute > 1 )
-
-    //we should have been notified that tasks started and completed (we're not interested in tracking how many times or specific tasks as that might change too often with releases of gradle.
-    Assert.assertTrue( "No tasks reported started. Interaction: $interaction", interaction.taskStarted )
-    Assert.assertTrue( "No tasks reported completed. Interaction: $interaction", interaction.taskCompleted )
-  }
-
-  /**
-   * This tests killing a task. We'll start a build task then kill it after it starts executing.
-   * Note: the kill interaction actually kills execution. It waits for a certain number of tasks
-   * to be executed.
-  */
-  @Test
-  public void testKill()
-  {
-    KillTestInteraction interaction = new KillTestInteraction(javaprojectDir)
-
-    GradleRunnerVersion1 runner = GradleRunnerFactory.createGradleRunner(getClass().getClassLoader(), dist.getGradleHomeDir(), interaction, true)
-
-    interaction.runner = runner
-
-    Assert.assertNotNull( "Failed to instantiate runner", runner )
-
-    runner.executeCommand(toCommand("build"))
-
-        //wait for it to complete
-    int totalWaitTime = 0;
-    int maximumWaitTime = 80
-    while ( !interaction.executionFinished && totalWaitTime <= maximumWaitTime ) {
-        try {
-            Thread.sleep(1000);
-        }
-        catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-
-        totalWaitTime += 1;
-    }
-
-    if( totalWaitTime > maximumWaitTime ) {
-      throw new AssertionError( "Waited $totalWaitTime seconds and failed to finish executing command. This is taking too long, so assuming something is wrong.\nInteraction: $interaction")
-    }
-
-    //make sure we tried to kill the task
-    Assert.assertTrue( "Did not attempt to kill execution. Interaction: $interaction", interaction.killedTask )
-
-    //now make sure we were notified of things correctly:
-
-    //it should NOT have been successful
-    Assert.assertFalse( "Erroneously executed successfully (was not killed). Interaction: $interaction", interaction.wasSuccessful )
-
-    //it should have fired a message that execution has started
-    Assert.assertTrue( "Execution did not report started. Interaction: $interaction", interaction.executionStarted )
-
-    //it should have finished
-    Assert.assertTrue( "Execution did not report finished. Interaction: $interaction", interaction.executionFinished )
-  }
-}
-
-  //Inner class used to track what has been called
-  public class TestGradleRunnerInteractionVersion1 implements GradleRunnerInteractionVersion1
-  {
-    private File workingDirectory
-    private StringBuilder output = new StringBuilder()
-    private String finishMessage
-    boolean wasSuccessful
-    boolean executionStarted
-    int numberOfTasksToExecute
-    boolean executionFinished
-    boolean taskCompleted
-    boolean taskStarted
-
-
-    public TestGradleRunnerInteractionVersion1(File workingDirectory) {
-      this.workingDirectory = workingDirectory;
-    }
-
-    def TestGradleRunnerInteractionVersion1() {
-    }
-
-    File getWorkingDirectory() { return workingDirectory }
-
-    GradleRunnerInteractionVersion1.LogLevel getLogLevel() { return GradleRunnerInteractionVersion1.LogLevel.Lifecycle }
-
-    GradleRunnerInteractionVersion1.StackTraceLevel getStackTraceLevel() { return GradleRunnerInteractionVersion1.StackTraceLevel.AlwaysFull }
-
-    void reportExecutionStarted() { executionStarted = true }
-    void reportNumberOfTasksToExecute(int size) { numberOfTasksToExecute = size }
-
-    //both of these will be fired often. We're not going to try to track that.
-    void reportTaskStarted(String currentTaskName, float percentComplete) { taskStarted = true; }
-    void reportTaskComplete(String currentTaskName, float percentComplete) { taskCompleted = true }
-
-    void reportLiveOutput(String output) { this.output.append( output ) }
-
-    void reportExecutionFinished(boolean wasSuccessful, String message, Throwable throwable) {
-      this.executionFinished = true;
-      this.wasSuccessful = wasSuccessful
-      this.finishMessage = message;
-    }
-
-    File getCustomGradleExecutable() { return null; }
-
-    String toString() {
-      return ReflectionToStringBuilder.toString(this);
-    }
-  }
-
-
-  //class to track that has class was started and then kills it. 
-  private class KillTestInteraction implements GradleRunnerInteractionVersion1
-  {
-    private GradleRunnerVersion1 runner
-    int tasks = 0
-    boolean killedTask
-
-    //after at least 2 tasks start, try to kill the process. This simulates someone killing it while
-    //its in the middle of running
-    def void reportTaskStarted(String currentTaskName, float percentComplete) {
-      tasks++
-      if( tasks == 2 ) {
-        killedTask = true
-        runner.killProcess();
-      }
-    }
-    private File workingDirectory
-    boolean wasSuccessful
-    boolean executionStarted
-    boolean executionFinished
-
-    public KillTestInteraction(File workingDirectory) {
-      this.workingDirectory = workingDirectory;
-    }
-
-    File getWorkingDirectory() { return workingDirectory }
-
-    GradleRunnerInteractionVersion1.LogLevel getLogLevel() { return GradleRunnerInteractionVersion1.LogLevel.Lifecycle }
-
-    GradleRunnerInteractionVersion1.StackTraceLevel getStackTraceLevel() { return GradleRunnerInteractionVersion1.StackTraceLevel.InternalExceptions }
-
-    void reportExecutionStarted() { executionStarted = true }
-    void reportNumberOfTasksToExecute(int size) { }
-
-    void reportTaskComplete(String currentTaskName, float percentComplete) {}
-    void reportLiveOutput(String output) {}
-    File getCustomGradleExecutable() { return null; }
-
-    void reportExecutionFinished(boolean wasSuccessful, String message, Throwable throwable) {
-      this.executionFinished = true;
-      this.wasSuccessful = wasSuccessful
-    }
-
-    String toString() {
-      return ReflectionToStringBuilder.toString(this);
-    }
-  }
\ No newline at end of file
diff --git a/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest/shared/build.gradle b/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest/shared/build.gradle
deleted file mode 100644
index 357ceb02fd94..000000000000
--- a/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest/shared/build.gradle
+++ /dev/null
@@ -1,3 +0,0 @@
-allprojects {
-    apply plugin: 'java'
-}
diff --git a/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest/shared/settings.gradle b/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest/shared/settings.gradle
deleted file mode 100644
index 955919ea9752..000000000000
--- a/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/CrossVersionCompatibilityIntegrationTest/shared/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include 'a', 'b', 'c'
\ No newline at end of file
diff --git a/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/testproject/build.gradle b/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/testproject/build.gradle
deleted file mode 100644
index 09c801104793..000000000000
--- a/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/testproject/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-allprojects { apply plugin: 'java' }
\ No newline at end of file
diff --git a/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/testproject/settings.gradle b/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/testproject/settings.gradle
deleted file mode 100644
index 56b61cd89f73..000000000000
--- a/subprojects/open-api/src/integTest/resources/org/gradle/integtests/openapi/testproject/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include 'services:webservice', 'api', 'shared'
\ No newline at end of file
diff --git a/subprojects/open-api/src/main/java/org/gradle/foundation/BootstrapLoader.java b/subprojects/open-api/src/main/java/org/gradle/foundation/BootstrapLoader.java
deleted file mode 100644
index 7f02c5e3bc03..000000000000
--- a/subprojects/open-api/src/main/java/org/gradle/foundation/BootstrapLoader.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.foundation;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- This handles the work of loading gradle dynamically. Due to jar version issues,
- you can't just load all jar files.
-
- This does NOT require any system or environment variables to be set.
-
- To use this, instantiate this, then call one of the initialize functions.
- Now you can get the class loader to load whatever classes you like.
-
- @deprecated No replacement
-  */
-@Deprecated
-public class BootstrapLoader {
-    private URLClassLoader libClassLoader;
-
-    public void initialize(File gradleHome, boolean bootStrapDebug) throws Exception {
-        initialize(ClassLoader.getSystemClassLoader().getParent(), gradleHome, false, true, bootStrapDebug);
-    }
-
-    /*
-      Call this to initialize gradle.
-      @param  parentClassloader    a parent class loader. Probably whatever class loader
-                                   is used by the caller.
-      @param  gradleHome           the root directory where gradle is installed. This
-                                   directory should have a 'bin' child directory.
-      @param  useParentLastClassLoader true to use a class loader that will delegate
-                                   to the parent only if it can't find it locally. This
-                                   should only be true if you're trying to load gradle
-                                   dynamically from another application.
-      @param  loadOpenAPI          True to load the gradle open API, false not to.
-                                   If you're calling this from a tool using the OpenAPI,
-                                   then you've probably already loaded it, so pass in false
-                                   here, otherwise, pass in true.
-      @param  bootStrapDebug       true to output debug information about the loading
-                                   process.
-      @throws Exception            if something goes wrong.
-   */
-    public void initialize(ClassLoader parentClassloader, File gradleHome, boolean useParentLastClassLoader, boolean loadOpenAPI, boolean bootStrapDebug) throws Exception {
-        if (gradleHome == null || !gradleHome.exists()) {
-            throw new RuntimeException("Gradle home not defined!");
-        }
-
-        if (bootStrapDebug) {
-            System.out.println("Gradle Home is declared by system property gradle.home to: " + gradleHome.getAbsolutePath());
-        }
-
-        System.setProperty("gradle.home", gradleHome.getAbsolutePath());
-
-        List<URL> loggingJars = toUrl(getLoggingJars());
-
-        List<File> nonLoggingJarFiles = getNonLoggingJars();
-        removeUnwantedJarFiles(nonLoggingJarFiles, loadOpenAPI);
-        List<URL> nonLoggingJars = toUrl(nonLoggingJarFiles);
-
-        if (bootStrapDebug) {
-            System.out.println("Parent Classloader of new context classloader is: " + parentClassloader);
-            System.out.println("Adding the following files to new logging classloader: " + loggingJars);
-            System.out.println("Adding the following files to new lib classloader: " + nonLoggingJars);
-        }
-
-        URLClassLoader loggingClassLoader = new URLClassLoader(loggingJars.toArray(new URL[loggingJars.size()]), parentClassloader);
-
-        if (useParentLastClassLoader) {
-            libClassLoader = new ParentLastClassLoader(nonLoggingJars.toArray(new URL[nonLoggingJars.size()]), loggingClassLoader);
-        } else {
-            libClassLoader = new URLClassLoader(nonLoggingJars.toArray(new URL[nonLoggingJars.size()]), loggingClassLoader);
-        }
-
-        if (bootStrapDebug) {
-            System.out.println("Logging class loader: " + loggingClassLoader);
-            System.out.println("Lib class loader: " + libClassLoader);
-        }
-    }
-
-    public static File[] getGradleHomeLibClasspath() {
-        File gradleHomeLib = new File(System.getProperty("gradle.home") + "/lib");
-        if (gradleHomeLib.isDirectory()) {
-            return gradleHomeLib.listFiles();
-        }
-        return new File[0];
-    }
-
-    public static List<File> getNonLoggingJars() {
-        List<File> pathElements = new ArrayList<File>();
-        for (File file : getGradleClasspath()) {
-            if (!isLogLib(file)) {
-                pathElements.add(file);
-            }
-        }
-        return pathElements;
-    }
-
-    public static List<File> getLoggingJars() {
-        List<File> pathElements = new ArrayList<File>();
-        for (File file : getGradleClasspath()) {
-            if (isLogLib(file)) {
-                pathElements.add(file);
-            }
-        }
-        return pathElements;
-    }
-
-    private static boolean isLogLib(File file) {
-        return file.getName().startsWith("logback") || file.getName().startsWith("slf4j");
-    }
-
-    public static List<File> getGradleClasspath() {
-        File customGradleBin = null;
-        List<File> pathElements = new ArrayList<File>();
-        if (System.getProperty("gradle.bootstrap.gradleBin") != null) {
-            customGradleBin = new File(System.getProperty("gradle.bootstrap.gradleBin"));
-            pathElements.add(customGradleBin);
-        }
-        for (File homeLibFile : getGradleHomeLibClasspath()) {
-            if (homeLibFile.isFile() && !(customGradleBin != null && homeLibFile.getName().startsWith("gradle-"))) {
-                pathElements.add(homeLibFile);
-            }
-        }
-        return pathElements;
-    }
-
-    /*
-      This removes unwanted jar files. At the time of this writing, we're only
-      interested in the open api jar.
-
-      @param  nonLoggingJarFiles a list of jar files
-      @param  loadOpenAPI        true to keep the open api jar, false to remove it.
-   */
-    private void removeUnwantedJarFiles(List<File> nonLoggingJarFiles, boolean loadOpenAPI) {
-        if (loadOpenAPI) {
-            return;
-        }
-
-        Iterator<File> iterator = nonLoggingJarFiles.iterator();
-        while (iterator.hasNext()) {
-            File file = iterator.next();
-            if (file.getName().startsWith("gradle-open-api-")) {
-                iterator.remove();
-            }
-        }
-    }
-
-    /*
-      Call this to get the class loader you can use to load gradle classes.
-      @return a URLClassLoader
-   */
-    public URLClassLoader getClassLoader() {
-        return libClassLoader;
-    }
-
-    public Class load(String classPath) throws Exception {
-        return libClassLoader.loadClass(classPath);
-    }
-
-    private static List<URL> toUrl(List<File> files) throws MalformedURLException {
-        List<URL> result = new ArrayList<URL>();
-        for (File file : files) {
-            result.add(file.toURI().toURL());
-        }
-        return result;
-    }
-}
diff --git a/subprojects/open-api/src/main/java/org/gradle/foundation/ParentLastClassLoader.java b/subprojects/open-api/src/main/java/org/gradle/foundation/ParentLastClassLoader.java
deleted file mode 100644
index 0d95db554aad..000000000000
--- a/subprojects/open-api/src/main/java/org/gradle/foundation/ParentLastClassLoader.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.foundation;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLStreamHandlerFactory;
-
-/**
- * <p>This class loader delegates to the parent class loader ONLY if it cannot find it itself. This is meant to solve classloading issues when running something as, say, a plugin inside an application
- * that may have already loaded a different version of some required jars. This makes sure it looks locally first. This is the opposite of a ClassLoader's typical behavior, but it necessary when you
- * can't control the environment in which you're running.
- *
- * <p>Using this class can be very dangerous. You must carefully make sure you understand the ramifications of using this. You should also probably make this the first class loader between your plugin
- * and the plugin's owner.
- * @deprecated No replacement
- */
-@Deprecated
-public class ParentLastClassLoader extends URLClassLoader {
-    public ParentLastClassLoader(URL[] urls, ClassLoader parent) {
-        super(urls, parent);
-    }
-
-    public ParentLastClassLoader(URL[] urls) {
-        super(urls);
-    }
-
-    public ParentLastClassLoader(URL[] urls, ClassLoader parent, URLStreamHandlerFactory factory) {
-        super(urls, parent, factory);
-    }
-
-    /*
-    This has been overridden to look at the parent class loader last.
-    */
-    @Override
-    public Class<?> loadClass(String name) throws ClassNotFoundException {
-        // First check whether it's already been loaded, if so use it
-        Class loadedClass = findLoadedClass(name);
-
-        // Not loaded, try to load it
-        if (loadedClass == null) {
-            try {
-                // Ignore parent delegation and just try to load locally
-                loadedClass = findClass(name);
-            } catch (ClassNotFoundException e) {
-                // Swallow exception - does not exist locally
-            }
-
-            // If not found locally, use normal parent delegation in URLClassloader
-            if (loadedClass == null) {
-                // throws ClassNotFoundException if not found in delegation hierarchy at all
-                loadedClass = super.loadClass(name);
-            }
-        }
-        // will never return null (ClassNotFoundException will be thrown)
-        return loadedClass;
-    }
-}
-
diff --git a/subprojects/open-api/src/main/java/org/gradle/openapi/external/ExternalUtility.java b/subprojects/open-api/src/main/java/org/gradle/openapi/external/ExternalUtility.java
deleted file mode 100644
index b4743ba606dd..000000000000
--- a/subprojects/open-api/src/main/java/org/gradle/openapi/external/ExternalUtility.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.external;
-
-import org.gradle.foundation.BootstrapLoader;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.regex.Pattern;
-
-/**
- * Utility functions required by the OpenAPI
- * @deprecated No replacement
- */
-@Deprecated
-public class ExternalUtility {
-    private static final Pattern GRADLE_CORE_PATTERN = Pattern.compile("^gradle-core-\\d.*\\.jar$");
-
-    /**
-     * Call this to get a classloader that has loaded gradle.
-     *
-     * @param parentClassLoader Your classloader. Probably the classloader of whatever class is calling this.
-     * @param gradleHomeDirectory the root directory of a gradle installation
-     * @param showDebugInfo true to show some additional information that may be helpful diagnosing problems is this fails
-     * @return a classloader that has loaded gradle and all of its dependencies.
-     */
-
-    public static ClassLoader getGradleClassloader(ClassLoader parentClassLoader, File gradleHomeDirectory, boolean showDebugInfo) throws Exception {
-        File gradleJarFile = getGradleJar(gradleHomeDirectory);
-        if (gradleJarFile == null) {
-            throw new RuntimeException("Not a valid gradle home directory '" + gradleHomeDirectory.getAbsolutePath() + "'");
-        }
-
-        System.setProperty("gradle.home", gradleHomeDirectory.getAbsolutePath());
-
-        BootstrapLoader bootstrapLoader = new BootstrapLoader();
-        bootstrapLoader.initialize(parentClassLoader, gradleHomeDirectory, true, false, showDebugInfo);
-        return bootstrapLoader.getClassLoader();
-    }
-
-    /**
-     * This locates the gradle jar. We do NOT want the gradle-wrapper jar.
-     *
-     * @param gradleHomeDirectory the root directory of a gradle installation. We're expecting this to have a child directory named 'lib'.
-     * @return the gradle jar file. Null if we didn't find it.
-     */
-    public static File getGradleJar(File gradleHomeDirectory) {
-        File libDirectory = new File(gradleHomeDirectory, "lib");
-        if (!libDirectory.exists()) {
-            return null;
-        }
-
-        //try to get the gradle.jar. It'll be "gradle-[version].jar"
-        File[] files = libDirectory.listFiles(new FileFilter() {
-            public boolean accept(File file) {
-                return GRADLE_CORE_PATTERN.matcher(file.getName()).matches();
-            }
-        });
-
-        if (files == null || files.length == 0) {
-            return null;
-        }
-
-        //if they've given us a directory with multiple gradle jars, tell them. We won't know which one to use.
-        if (files.length > 1) {
-            throw new RuntimeException("Installation has multiple gradle jars. Cannot determine which one to use. Found files: " + createFileNamesString(files));
-        }
-
-        return files[0];
-    }
-
-    private static StringBuilder createFileNamesString(File[] files) {
-        StringBuilder fileNames = new StringBuilder();
-        for (File f : files) {
-            fileNames.append(f.getAbsolutePath() + ", ");
-        }
-        fileNames.delete(fileNames.length() - 2, fileNames.length()); // Remove the trailing ', '
-        return fileNames;
-    }
-
-    //just a function to help debugging. If we can't find the constructor we want, this dumps out what is available.
-
-    public static String dumpConstructors(Class classInQuestion) {
-        StringBuilder builder = new StringBuilder();
-        Constructor[] constructors = classInQuestion.getConstructors();
-        for (int index = 0; index < constructors.length; index++) {
-            Constructor constructor = constructors[index];
-            builder.append(constructor).append('\n');
-        }
-
-        return builder.toString();
-    }
-
-    public static String dumpMethods(Class classInQuestion) {
-        StringBuilder builder = new StringBuilder();
-
-        Method[] methods = classInQuestion.getMethods();
-        for (int index = 0; index < methods.length; index++) {
-            Method method = methods[index];
-            builder.append(method).append('\n');
-        }
-
-        return builder.toString();
-    }
-
-    /**
-     * This attempts to load the a class from the specified gradle home directory.
-     *
-     * @param classToLoad the full path to the class to load
-     * @param parentClassLoader Your classloader. Probably the classloader of whatever class is calling this.
-     * @param gradleHomeDirectory the root directory of a gradle installation
-     * @param showDebugInfo true to show some additional information that may be helpful diagnosing problems is this fails
-     */
-    public static Class loadGradleClass(String classToLoad, ClassLoader parentClassLoader, File gradleHomeDirectory, boolean showDebugInfo) throws Exception {
-        ClassLoader bootStrapClassLoader = getGradleClassloader(parentClassLoader, gradleHomeDirectory, showDebugInfo);
-        Thread.currentThread().setContextClassLoader(bootStrapClassLoader);
-
-        //load the class in gradle that wraps our return interface and handles versioning issues.
-        try {
-            return bootStrapClassLoader.loadClass(classToLoad);
-        } catch (NoClassDefFoundError e) {  //might be a version mismatch
-            e.printStackTrace();
-            return null;
-        } catch (Throwable e) {  //might be a version mismatch
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * This wraps up invoking a static method into a single call.
-     *
-     * @param classToInvoke the class that has the method
-     * @param methodName the name of the method to invoke
-     * @param argumentsClasses the classes of the arguments (we can't determine this from the argumentValues because they can be of class A, but implement class B and B is be the argument type of the
-     * method in question
-     * @param argumentValues the values of the arguments.
-     * @return the return value of invoking the method.
-     */
-    public static Object invokeStaticMethod(Class classToInvoke, String methodName, Class[] argumentsClasses, Object... argumentValues) throws Exception {
-        Method method = null;
-        try {
-            method = classToInvoke.getDeclaredMethod(methodName, argumentsClasses);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-            System.out.println("Dumping available methods on " + classToInvoke.getName() + "\n" + ExternalUtility.dumpMethods(classToInvoke));
-            throw e;
-        }
-        return method.invoke(null, argumentValues);
-    }
-}
diff --git a/subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerFactory.java b/subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerFactory.java
deleted file mode 100644
index 02bad4e30198..000000000000
--- a/subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerFactory.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.external.runner;
-
-import org.gradle.openapi.external.ExternalUtility;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-
-/**
- * This provides a simple way to execute gradle commands from an external process. call createGradleRunner to instantiate a gradle runner. You can then use that to execute commands.
- * @deprecated Use the tooling API instead.
- */
-@Deprecated
-public class GradleRunnerFactory {
-    /**
-     * Call this to instantiate an object that you can use to execute gradle commands directly.
-     *
-     * Note: this function is meant to be backward and forward compatible. So this signature should not change at all, however, it may take and return objects that implement ADDITIONAL interfaces. That
-     * is, it will always return a GradleRunnerVersion1, but it may also be an object that implements GradleRunnerVersion2 (notice the 2). The caller will need to dynamically determine that. The
-     * GradleRunnerInteractionVersion1 may take an object that also implements GradleRunnerInteractionVersion2. If so, we'll dynamically determine that and handle it. Of course, this all depends on
-     * what happens in the future.
-     *
-     * @param parentClassLoader Your classloader. Probably the classloader of whatever class is calling this.
-     * @param gradleHomeDirectory the root directory of a gradle installation
-     * @param interaction this is how we interact with the caller.
-     * @param showDebugInfo true to show some additional information that may be helpful diagnosing problems is this fails
-     * @return a gradle runner
-     * @deprecated Use the tooling API instead.
-     */
-    @Deprecated
-    public static GradleRunnerVersion1 createGradleRunner(ClassLoader parentClassLoader, File gradleHomeDirectory, GradleRunnerInteractionVersion1 interaction, boolean showDebugInfo)
-            throws Exception {
-        //much of this function is exception handling so if we can't obtain it via the newer factory method, then
-        //we'll try the old way, but we want to report the original exception if we can't do it either way.
-        Exception viaFactoryException = null;
-        GradleRunnerVersion1 gradleRunner = null;
-
-        //first, try it the new way
-        try {
-            gradleRunner = createGradleRunnerViaFactory(parentClassLoader, gradleHomeDirectory, interaction, showDebugInfo);
-        } catch (Exception e) {
-            //we might ignore this. It means we're probably using an older version of gradle. That case is handled below.
-            //If not, this exception will be thrown at the end.
-            viaFactoryException = e;
-        }
-
-        //try it the old way
-        if (gradleRunner == null) {
-            gradleRunner = createGradleRunnerOldWay(parentClassLoader, gradleHomeDirectory, interaction, showDebugInfo);
-        }
-
-        //if we still don't have a gradle runner and we have an exception from using the factory, throw it. If we
-        //got an exception using the 'old way', it would have been thrown already and we wouldn't be here.
-        if (gradleRunner == null && viaFactoryException != null) {
-            throw viaFactoryException;
-        }
-
-        return gradleRunner;
-    }
-
-    /**
-     * This function uses a factory to instantiate a GradleRunner. The factory is located with the version of gradle pointed to by gradleHomeDirectory and thus allows the version of gradle being loaded
-     * to make decisions about how to instantiate the runner. This is needed as multiple versions of the runner are being used.
-     */
-    private static GradleRunnerVersion1 createGradleRunnerViaFactory(ClassLoader parentClassLoader, File gradleHomeDirectory, GradleRunnerInteractionVersion1 interaction, boolean showDebugInfo)
-            throws Exception {
-        //load the class in gradle that wraps our return interface and handles versioning issues.
-        Class soughtClass = ExternalUtility.loadGradleClass("org.gradle.openapi.wrappers.RunnerWrapperFactory", parentClassLoader, gradleHomeDirectory, showDebugInfo);
-        if (soughtClass == null) {
-            return null;
-        }
-
-        Class[] argumentClasses = new Class[]{File.class, GradleRunnerInteractionVersion1.class, boolean.class};
-
-        Object gradleRunner = ExternalUtility.invokeStaticMethod(soughtClass, "createGradleRunner", argumentClasses, gradleHomeDirectory, interaction, showDebugInfo);
-        return (GradleRunnerVersion1) gradleRunner;
-    }
-
-    /**
-     * This function uses an early way (early 0.9 pre-release and sooner) of instantiating the GradleRunner and should no longer be used. It unfortunately is tied to a single wrapper class instance
-     * (which it tries to directly instantiate). This doesn't allow the GradleRunner to adaptively determine what to instantiate.
-     */
-    private static GradleRunnerVersion1 createGradleRunnerOldWay(ClassLoader parentClassLoader, File gradleHomeDirectory, GradleRunnerInteractionVersion1 interaction, boolean showDebugInfo)
-            throws Exception {
-        ClassLoader bootStrapClassLoader = ExternalUtility.getGradleClassloader(parentClassLoader, gradleHomeDirectory, showDebugInfo);
-        Thread.currentThread().setContextClassLoader(bootStrapClassLoader);
-
-        //load the class in gradle that wraps our return interface and handles versioning issues.
-        Class soughtClass = null;
-        try {
-            soughtClass = bootStrapClassLoader.loadClass("org.gradle.openapi.wrappers.runner.GradleRunnerWrapper");
-        } catch (NoClassDefFoundError e) {  //might be a version mismatch
-            e.printStackTrace();
-            return null;
-        } catch (ClassNotFoundException e) {  //might be a version mismatch
-            e.printStackTrace();
-            return null;
-        }
-
-        if (soughtClass == null) {
-            return null;
-        }
-
-        //instantiate it.
-        Constructor constructor = null;
-        try {
-            constructor = soughtClass.getDeclaredConstructor(File.class, GradleRunnerInteractionVersion1.class);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-            System.out.println("Dumping available constructors on " + soughtClass.getName() + "\n" + ExternalUtility.dumpConstructors(soughtClass));
-
-            throw e;
-        }
-
-        Object gradleRunner = constructor.newInstance(gradleHomeDirectory, interaction);
-
-        return (GradleRunnerVersion1) gradleRunner;
-    }
-}
diff --git a/subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerVersion1.java b/subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerVersion1.java
deleted file mode 100644
index 3397af85a3c0..000000000000
--- a/subprojects/open-api/src/main/java/org/gradle/openapi/external/runner/GradleRunnerVersion1.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.external.runner;
-
-/**
- * This executes gradle commands in an external process.
- * @deprecated Use the tooling API instead
- */
-@Deprecated
-public interface GradleRunnerVersion1 {
-    /**
-     * Call this to execute the specified command line.
-     *
-     * @param commandLine the command to execute
-     */
-    public void executeCommand(String commandLine);
-
-    /**
-     * Call this to stop the gradle command. This is killing the process, not gracefully exiting.
-     */
-    public void killProcess();
-}
diff --git a/subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/DualPaneUIVersion1.java b/subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/DualPaneUIVersion1.java
deleted file mode 100644
index dec3f66622ac..000000000000
--- a/subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/DualPaneUIVersion1.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.external.ui;
-
-import javax.swing.JComponent;
-import java.awt.Component;
-
-/**
-This is a gradle UI that is broken into two panels: one contains a tabbed pane
- of tasks, favorites, command line, etc. The other pane contains the output.
- This is meant to simplify how an IDE plugin can interact with gradle. Specifically,
- this allows the 'main' pane to be vertical and the output pane to be horizontal.
-
- To use this, you'll want to get an instance of this from Gradle. Then setup
- your UI and add this to it via getComponent. Then call aboutToShow before
- you display your UI. Call close before you hide your UI. You'll need to set
- the current directory (at any time) so gradle knows where your project is
- located.
-
- @deprecated No replacement
- */
-@Deprecated
-public interface DualPaneUIVersion1 extends BasicGradleUIVersion1 {
-   /**
-      Returns a component that shows the task tree tab, favorites tab, etc.
-      suitable for inserting in your UI.
-      @return the main component
-    */
-   public JComponent getMainComponent();
-
-   /**
-      Returns a component that shows the output of the tasks being executed.
-      This is suitable for inserting in your UI.
-      @return the output component
-   */
-   public Component getOutputPanel();
-
-    /**
-     * This gets the number of opened output tabs. This is used by the Idea plugin
-     * to determine if it should close the entire output pane when a tab is closed
-     * This doesn't determine whether or not the tabs are busy. See
-     * GradleInterfaceVersion1.isBusy for that 
-     * @return the number of opened output tabs.
-     */
-   public int getNumberOfOpenedOutputTabs();
-}
diff --git a/subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/UIFactory.java b/subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/UIFactory.java
deleted file mode 100644
index 8b80bf47c716..000000000000
--- a/subprojects/open-api/src/main/java/org/gradle/openapi/external/ui/UIFactory.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.external.ui;
-
-import org.gradle.openapi.external.ExternalUtility;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-
-/**
- * This loads up the main gradle UI. This is intended to be used as a plugin inside another application (like an IDE) in a dynamic fashion. If you're always going to ship the entire plugin with the
- * entire Gradle dist, you don't need to use this. This is meant to dynamically load Gradle from its dist. The idea is that you point your plugin to a Gradle dist and then can always load the latest
- * version.
- * @deprecated No replacement
- */
-@Deprecated
-public class UIFactory {
-    private static final String UIWRAPPER_FACTORY_CLASS_NAME = "org.gradle.openapi.wrappers.UIWrapperFactory";
-
-    /**
-     * Call this to instantiate a self-contained gradle UI. That is, everything in the UI is in a single panel (versus 2 panels one for the tasks and one for the output). This will load gradle via
-     * reflection, instantiate the UI and all required gradle-related classes.
-     *
-     * <p>Note: this function is meant to be backward and forward compatible. So this signature should not change at all, however, it may take and return objects that implement ADDITIONAL interfaces.
-     * That is, it will always return SinglePaneUIVersion1, but it may also be an object that implements SinglePaneUIVersion2 (notice the 2). The caller will need to dynamically determine that. The
-     * SinglePaneUIInteractionVersion1 may take an object that also implements SinglePaneUIInteractionVersion2. If so, we'll dynamically determine that and handle it. Of course, this all depends on
-     * what happens in the future.
-     *
-     * @param parentClassLoader Your classloader. Probably the classloader of whatever class is calling this.
-     * @param gradleHomeDirectory the root directory of a gradle installation
-     * @param showDebugInfo true to show some additional information that may be helpful diagnosing problems is this fails
-     * @return the UI object.
-     * @deprecated Use the tooling API instead.
-     */
-    @Deprecated
-    public static SinglePaneUIVersion1 createSinglePaneUI(ClassLoader parentClassLoader, File gradleHomeDirectory, final SinglePaneUIInteractionVersion1 interaction, boolean showDebugInfo)
-            throws Exception {
-        //much of this function is exception handling so if we can't obtain it via the newer factory method, then
-        //we'll try the old way, but we want to report the original exception if we can't do it either way.
-        Exception viaFactoryException = null;
-        SinglePaneUIVersion1 gradleUI = null;
-
-        //first, try it the new way
-        try {
-            gradleUI = createSinglePaneUIViaFactory(parentClassLoader, gradleHomeDirectory, interaction, showDebugInfo);
-        } catch (Exception e) {
-            //we might ignore this. It means we're probably using an older version of gradle. That case is handled below.
-            //If not, this exception will be thrown at the end.
-            viaFactoryException = e;
-        }
-
-        //try it the old way
-        if (gradleUI == null) {
-            gradleUI = createSinglePaneUIOldWay(parentClassLoader, gradleHomeDirectory, interaction, showDebugInfo);
-        }
-
-        //if we still don't have a gradle ui and we have an exception from using the factory, throw it. If we
-        //got an exception using the 'old way', it would have been thrown already and we wouldn't be here.
-        if (gradleUI == null && viaFactoryException != null) {
-            throw viaFactoryException;
-        }
-
-        return gradleUI;
-    }
-
-    /**
-     * This function uses a factory to instantiate the UI. The factory is located with the version of gradle pointed to by gradleHomeDirectory and thus allows the version of gradle being loaded to make
-     * decisions about how to instantiate the UI. This is needed as multiple versions of the UI are being used.
-     */
-    private static SinglePaneUIVersion1 createSinglePaneUIViaFactory(ClassLoader parentClassLoader, File gradleHomeDirectory, final SinglePaneUIInteractionVersion1 interaction, boolean showDebugInfo)
-            throws Exception {
-        //load the class in gradle that wraps our return interface and handles versioning issues.
-        Class soughtClass = ExternalUtility.loadGradleClass(UIWRAPPER_FACTORY_CLASS_NAME, parentClassLoader, gradleHomeDirectory, showDebugInfo);
-        if (soughtClass == null) {
-            return null;
-        }
-
-        Class[] argumentClasses = new Class[]{SinglePaneUIInteractionVersion1.class, boolean.class};
-
-        Object gradleUI = ExternalUtility.invokeStaticMethod(soughtClass, "createSinglePaneUI", argumentClasses, interaction, showDebugInfo);
-        return (SinglePaneUIVersion1) gradleUI;
-    }
-
-    /**
-     * This function uses an early way (early 0.9 pre-release and sooner) of instantiating the UI and should no longer be used. It unfortunately is tied to a single wrapper class instance (which it
-     * tries to directly instantiate). This doesn't allow the Gradle UI to adaptively determine what to instantiate.
-     */
-    private static SinglePaneUIVersion1 createSinglePaneUIOldWay(ClassLoader parentClassLoader, File gradleHomeDirectory, final SinglePaneUIInteractionVersion1 singlePaneUIArguments,
-                                                                 boolean showDebugInfo) throws Exception {
-        ClassLoader bootStrapClassLoader = ExternalUtility.getGradleClassloader(parentClassLoader, gradleHomeDirectory, showDebugInfo);
-        Thread.currentThread().setContextClassLoader(bootStrapClassLoader);
-
-        //load the class in gradle that wraps our return interface and handles versioning issues.
-        Class soughtClass = null;
-        try {
-            soughtClass = bootStrapClassLoader.loadClass("org.gradle.openapi.wrappers.ui.SinglePaneUIWrapper");
-        } catch (NoClassDefFoundError e) {  //might be a version mismatch
-            e.printStackTrace();
-            return null;
-        } catch (ClassNotFoundException e) {  //might be a version mismatch
-            e.printStackTrace();
-        }
-        if (soughtClass == null) {
-            return null;
-        }
-
-        //instantiate it.
-        Constructor constructor = null;
-        try {
-            constructor = soughtClass.getDeclaredConstructor(SinglePaneUIInteractionVersion1.class);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-            System.out.println("Dumping available constructors on " + soughtClass.getName() + "\n" + ExternalUtility.dumpConstructors(soughtClass));
-
-            throw e;
-        }
-        Object singlePaneUI = constructor.newInstance(singlePaneUIArguments);
-        return (SinglePaneUIVersion1) singlePaneUI;
-    }
-
-    /**
-     * Call this to instantiate a gradle UI that contains the main tab control separate from the output panel. This allows you to position the output however you like. For example: you can place the
-     * main pane along the side going vertically and you can place the output pane along the bottom going horizontally. This will load gradle via reflection, instantiate the UI and all required
-     * gradle-related classes.
-     *
-     * <p>Note: this function is meant to be backward and forward compatible. So this signature should not change at all, however, it may take and return objects that implement ADDITIONAL interfaces.
-     * That is, it will always return SinglePaneUIVersion1, but it may also be an object that implements SinglePaneUIVersion2 (notice the 2). The caller will need to dynamically determine that. The
-     * SinglePaneUIInteractionVersion1 may take an object that also implements SinglePaneUIInteractionVersion2. If so, we'll dynamically determine that and handle it. Of course, this all depends on
-     * what happens in the future.
-     *
-     * @param parentClassLoader Your classloader. Probably the classloader of whatever class is calling this.
-     * @param gradleHomeDirectory the root directory of a gradle installation
-     * @param interaction this is how we interact with the caller.
-     * @param showDebugInfo true to show some additional information that may be helpful diagnosing problems is this fails
-     * @return the UI object.
-     * @deprecated Use the tooling API instead.
-     */
-    @Deprecated
-    public static DualPaneUIVersion1 createDualPaneUI(ClassLoader parentClassLoader, File gradleHomeDirectory, final DualPaneUIInteractionVersion1 interaction, boolean showDebugInfo)
-            throws Exception {
-        //much of this function is exception handling so if we can't obtain it via the newer factory method, then
-        //we'll try the old way, but we want to report the original exception if we can't do it either way.
-        Exception viaFactoryException = null;
-        DualPaneUIVersion1 gradleUI = null;
-
-        //first, try it the new way
-        try {
-            gradleUI = createDualPaneUIViaFactory(parentClassLoader, gradleHomeDirectory, interaction, showDebugInfo);
-        } catch (Exception e) {
-            //we might ignore this. It means we're probably using an older version of gradle. That case is handled below.
-            //If not, this exception will be thrown at the end.
-            viaFactoryException = e;
-        }
-
-        //try it the old way
-        if (gradleUI == null) {
-            gradleUI = createDualPaneUIOldWay(parentClassLoader, gradleHomeDirectory, interaction, showDebugInfo);
-        }
-
-        //if we still don't have a gradle ui and we have an exception from using the factory, throw it. If we
-        //got an exception using the 'old way', it would have been thrown already and we wouldn't be here.
-        if (gradleUI == null && viaFactoryException != null) {
-            throw viaFactoryException;
-        }
-
-        return gradleUI;
-    }
-
-    /**
-     * This function uses a factory to instantiate the UI. The factory is located with the version of gradle pointed to by gradleHomeDirectory and thus allows the version of gradle being loaded to make
-     * decisions about how to instantiate the UI. This is needed as multiple versions of the UI are being used.
-     * @deprecated Use the tooling API instead.
-     */
-    @Deprecated
-    public static DualPaneUIVersion1 createDualPaneUIViaFactory(ClassLoader parentClassLoader, File gradleHomeDirectory, final DualPaneUIInteractionVersion1 interaction, boolean showDebugInfo)
-            throws Exception {
-        //load the class in gradle that wraps our return interface and handles versioning issues.
-        Class soughtClass = ExternalUtility.loadGradleClass(UIWRAPPER_FACTORY_CLASS_NAME, parentClassLoader, gradleHomeDirectory, showDebugInfo);
-        if (soughtClass == null) {
-            return null;
-        }
-
-        Class[] argumentClasses = new Class[]{DualPaneUIInteractionVersion1.class, boolean.class};
-
-        Object gradleUI = ExternalUtility.invokeStaticMethod(soughtClass, "createDualPaneUI", argumentClasses, interaction, showDebugInfo);
-        return (DualPaneUIVersion1) gradleUI;
-    }
-
-    /**
-     * This function uses an early way (early 0.9 pre-release and sooner) of instantiating the UI and should no longer be used. It unfortunately is tied to a single wrapper class instance (which it
-     * tries to directly instantiate). This doesn't allow the Gradle UI to adaptively determine what to instantiate.
-     */
-    private static DualPaneUIVersion1 createDualPaneUIOldWay(ClassLoader parentClassLoader, File gradleHomeDirectory, final DualPaneUIInteractionVersion1 interaction, boolean showDebugInfo)
-            throws Exception {
-        ClassLoader bootStrapClassLoader = ExternalUtility.getGradleClassloader(parentClassLoader, gradleHomeDirectory, showDebugInfo);
-        Thread.currentThread().setContextClassLoader(bootStrapClassLoader);
-
-        //load the class in gradle that wraps our return interface and handles versioning issues.
-        Class soughtClass = null;
-        try {
-            soughtClass = bootStrapClassLoader.loadClass("org.gradle.openapi.wrappers.ui.DualPaneUIWrapper");
-        } catch (NoClassDefFoundError e) {  //might be a version mismatch
-            e.printStackTrace();
-            return null;
-        } catch (ClassNotFoundException e) {  //might be a version mismatch
-            e.printStackTrace();
-        }
-        if (soughtClass == null) {
-            return null;
-        }
-
-        //instantiate it.
-        Constructor constructor = null;
-        try {
-            constructor = soughtClass.getDeclaredConstructor(DualPaneUIInteractionVersion1.class);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-            System.out.println("Dumping available constructors on " + soughtClass.getName() + "\n" + ExternalUtility.dumpConstructors(soughtClass));
-
-            throw e;
-        }
-        Object gradleUI = constructor.newInstance(interaction);
-        return (DualPaneUIVersion1) gradleUI;
-    }
-}
diff --git a/subprojects/open-api/src/test/groovy/org/gradle/openapi/external/ExternalUtilityTest.groovy b/subprojects/open-api/src/test/groovy/org/gradle/openapi/external/ExternalUtilityTest.groovy
deleted file mode 100644
index b47d9a912703..000000000000
--- a/subprojects/open-api/src/test/groovy/org/gradle/openapi/external/ExternalUtilityTest.groovy
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.external
-
-import org.gradle.test.fixtures.file.TestFile
-import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
-import org.junit.Rule
-import spock.lang.Specification
-
-public class ExternalUtilityTest extends Specification {
-    @Rule
-    public TestNameTestDirectoryProvider tmpDir = new TestNameTestDirectoryProvider();
-
-    def getTheRightGradleCore() {
-        TestFile libDir = tmpDir.testDirectory.file('lib')
-
-        when:
-        libDir.deleteDir()
-        libDir.createDir().files('gradle-core-0.9.jar', 'gradle-core-worker-0.9.jar', 'gradle-open-api-0.9.jar')*.touch()
-
-        then:
-        ExternalUtility.getGradleJar(tmpDir.testDirectory).absolutePath == new File(libDir, 'gradle-core-0.9.jar').absolutePath
-
-        when:
-        libDir.deleteDir()
-        libDir.createDir().files('gradle-core-0.9-20100315080959+0100.jar', 'gradle-core-worker-0.9-20100315080959+0100.jar', 'gradle-open-api-0.9-20100315080959+0100.jar')*.touch()
-
-        then:
-        ExternalUtility.getGradleJar(tmpDir.testDirectory).absolutePath == new File(libDir, 'gradle-core-0.9-20100315080959+0100.jar').absolutePath
-    }
-
-    def failWithMultipleGradleCore() {
-        tmpDir.testDirectory.file('lib').createDir().files('gradle-core-0.9.jar', 'gradle-core-0.10.jar', 'gradle-open-api-0.9.jar')*.touch()
-
-        when:
-        ExternalUtility.getGradleJar(tmpDir.testDirectory)
-
-        then:
-        RuntimeException e = thrown()
-        println e.message
-        e.message.contains('gradle-core-0.9.jar')
-        e.message.contains('gradle-core-0.10.jar')
-    }
-
-    def returnNullWitNonExistingGradleCore() {
-        tmpDir.testDirectory.file('lib').createDir().files('gradle-open-api-0.9.jar')*.touch()
-
-        expect:
-        ExternalUtility.getGradleJar(tmpDir.testDirectory) == null
-    }
-
-    def failWitNonExistingGradleHome() {
-        expect:
-        ExternalUtility.getGradleJar(tmpDir.testDirectory) == null
-    }
-
-}
diff --git a/subprojects/performance/src/integTest/groovy/org/gradle/performance/CleanBuildPerformanceTest.groovy b/subprojects/performance/src/integTest/groovy/org/gradle/performance/CleanBuildPerformanceTest.groovy
index d0f3794b5768..4b0d7ae3a163 100644
--- a/subprojects/performance/src/integTest/groovy/org/gradle/performance/CleanBuildPerformanceTest.groovy
+++ b/subprojects/performance/src/integTest/groovy/org/gradle/performance/CleanBuildPerformanceTest.groovy
@@ -16,7 +16,6 @@
 
 package org.gradle.performance
 
-import org.gradle.performance.fixture.AbstractPerformanceTest
 import spock.lang.Unroll
 
 import static org.gradle.performance.measure.Duration.millis
diff --git a/subprojects/performance/src/integTest/groovy/org/gradle/performance/ConfigurationPerformanceTest.groovy b/subprojects/performance/src/integTest/groovy/org/gradle/performance/ConfigurationPerformanceTest.groovy
index 05e5bffaeaa0..b53f7589cf6b 100644
--- a/subprojects/performance/src/integTest/groovy/org/gradle/performance/ConfigurationPerformanceTest.groovy
+++ b/subprojects/performance/src/integTest/groovy/org/gradle/performance/ConfigurationPerformanceTest.groovy
@@ -16,7 +16,6 @@
 
 package org.gradle.performance
 
-import org.gradle.performance.fixture.AbstractPerformanceTest
 import spock.lang.Unroll
 
 import static org.gradle.performance.measure.Duration.millis
diff --git a/subprojects/performance/src/integTest/groovy/org/gradle/performance/DependencyReportPerformanceTest.groovy b/subprojects/performance/src/integTest/groovy/org/gradle/performance/DependencyReportPerformanceTest.groovy
index 9413fc61d837..d4cac20452d0 100644
--- a/subprojects/performance/src/integTest/groovy/org/gradle/performance/DependencyReportPerformanceTest.groovy
+++ b/subprojects/performance/src/integTest/groovy/org/gradle/performance/DependencyReportPerformanceTest.groovy
@@ -16,7 +16,6 @@
 
 package org.gradle.performance
 
-import org.gradle.performance.fixture.AbstractPerformanceTest
 import spock.lang.Unroll
 
 import static org.gradle.performance.measure.Duration.millis
diff --git a/subprojects/performance/src/integTest/groovy/org/gradle/performance/FirstBuildPerformanceTest.groovy b/subprojects/performance/src/integTest/groovy/org/gradle/performance/FirstBuildPerformanceTest.groovy
index c8fb6dffeae9..7b7058930a10 100644
--- a/subprojects/performance/src/integTest/groovy/org/gradle/performance/FirstBuildPerformanceTest.groovy
+++ b/subprojects/performance/src/integTest/groovy/org/gradle/performance/FirstBuildPerformanceTest.groovy
@@ -16,7 +16,6 @@
 
 package org.gradle.performance
 
-import org.gradle.performance.fixture.AbstractPerformanceTest
 import spock.lang.Unroll
 
 import static org.gradle.performance.measure.Duration.millis
diff --git a/subprojects/performance/src/integTest/groovy/org/gradle/performance/IdeIntegrationPerformanceTest.groovy b/subprojects/performance/src/integTest/groovy/org/gradle/performance/IdeIntegrationPerformanceTest.groovy
index 9ef2bda65daf..ec2d01aa04c5 100644
--- a/subprojects/performance/src/integTest/groovy/org/gradle/performance/IdeIntegrationPerformanceTest.groovy
+++ b/subprojects/performance/src/integTest/groovy/org/gradle/performance/IdeIntegrationPerformanceTest.groovy
@@ -16,7 +16,6 @@
 
 package org.gradle.performance
 
-import org.gradle.performance.fixture.AbstractPerformanceTest
 import spock.lang.Unroll
 
 import static org.gradle.performance.measure.Duration.millis
@@ -39,9 +38,9 @@ class IdeIntegrationPerformanceTest extends AbstractPerformanceTest {
 
         where:
         testProject       | maxExecutionTimeRegression
-        "small"           | millis(750)
-        "multi"           | millis(1500)
-        "lotDependencies" | millis(3000)
+        "small"           | millis(800)
+        "multi"           | millis(500)
+        "lotDependencies" | millis(500)
     }
 
     @Unroll("Project '#testProject' idea")
@@ -61,8 +60,8 @@ class IdeIntegrationPerformanceTest extends AbstractPerformanceTest {
 
         where:
         testProject       | maxExecutionTimeRegression
-        "small"           | millis(750)
-        "multi"           | millis(1500)
-        "lotDependencies" | millis(3000)
+        "small"           | millis(800)
+        "multi"           | millis(500)
+        "lotDependencies" | millis(500)
     }
 }
\ No newline at end of file
diff --git a/subprojects/performance/src/integTest/groovy/org/gradle/performance/TestExecutionPerformanceTest.groovy b/subprojects/performance/src/integTest/groovy/org/gradle/performance/TestExecutionPerformanceTest.groovy
index 6883beaecebf..28a61e4cda58 100644
--- a/subprojects/performance/src/integTest/groovy/org/gradle/performance/TestExecutionPerformanceTest.groovy
+++ b/subprojects/performance/src/integTest/groovy/org/gradle/performance/TestExecutionPerformanceTest.groovy
@@ -16,7 +16,6 @@
 
 package org.gradle.performance
 
-import org.gradle.performance.fixture.AbstractPerformanceTest
 import spock.lang.Unroll
 
 import static org.gradle.performance.measure.Duration.millis
diff --git a/subprojects/performance/src/integTest/groovy/org/gradle/performance/UpToDateBuildPerformanceTest.groovy b/subprojects/performance/src/integTest/groovy/org/gradle/performance/UpToDateBuildPerformanceTest.groovy
index bd22cb0be00f..e8be490bd832 100644
--- a/subprojects/performance/src/integTest/groovy/org/gradle/performance/UpToDateBuildPerformanceTest.groovy
+++ b/subprojects/performance/src/integTest/groovy/org/gradle/performance/UpToDateBuildPerformanceTest.groovy
@@ -16,7 +16,6 @@
 
 package org.gradle.performance
 
-import org.gradle.performance.fixture.AbstractPerformanceTest
 import spock.lang.Unroll
 
 import static org.gradle.performance.measure.Duration.millis
diff --git a/subprojects/performance/src/templates/project-with-source/build.gradle b/subprojects/performance/src/templates/project-with-source/build.gradle
index e47923bd8f09..f010f75166be 100644
--- a/subprojects/performance/src/templates/project-with-source/build.gradle
+++ b/subprojects/performance/src/templates/project-with-source/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     compile "commons-httpclient:commons-httpclient:3.0"
     compile "commons-codec:commons-codec:1.2"
     compile "org.slf4j:jcl-over-slf4j:1.7.5"
-    compile "org.codehaus.groovy:groovy:2.0.5"
+    compile "org.codehaus.groovy:groovy:2.2.2"
     compile "commons-codec:commons-codec:1.2"
     testCompile 'junit:junit:4.11'
     testCompile 'org.testng:testng:6.4'
diff --git a/subprojects/performance/src/templates/root-project/pom.xml b/subprojects/performance/src/templates/root-project/pom.xml
index 3dc02dfc48af..709a0b05cdf2 100644
--- a/subprojects/performance/src/templates/root-project/pom.xml
+++ b/subprojects/performance/src/templates/root-project/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.gradle</groupId>
     <artifactId>${projectName}</artifactId>
     <packaging>pom</packaging>
+    <version>1.0</version>
     <modules>
         <% subprojects.each { out.println "<module>$it</module>" } %>
     </modules>
diff --git a/subprojects/performance/src/templates/with-testng/build.gradle b/subprojects/performance/src/templates/with-testng/build.gradle
index 05a9cd840492..771c41418dc5 100644
--- a/subprojects/performance/src/templates/with-testng/build.gradle
+++ b/subprojects/performance/src/templates/with-testng/build.gradle
@@ -3,5 +3,4 @@ ${original}
 test {
     useTestNG()
     maxParallelForks = 2
-    testReport = true
 }
diff --git a/subprojects/performance/src/templates/with-verbose-testng/build.gradle b/subprojects/performance/src/templates/with-verbose-testng/build.gradle
index 05a9cd840492..771c41418dc5 100644
--- a/subprojects/performance/src/templates/with-verbose-testng/build.gradle
+++ b/subprojects/performance/src/templates/with-verbose-testng/build.gradle
@@ -3,5 +3,4 @@ ${original}
 test {
     useTestNG()
     maxParallelForks = 2
-    testReport = true
 }
diff --git a/subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/AbstractPerformanceTest.groovy b/subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractPerformanceTest.groovy
similarity index 90%
rename from subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/AbstractPerformanceTest.groovy
rename to subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractPerformanceTest.groovy
index fdb61d1ef5b7..783677133bd1 100644
--- a/subprojects/performance/src/testFixtures/groovy/org/gradle/performance/fixture/AbstractPerformanceTest.groovy
+++ b/subprojects/performance/src/testFixtures/groovy/org/gradle/performance/AbstractPerformanceTest.groovy
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package org.gradle.performance.fixture
+package org.gradle.performance
 
 import org.gradle.integtests.fixtures.executer.UnderDevelopmentGradleDistribution
+import org.gradle.performance.fixture.CompositeDataReporter
+import org.gradle.performance.fixture.PerformanceTestRunner
+import org.gradle.performance.fixture.TextFileDataReporter
 import org.gradle.performance.measure.DataAmount
 import org.gradle.performance.measure.Duration
 import org.gradle.performance.results.ResultsStore
diff --git a/subprojects/plugin-use/plugin-use.gradle b/subprojects/plugin-use/plugin-use.gradle
new file mode 100644
index 000000000000..0a31387cd818
--- /dev/null
+++ b/subprojects/plugin-use/plugin-use.gradle
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+dependencies {
+    compile project(":core")
+    compile project(":coreImpl")
+    compile project(":resourcesHttp")
+
+    testFixturesCompile project(":internalIntegTesting")
+}
+
+useTestFixtures()
+useClassycle()
\ No newline at end of file
diff --git a/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/CorePluginUseIntegrationSpec.groovy b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/CorePluginUseIntegrationSpec.groovy
new file mode 100644
index 000000000000..d266272b3a50
--- /dev/null
+++ b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/CorePluginUseIntegrationSpec.groovy
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+
+import static org.hamcrest.Matchers.startsWith
+
+class CorePluginUseIntegrationSpec extends AbstractIntegrationSpec {
+
+    void "can resolve core plugins"() {
+        when:
+        buildScript """
+            plugins {
+              id 'java'
+            }
+        """
+
+        then:
+        succeeds "javadoc"
+    }
+
+    void "can resolve qualified core plugins"() {
+        when:
+        buildScript """
+            plugins {
+              id 'org.gradle.java'
+            }
+        """
+
+        then:
+        succeeds "javadoc"
+    }
+
+    void "core plugins cannot have a version number"() {
+        given:
+        buildScript """
+            plugins {
+                id "java" version "1.0"
+            }
+        """
+
+        when:
+        fails "tasks"
+
+        then:
+        failure.assertHasDescription("Error resolving plugin [id: 'java', version: '1.0'].")
+        failure.assertHasCause("Plugin 'java' is a core Gradle plugin, which cannot be specified with a version number")
+        failure.assertHasFileName("Build file '$buildFile.absolutePath'")
+        failure.assertHasLineNumber(3)
+    }
+
+    void "qualified core plugins cannot have a version number"() {
+        given:
+        buildScript """
+            plugins {
+                id "org.gradle.java" version "1.0"
+            }
+        """
+
+        when:
+        fails "tasks"
+
+        then:
+        failure.assertHasDescription("Error resolving plugin [id: 'org.gradle.java', version: '1.0'].")
+        failure.assertHasCause("Plugin 'org.gradle.java' is a core Gradle plugin, which cannot be specified with a version number")
+        failure.assertHasFileName("Build file '$buildFile.absolutePath'")
+        failure.assertHasLineNumber(3)
+    }
+
+    def "cant ask for same plugin twice"() {
+        given:
+        buildScript """
+            plugins {
+                id "java"
+                id "java"
+            }
+        """
+
+        when:
+        fails "tasks"
+
+        then:
+        failure.assertThatDescription(startsWith("Plugin with id 'java' was already requested at line 3"))
+        failure.assertHasFileName("Build file '$buildFile.absolutePath'")
+        failure.assertHasLineNumber(4)
+    }
+
+    def "can reapply core plugin applied via plugins block"() {
+        when:
+        buildScript """
+            plugins {
+                id "java"
+            }
+
+            assert plugins.hasPlugin("java")
+
+            apply plugin: "java"
+        """
+
+        then:
+        succeeds "tasks"
+    }
+
+    def "can reapply core plugin applied via qualified id in plugins block"() {
+        when:
+        buildScript """
+            plugins {
+                id "org.gradle.java"
+            }
+
+            assert plugins.hasPlugin("java")
+
+            apply plugin: "java"
+        """
+
+        then:
+        succeeds "tasks"
+    }
+
+}
diff --git a/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseClassVisibilityIntegrationSpec.groovy b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseClassVisibilityIntegrationSpec.groovy
new file mode 100644
index 000000000000..dffeee1ca434
--- /dev/null
+++ b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseClassVisibilityIntegrationSpec.groovy
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use
+
+import groovy.transform.NotYetImplemented
+import org.gradle.api.Project
+import org.gradle.api.specs.AndSpec
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.plugin.use.resolve.portal.PluginPortalTestServer
+import org.gradle.test.fixtures.plugin.PluginBuilder
+import org.junit.Rule
+
+class PluginUseClassVisibilityIntegrationSpec extends AbstractIntegrationSpec {
+
+    public static final String PLUGIN_ID = "org.myplugin"
+    public static final String VERSION = "1.0"
+    public static final String GROUP = "my"
+    public static final String ARTIFACT = "plugin"
+    public static final String USE = "plugins { id '$PLUGIN_ID' version '$VERSION' }"
+
+    def pluginBuilder = new PluginBuilder(file(ARTIFACT))
+
+    @Rule
+    PluginPortalTestServer portal = new PluginPortalTestServer(executer, mavenRepo)
+
+    def setup() {
+        executer.requireGradleHome() // need accurate classloading
+        portal.start()
+    }
+
+    def "plugin is available via `plugins` container"() {
+        publishPlugin()
+
+        buildScript """
+            $USE
+
+            task verify << {
+                def foundByClass = false
+                plugins.withType(pluginClass) { foundByClass = true }
+                assert foundByClass
+            }
+        """
+
+        expect:
+        succeeds("verify")
+    }
+
+    def "plugin class isn't visible to build script"() {
+        publishPlugin()
+
+        buildScript """
+            $USE
+
+            task verify << {
+                try {
+                    getClass().getClassLoader().loadClass("org.gradle.test.TestPlugin")
+                    throw new AssertionError("plugin class *is* visible to build script")
+                } catch (ClassNotFoundException expected) {}
+            }
+        """
+
+        expect:
+        succeeds("verify")
+    }
+
+    def "plugin can access Gradle API classes"() {
+        publishPlugin """
+            assert project instanceof ${Project.name}; new ${AndSpec.name}()
+            project.task("verify")
+        """
+
+        buildScript USE
+
+        expect:
+        succeeds("verify")
+    }
+
+    def "plugin cannot access core Gradle plugin classes"() {
+        publishPlugin("""
+            try {
+                getClass().getClassLoader().loadClass('org.gradle.api.plugins.JavaPlugin')
+                assert false : "should have failed to load java plugin"
+            } catch (ClassNotFoundException ignore) {
+
+            }
+
+            project.task("verify")
+        """)
+
+        buildScript USE
+
+        expect:
+        succeeds("verify")
+    }
+
+    @NotYetImplemented
+    def "plugin cannot access Gradle implementation classes"() {
+        publishPlugin("""
+            def implClassName = 'com.google.common.collect.Multimap'
+            project.getClass().getClassLoader().loadClass(implClassName)
+
+            try {
+                getClass().getClassLoader().loadClass(implClassName)
+                assert false : "should have failed to load gradle implementation class: \$implClassName"
+            } catch (ClassNotFoundException ignore) {
+
+            }
+
+            project.task("verify")
+        """)
+
+        buildScript USE
+
+        expect:
+        succeeds("verify")
+    }
+
+    void publishPlugin() {
+        publishPlugin("project.ext.pluginApplied = true; project.ext.pluginClass = getClass()")
+    }
+
+    void publishPlugin(String impl) {
+        portal.expectPluginQuery(PLUGIN_ID, VERSION, GROUP, ARTIFACT, VERSION)
+        def module = portal.m2repo.module(GROUP, ARTIFACT, VERSION)
+        module.allowAll()
+
+        pluginBuilder.addPlugin(impl, PLUGIN_ID)
+        pluginBuilder.publishTo(executer, module.artifactFile)
+    }
+
+}
diff --git a/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseDslIntegrationSpec.groovy b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseDslIntegrationSpec.groovy
new file mode 100644
index 000000000000..b8277a5cde40
--- /dev/null
+++ b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseDslIntegrationSpec.groovy
@@ -0,0 +1,225 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import spock.lang.Unroll
+
+import static org.gradle.plugin.internal.PluginId.*
+import static org.gradle.plugin.use.internal.PluginUseScriptBlockTransformer.*
+import static org.hamcrest.Matchers.containsString
+
+class PluginUseDslIntegrationSpec extends AbstractIntegrationSpec {
+
+    def "can use plugins block in project build scripts"() {
+        when:
+        buildScript """
+          plugins {
+            id "noop"
+            id "noop" version "1.0"
+          }
+        """
+
+        then:
+        succeeds "help"
+    }
+
+    def "buildscript blocks are allowed before plugin statements"() {
+        when:
+        buildScript """
+            buildscript {}
+            plugins {}
+        """
+
+        then:
+        succeeds "tasks"
+    }
+
+    def "buildscript blocks are not allowed after plugin blocks"() {
+        when:
+        buildScript """
+            plugins {}
+            buildscript {}
+        """
+
+        then:
+        fails "tasks"
+
+        and:
+        failure.assertHasLineNumber 3
+        failure.assertHasFileName("Build file '${buildFile}'")
+        failure.assertThatCause(containsString("all buildscript {} blocks must appear before any plugins {} blocks"))
+    }
+
+    def "build logic cannot precede plugins block"() {
+        when:
+        buildScript """
+            someThing()
+            plugins {}
+        """
+
+        then:
+        fails "tasks"
+
+        and:
+        failure.assertHasLineNumber 3
+        failure.assertHasFileName("Build file '${buildFile}'")
+        failure.assertThatCause(containsString("only buildscript {} and other plugins {} script blocks are allowed before plugins {} blocks, no other statements are allowed"))
+    }
+
+    def "build logic cannot precede any plugins block"() {
+        when:
+        buildScript """
+            plugins {}
+            someThing()
+            plugins {}
+        """
+
+        then:
+        fails "tasks"
+
+        and:
+        failure.assertHasLineNumber 4
+        failure.assertHasFileName("Build file '${buildFile}'")
+        failure.assertThatCause(containsString("only buildscript {} and other plugins {} script blocks are allowed before plugins {} blocks, no other statements are allowed"))
+    }
+
+    def "settings scripts cannot plugin blocks"() {
+        when:
+        settingsFile << "plugins {}"
+
+        then:
+        fails "help"
+
+        failure.assertHasLineNumber 1
+        failure.assertHasFileName("Settings file '$settingsFile.absolutePath'")
+        failure.assertThatCause(containsString("Only Project build scripts can contain plugins {} blocks"))
+    }
+
+    def "init scripts cannot have plugin blocks"() {
+        def initScript = file("init.gradle")
+
+        when:
+        initScript << "plugins {}"
+
+        then:
+        args "-I", initScript.absolutePath
+        fails "help"
+
+        failure.assertHasLineNumber 1
+        failure.assertHasFileName("Initialization script '$initScript.absolutePath'")
+        failure.assertThatCause(containsString("Only Project build scripts can contain plugins {} blocks"))
+    }
+
+    def "script plugins cannot have plugin blocks"() {
+        def scriptPlugin = file("plugin.gradle")
+
+        when:
+        scriptPlugin << "plugins {}"
+        buildScript "apply from: 'plugin.gradle'"
+
+        then:
+        fails "help"
+
+        failure.assertHasLineNumber 1
+        failure.assertHasFileName("Script '$scriptPlugin.absolutePath'")
+        failure.assertThatCause(containsString("Only Project build scripts can contain plugins {} blocks"))
+    }
+
+    def "script plugins applied to arbitrary objects cannot have plugin blocks"() {
+        def scriptPlugin = file("plugin.gradle")
+
+        when:
+        scriptPlugin << "plugins {}"
+        buildScript "task foo; apply from: 'plugin.gradle', to: foo"
+
+        then:
+        fails "help"
+
+        failure.assertHasLineNumber 1
+        failure.assertHasFileName("Script '$scriptPlugin.absolutePath'")
+        failure.assertThatCause(containsString("Only Project build scripts can contain plugins {} blocks"))
+    }
+
+    @Unroll
+    def "illegal syntax in plugins block - #code"() {
+        when:
+        buildScript("""plugins {\n$code\n}""")
+
+        then:
+        fails "help"
+        failure.assertHasLineNumber lineNumber
+        failure.assertHasFileName("Build file '${buildFile}'")
+        failure.assertThatCause(containsString(msg))
+
+        where:
+        lineNumber | code                                   | msg
+        2          | "a"                                    | BASE_MESSAGE
+        2          | "def a = null"                         | BASE_MESSAGE
+        2          | "def a = id('foo')"                    | BASE_MESSAGE
+        2          | "delegate.id('a')"                     | BASE_MESSAGE
+        2          | "id()"                                 | INVALID_ARGUMENT_LIST
+        2          | "id(1)"                                | INVALID_ARGUMENT_LIST
+        2          | "id(System.getProperty('foo'))"        | INVALID_ARGUMENT_LIST
+        2          | "id('a' + 'b')"                        | INVALID_ARGUMENT_LIST
+        2          | "id(\"\${'foo'}\")"                    | INVALID_ARGUMENT_LIST
+        2          | "version('foo')"                       | BASE_MESSAGE
+        2          | "id('foo').version(1)"                 | INVALID_ARGUMENT_LIST
+        2          | "id 'foo' version 1"                   | INVALID_ARGUMENT_LIST
+        2          | "id 'foo' bah '1'"                     | VERSION_MESSAGE
+        2          | "foo 'foo' version '1'"                | BASE_MESSAGE
+        3          | "id('foo')\nfoo 'bar'"                 | BASE_MESSAGE
+        2          | "if (true) id 'foo'"                   | BASE_MESSAGE
+        2          | "id 'foo';version 'bar'"               | BASE_MESSAGE
+        2          | "id('foo').\"\${'version'}\" 'bar'"    | BASE_MESSAGE
+        2          | "id ' '"                               | invalidPluginIdCharMessage(' ' as char)
+        2          | "id '\$'"                              | invalidPluginIdCharMessage('$' as char)
+        2          | "id ''"                                | INVALID_ARGUMENT_LIST
+        2          | "id 'foo' version ''"                  | INVALID_ARGUMENT_LIST
+        2          | "id null"                              | INVALID_ARGUMENT_LIST
+        2          | "id 'foo' version null"                | INVALID_ARGUMENT_LIST
+        2          | "id '.foo'"                            | ID_SEPARATOR_ON_START_OR_END
+        2          | "id 'foo.'"                            | ID_SEPARATOR_ON_START_OR_END
+        2          | "id '.'"                               | ID_SEPARATOR_ON_START_OR_END
+        2          | "id 'foo..bar'"                        | DOUBLE_SEPARATOR
+        2          | "file('foo')" /* script api */         | BASE_MESSAGE
+        2          | "getVersion()" /* script target api */ | BASE_MESSAGE
+    }
+
+    @Unroll
+    def "allowed syntax in plugins block - #code"() {
+        when:
+        buildScript("""plugins {\n$code\n}""")
+
+        then:
+        succeeds "help"
+
+        where:
+        code << [
+                "id('noop')",
+                "id 'noop'",
+                "id('noop').version('bar')",
+                "id 'noop' version 'bar'",
+                "id('noop').\nversion 'bar'",
+                "id('noop');id('noop')",
+                "id('noop')\nid('noop')",
+                "id('noop').version('bar');id('noop').version('foo')",
+                "id('noop').version('bar')\nid('noop').version('foo')",
+        ]
+    }
+
+}
diff --git a/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseLegacyIntegrationSpec.groovy b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseLegacyIntegrationSpec.groovy
new file mode 100644
index 000000000000..21f43cd0a25b
--- /dev/null
+++ b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/PluginUseLegacyIntegrationSpec.groovy
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.test.fixtures.plugin.PluginBuilder
+import spock.lang.Ignore
+
+import static org.gradle.plugin.use.resolve.internal.NotInPluginRegistryPluginResolverCheck.pluginOnClasspathErrorMessage
+
+/**
+ * Tests various interactions between the “new” plugin system and the “legacy”.
+ */
+@Ignore
+class PluginUseLegacyIntegrationSpec extends AbstractIntegrationSpec {
+
+    private testPluginBuildscriptBlock() {
+        return """
+            buildscript {
+                repositories {
+                    maven { url "$mavenRepo.uri" }
+                }
+                dependencies {
+                    classpath "plugin:plugin:1.0"
+                }
+            }
+        """
+    }
+
+    private testPluginPluginsBlock() {
+        return """
+            plugins {
+                id "plugin"
+            }
+        """
+    }
+
+    private publishTestPlugin() {
+        def pluginBuilder = new PluginBuilder(testDirectory.file("plugin"))
+
+        def module = mavenRepo.module("plugin", "plugin")
+        def artifactFile = module.artifact([:]).artifactFile
+        module.publish()
+
+        def message = "from plugin"
+        def taskName = "pluginTask"
+        pluginBuilder.addPluginWithPrintlnTask(taskName, message, "plugin")
+        pluginBuilder.publishTo(executer, artifactFile)
+    }
+
+    private publishBuildSrcTestPlugin() {
+        def pluginBuilder = new PluginBuilder(file("buildSrc"))
+        def message = "from plugin"
+        def taskName = "pluginTask"
+        pluginBuilder.addPluginWithPrintlnTask(taskName, message, "plugin")
+        pluginBuilder.generateForBuildSrc()
+    }
+
+    def "cannot apply plugins added to parent buildscript classpath in plugins block"() {
+        given:
+        publishTestPlugin()
+
+        when:
+        buildScript """
+            ${testPluginBuildscriptBlock()}
+        """
+
+        settingsFile << "include 'sub'"
+
+        file("sub/build.gradle") << """
+            ${testPluginPluginsBlock()}
+        """
+
+        then:
+        fails "sub:tasks"
+
+        and:
+        failure.assertHasCause(pluginOnClasspathErrorMessage('plugin'))
+    }
+
+    def "cannot apply buildSrc plugins in plugins block"() {
+        given:
+        publishBuildSrcTestPlugin()
+
+        when:
+        buildScript """
+            ${testPluginPluginsBlock()}
+        """
+
+        then:
+        fails "tasks"
+
+        and:
+        failure.assertHasCause(pluginOnClasspathErrorMessage('plugin'))
+    }
+
+
+}
diff --git a/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalPostResolutionIntegrationTest.groovy b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalPostResolutionIntegrationTest.groovy
new file mode 100644
index 000000000000..d8feab742458
--- /dev/null
+++ b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalPostResolutionIntegrationTest.groovy
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.portal
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.test.fixtures.plugin.PluginBuilder
+import org.hamcrest.Matchers
+import org.junit.Rule
+
+class PluginPortalPostResolutionIntegrationTest extends AbstractIntegrationSpec {
+    def pluginBuilder = new PluginBuilder(file("plugin"))
+
+    @Rule
+    PluginPortalTestServer portal = new PluginPortalTestServer(executer, mavenRepo)
+
+    def setup() {
+        portal.start()
+    }
+
+    def "error finding plugin by id"() {
+        portal.expectPluginQuery("myplugin", "1.0", "my", "plugin", "1.0")
+        publishPlugin("otherid", "my", "plugin", "1.0")
+
+        buildScript applyPlugin("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertThatDescription(Matchers.startsWith("A problem occurred configuring root project"))
+        failure.assertHasCause("Plugin with id 'myplugin' not found.")
+
+    }
+
+    def "error loading plugin"() {
+        portal.expectPluginQuery("myplugin", "1.0", "my", "plugin", "1.0")
+        publishUnloadablePlugin("myplugin", "my", "plugin", "1.0")
+
+        buildScript applyPlugin("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertThatDescription(Matchers.startsWith("A problem occurred configuring root project"))
+        failure.assertHasCause("Could not create plugin of type 'TestPlugin'.")
+    }
+
+    def "error applying plugin"() {
+        portal.expectPluginQuery("myplugin", "1.0", "my", "plugin", "1.0")
+        publishFailingPlugin("myplugin", "my", "plugin", "1.0")
+
+        buildScript applyPlugin("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertThatDescription(Matchers.startsWith("A problem occurred configuring root project"))
+        failure.assertHasCause("throwing plugin")
+    }
+
+    private void publishPlugin(String pluginId, String group, String artifact, String version) {
+        def module = portal.m2repo.module(group, artifact, version) // don't know why tests are failing if this module is publish()'ed
+        module.allowAll()
+        pluginBuilder.addPlugin("project.ext.pluginApplied = true", pluginId)
+        pluginBuilder.publishTo(executer, module.artifactFile)
+    }
+
+    private void publishUnloadablePlugin(String pluginId, String group, String artifact, String version) {
+        def module = portal.m2repo.module(group, artifact, version)
+        module.allowAll()
+        pluginBuilder.addUnloadablePlugin(pluginId)
+        pluginBuilder.publishTo(executer, module.artifactFile)
+    }
+
+    private void publishFailingPlugin(String pluginId, String group, String artifact, String version) {
+        def module = portal.m2repo.module(group, artifact, version)
+        module.allowAll()
+        pluginBuilder.addPlugin("throw new Exception('throwing plugin')", pluginId)
+        pluginBuilder.publishTo(executer, module.artifactFile)
+    }
+
+    private static String applyPlugin(String id, String version) {
+        """
+            plugins {
+                id "$id" version "$version"
+            }
+
+            task verify // no-op, but gives us a task to execute
+        """
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalResolutionIntegrationTest.groovy b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalResolutionIntegrationTest.groovy
new file mode 100644
index 000000000000..a594ca4faa7b
--- /dev/null
+++ b/subprojects/plugin-use/src/integTest/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalResolutionIntegrationTest.groovy
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.portal
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.test.fixtures.plugin.PluginBuilder
+import org.gradle.util.GradleVersion
+import org.hamcrest.Matchers
+import org.junit.Rule
+
+public class PluginPortalResolutionIntegrationTest extends AbstractIntegrationSpec {
+    def pluginBuilder = new PluginBuilder(file("plugin"))
+
+    @Rule
+    PluginPortalTestServer portal = new PluginPortalTestServer(executer, mavenRepo)
+
+    def setup() {
+        portal.start()
+    }
+
+    def "plugin declared in plugins {} block gets resolved and applied"() {
+        portal.expectPluginQuery("myplugin", "1.0", "my", "plugin", "1.0")
+        publishPlugin("myplugin", "my", "plugin", "1.0")
+
+        buildScript applyAndVerify("myplugin", "1.0")
+
+        expect:
+        succeeds("verify")
+    }
+
+    def "404 response from plugin portal fails plugin resolution"() {
+        portal.expectMissing("myplugin", "1.0")
+
+        buildScript applyAndVerify("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertThatDescription(Matchers.startsWith("Plugin [id: 'myplugin', version: '1.0'] not found in plugin repositories:"))
+    }
+
+    def "failed module resolution fails plugin resolution"() {
+        portal.expectPluginQuery("myplugin", "1.0", "my", "plugin", "1.0")
+
+        buildScript applyAndVerify("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertHasDescription("Error resolving plugin [id: 'myplugin', version: '1.0'].")
+        failure.assertHasCause("Could not resolve all dependencies for configuration 'detachedConfiguration1'.")
+        failure.assertHasCause("Could not find my:plugin:1.0.")
+    }
+
+    def "portal JSON response with unknown implementation type fails plugin resolution"() {
+        portal.expectPluginQuery("myplugin", "1.0", "foo", "foo", "foo") {
+            implementationType = "SUPER_GREAT"
+        }
+
+        buildScript applyAndVerify("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertHasDescription("Error resolving plugin [id: 'myplugin', version: '1.0'].")
+        failure.assertHasCause("Invalid plugin metadata: Unsupported implementation type: SUPER_GREAT.")
+    }
+
+    def "portal JSON response with missing repo fails plugin resolution"() {
+        portal.expectPluginQuery("myplugin", "1.0", "foo", "bar", "1.0") {
+            implementation.repo = null
+        }
+
+        buildScript applyAndVerify("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertHasDescription("Error resolving plugin [id: 'myplugin', version: '1.0'].")
+        failure.assertHasCause("Invalid plugin metadata: No module repository specified.")
+    }
+
+    def "portal JSON response with invalid JSON syntax fails plugin resolution"() {
+        portal.expectPluginQuery("myplugin", "1.0") {
+            contentType = "application/json"
+            writer.withWriter { it << "[}" }
+        }
+
+        buildScript applyAndVerify("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertHasDescription("Error resolving plugin [id: 'myplugin', version: '1.0'].")
+        failure.assertHasCause("Failed to parse plugin portal JSON response.")
+    }
+
+    def "extra information in portal JSON response is tolerated (and neglected)"() {
+        publishPlugin("myplugin", "my", "plugin", "1.0")
+
+        portal.expectPluginQuery("myplugin", "1.0") {
+            contentType = "application/json"
+            writer.withWriter {
+                it << """
+                {
+                    "id": "myplugin",
+                    "version": "1.0",
+                    "implementation": {
+                        "gav": "my:plugin:1.0",
+                        "repo": "$portal.m2repo.uri",
+                        "extra1": "info1"
+                    },
+                    "implementationType": "M2_JAR",
+                    "extra2": "info2"
+                }
+                """
+            }
+        }
+
+        buildScript applyAndVerify("myplugin", "1.0")
+
+        expect:
+        succeeds("verify")
+    }
+
+    def "resolution fails if Gradle is in offline mode"() {
+        portal.expectPluginQuery("myplugin", "1.0", "my", "plugin", "1.0")
+        publishPlugin("myplugin", "my", "plugin", "1.0")
+
+        buildScript applyAndVerify("myplugin", "1.0")
+        args("--offline")
+
+        expect:
+        fails("verify")
+        failure.assertHasDescription("Error resolving plugin [id: 'myplugin', version: '1.0'].")
+        failure.assertHasCause("Plugin cannot be resolved from plugin portal because Gradle is running in offline mode.")
+    }
+
+    def "cannot resolve plugin with snapshot version"() {
+        portal.expectPluginQuery("myplugin", "1.0-SNAPSHOT", "my", "plugin", "1.0")
+        publishPlugin("myplugin", "my", "plugin", "1.0")
+
+        buildScript applyAndVerify("myplugin", "1.0-SNAPSHOT")
+
+        expect:
+        fails("verify")
+        failure.assertHasDescription("Error resolving plugin [id: 'myplugin', version: '1.0-SNAPSHOT'].")
+        failure.assertHasCause("Snapshot plugin versions are not supported.")
+    }
+
+    def "cannot resolve plugin with dynamic version"() {
+        portal.expectPluginQuery("myplugin", pluginVersion, "my", "plugin", "1.0")
+        publishPlugin("myplugin", "my", "plugin", "1.0")
+
+        buildScript applyAndVerify("myplugin", pluginVersion)
+
+        expect:
+        fails("verify")
+        failure.assertHasDescription("Error resolving plugin [id: 'myplugin', version: '$pluginVersion'].")
+        failure.assertHasCause("Dynamic plugin versions are not supported.")
+
+        where:
+        pluginVersion << ["[1.0,2.0)", "1.+", "latest.release"]
+    }
+
+    def "portal redirects are being followed"() {
+        portal.expectPluginQuery("myplugin", "1.0") {
+            sendRedirect("/api/gradle/${GradleVersion.current().version}/plugin/use/otherplugin/2.0")
+        }
+        portal.expectPluginQuery("otherplugin", "2.0", "other", "plugin", "2.0")
+        publishPlugin("otherplugin", "other", "plugin", "2.0")
+
+        buildScript applyAndVerify("otherplugin", "2.0")
+
+        expect:
+        succeeds("verify")
+    }
+
+    def "plugin portal error message is embedded in user error message"() {
+        portal.expectQueryAndReturnError("myplugin", "1.0", 500, "INTERNAL_SERVER_ERROR", "Bintray communication failure")
+
+        buildScript applyAndVerify("myplugin", "1.0")
+
+        expect:
+        fails("verify")
+        failure.assertHasDescription("Error resolving plugin [id: 'myplugin', version: '1.0'].")
+        failure.assertHasCause("Plugin portal returned HTTP 500 with message 'Bintray communication failure'.")
+    }
+
+    private void publishPlugin(String pluginId, String group, String artifact, String version) {
+        def module = portal.m2repo.module(group, artifact, version) // don't know why tests are failing if this module is publish()'ed
+        module.allowAll()
+        pluginBuilder.addPlugin("project.ext.pluginApplied = true", pluginId)
+        pluginBuilder.publishTo(executer, module.artifactFile)
+    }
+
+    private String applyAndVerify(String id, String version) {
+        """
+            plugins {
+                id "$id" version "$version"
+            }
+
+            task verify << {
+                assert pluginApplied
+            }
+        """
+    }
+}
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/DefaultPluginRequestApplicator.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/DefaultPluginRequestApplicator.java
new file mode 100644
index 000000000000..41d6e1fb993b
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/DefaultPluginRequestApplicator.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.internal;
+
+import org.gradle.api.Action;
+import org.gradle.api.GradleException;
+import org.gradle.api.plugins.UnknownPluginException;
+import org.gradle.internal.exceptions.LocationAwareException;
+import org.gradle.plugin.use.resolve.internal.PluginResolution;
+import org.gradle.plugin.use.resolve.internal.PluginResolver;
+
+public class DefaultPluginRequestApplicator implements PluginRequestApplicator {
+
+    private final PluginResolver pluginResolver;
+    private final Action<? super PluginResolution> pluginResolutionHandler;
+
+    public DefaultPluginRequestApplicator(PluginResolver pluginResolver, Action<? super PluginResolution> pluginResolutionHandler) {
+        this.pluginResolver = pluginResolver;
+        this.pluginResolutionHandler = pluginResolutionHandler;
+    }
+
+    public void applyPlugin(PluginRequest request) {
+        PluginResolution resolution;
+        try {
+            resolution = pluginResolver.resolve(request);
+        } catch (Exception e) {
+            throw new LocationAwareException(
+                    new GradleException(String.format("Error resolving plugin %s.", request.getDisplayName()), e),
+                    request.getScriptSource(), request.getLineNumber());
+        }
+        if (resolution == null) {
+            throw new LocationAwareException(
+                    new UnknownPluginException(String.format("Plugin %s not found in %s", request.getDisplayName(), pluginResolver.getDescriptionForNotFoundMessage())),
+                    request.getScriptSource(),
+                    request.getLineNumber()
+            );
+        }
+
+        pluginResolutionHandler.execute(resolution);
+    }
+}
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/DefaultPluginRequestApplicatorFactory.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/DefaultPluginRequestApplicatorFactory.java
new file mode 100644
index 000000000000..dd97e60984f5
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/DefaultPluginRequestApplicatorFactory.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.internal;
+
+import org.gradle.api.plugins.PluginAware;
+import org.gradle.plugin.use.resolve.internal.PluginResolver;
+
+public class DefaultPluginRequestApplicatorFactory implements PluginRequestApplicatorFactory {
+
+    private final PluginResolverFactory pluginResolverFactory;
+
+    public DefaultPluginRequestApplicatorFactory(PluginResolverFactory pluginResolverFactory) {
+        this.pluginResolverFactory = pluginResolverFactory;
+    }
+
+    public PluginRequestApplicator createRequestApplicator(PluginAware target) {
+        PluginResolver pluginResolver = pluginResolverFactory.createPluginResolver();
+        PluginResolutionApplicator resolutionApplicator = new PluginResolutionApplicator(target);
+        return new DefaultPluginRequestApplicator(pluginResolver, resolutionApplicator);
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolutionApplicator.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginResolutionApplicator.java
similarity index 73%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolutionApplicator.java
rename to subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginResolutionApplicator.java
index 6d3bae7a092b..549c621541b4 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/internal/PluginResolutionApplicator.java
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginResolutionApplicator.java
@@ -14,26 +14,23 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.internal;
+package org.gradle.plugin.use.internal;
 
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
-import org.gradle.api.internal.initialization.ClassLoaderScope;
 import org.gradle.api.plugins.PluginAware;
-import org.gradle.plugin.resolve.internal.PluginResolution;
+import org.gradle.plugin.use.resolve.internal.PluginResolution;
 
 public class PluginResolutionApplicator implements Action<PluginResolution> {
 
     private final PluginAware target;
-    private final ClassLoaderScope classLoaderScope;
 
-    public PluginResolutionApplicator(PluginAware target, ClassLoaderScope classLoaderScope) {
+    public PluginResolutionApplicator(PluginAware target) {
         this.target = target;
-        this.classLoaderScope = classLoaderScope;
     }
 
     public void execute(PluginResolution pluginResolution) {
-        Class<? extends Plugin> pluginClass = pluginResolution.resolve(classLoaderScope);
+        Class<? extends Plugin> pluginClass = pluginResolution.resolve();
         target.getPlugins().apply(pluginClass);
     }
 }
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginResolverFactory.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginResolverFactory.java
new file mode 100644
index 000000000000..ce061a482cf3
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginResolverFactory.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.internal;
+
+import org.gradle.api.internal.DocumentationRegistry;
+import org.gradle.api.internal.plugins.PluginRegistry;
+import org.gradle.plugin.use.resolve.internal.CompositePluginResolver;
+import org.gradle.plugin.use.resolve.internal.CorePluginResolver;
+import org.gradle.plugin.use.resolve.internal.NoopPluginResolver;
+import org.gradle.plugin.use.resolve.internal.PluginResolver;
+import org.gradle.plugin.use.resolve.portal.internal.PluginPortalResolver;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class PluginResolverFactory {
+
+    private final PluginRegistry pluginRegistry;
+    private final DocumentationRegistry documentationRegistry;
+    private final PluginPortalResolver pluginPortalResolver;
+
+    public PluginResolverFactory(
+            PluginRegistry pluginRegistry,
+            DocumentationRegistry documentationRegistry,
+            PluginPortalResolver pluginPortalResolver
+    ) {
+        this.pluginRegistry = pluginRegistry;
+        this.documentationRegistry = documentationRegistry;
+        this.pluginPortalResolver = pluginPortalResolver;
+    }
+
+    public PluginResolver createPluginResolver() {
+        List<PluginResolver> resolvers = new LinkedList<PluginResolver>();
+        addDefaultResolvers(resolvers);
+        CompositePluginResolver compositePluginResolver = new CompositePluginResolver(resolvers);
+        return compositePluginResolver;
+
+        // Temporarily disabled - LD
+        // PluginDescriptorLocator scriptClasspathPluginDescriptorLocator = new ClassloaderBackedPluginDescriptorLocator(scriptClassLoader);
+        // return new NotInPluginRegistryPluginResolverCheck(compositePluginResolver, pluginRegistry, scriptClasspathPluginDescriptorLocator);
+    }
+
+    private void addDefaultResolvers(List<PluginResolver> resolvers) {
+        resolvers.add(new NoopPluginResolver());
+        resolvers.add(new CorePluginResolver(documentationRegistry, pluginRegistry));
+        resolvers.add(pluginPortalResolver);
+    }
+
+}
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginUsePluginServiceRegistry.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginUsePluginServiceRegistry.java
new file mode 100644
index 000000000000..e7065150f3ee
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/internal/PluginUsePluginServiceRegistry.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.internal;
+
+import org.gradle.StartParameter;
+import org.gradle.api.UnknownProjectException;
+import org.gradle.api.internal.DocumentationRegistry;
+import org.gradle.api.internal.artifacts.DependencyManagementServices;
+import org.gradle.api.internal.artifacts.DependencyResolutionServices;
+import org.gradle.api.internal.artifacts.configurations.DependencyMetaDataProvider;
+import org.gradle.api.internal.artifacts.dsl.dependencies.ProjectFinder;
+import org.gradle.api.internal.file.FileResolver;
+import org.gradle.api.internal.initialization.BasicDomainObjectContext;
+import org.gradle.api.internal.plugins.PluginRegistry;
+import org.gradle.api.internal.project.ProjectInternal;
+import org.gradle.initialization.ClassLoaderScopeRegistry;
+import org.gradle.internal.Factory;
+import org.gradle.internal.reflect.Instantiator;
+import org.gradle.internal.resource.PasswordCredentials;
+import org.gradle.internal.resource.transport.http.DefaultHttpSettings;
+import org.gradle.internal.resource.transport.http.HttpClientHelper;
+import org.gradle.internal.resource.transport.http.HttpResourceAccessor;
+import org.gradle.internal.service.ServiceRegistration;
+import org.gradle.internal.service.scopes.PluginServiceRegistry;
+import org.gradle.plugin.use.resolve.portal.internal.PluginPortalClient;
+import org.gradle.plugin.use.resolve.portal.internal.PluginPortalResolver;
+
+public class PluginUsePluginServiceRegistry implements PluginServiceRegistry {
+
+
+    public void registerGlobalServices(ServiceRegistration registration) {
+    }
+
+    public void registerBuildServices(ServiceRegistration registration) {
+        registration.addProvider(new BuildScopeServices());
+    }
+
+    public void registerProjectServices(ServiceRegistration registration) {
+    }
+
+    private static class BuildScopeServices {
+        PluginPortalClient createPluginPortalClient() {
+            HttpClientHelper http = new HttpClientHelper(new DefaultHttpSettings(new PasswordCredentials()));
+            HttpResourceAccessor accessor = new HttpResourceAccessor(http);
+            return new PluginPortalClient(accessor);
+        }
+
+        PluginPortalResolver createPluginPortalResolver(PluginPortalClient pluginPortalClient, Instantiator instantiator, StartParameter startParameter, final DependencyManagementServices dependencyManagementServices, final FileResolver fileResolver, final DependencyMetaDataProvider dependencyMetaDataProvider, ClassLoaderScopeRegistry classLoaderScopeRegistry) {
+            final ProjectFinder projectFinder = new ProjectFinder() {
+                public ProjectInternal getProject(String path) {
+                    throw new UnknownProjectException("Cannot use project dependencies in a plugin resolution definition.");
+                }
+            };
+
+            return new PluginPortalResolver(pluginPortalClient, instantiator, startParameter, classLoaderScopeRegistry.getCoreImplScope(), new Factory<DependencyResolutionServices>() {
+                public DependencyResolutionServices create() {
+                    return dependencyManagementServices.create(fileResolver, dependencyMetaDataProvider, projectFinder, new BasicDomainObjectContext());
+                }
+            });
+        }
+
+        PluginResolverFactory createPluginResolverFactory(PluginRegistry pluginRegistry, DocumentationRegistry documentationRegistry, PluginPortalResolver pluginPortalResolver) {
+            return new PluginResolverFactory(pluginRegistry, documentationRegistry, pluginPortalResolver);
+        }
+
+        PluginRequestApplicatorFactory createPluginUseServices(PluginResolverFactory pluginResolverFactory) {
+            return new DefaultPluginRequestApplicatorFactory(pluginResolverFactory);
+        }
+    }
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ClassPathPluginResolution.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/ClassPathPluginResolution.java
similarity index 69%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ClassPathPluginResolution.java
rename to subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/ClassPathPluginResolution.java
index dd16b464e8e0..2980f6bd4bf8 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/ClassPathPluginResolution.java
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/ClassPathPluginResolution.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.resolve.internal;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.internal.initialization.ClassLoaderScope;
@@ -23,24 +23,28 @@
 import org.gradle.internal.Factory;
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.reflect.Instantiator;
+import org.gradle.plugin.internal.PluginId;
 
-class ClassPathPluginResolution implements PluginResolution {
+import java.net.URLClassLoader;
 
-    private final String pluginId;
+public class ClassPathPluginResolution implements PluginResolution {
+
+    private final PluginId pluginId;
     private final Instantiator instantiator;
+    private final ClassLoaderScope parent;
     private final Factory<? extends ClassPath> classPathFactory;
 
-    public ClassPathPluginResolution(Instantiator instantiator, String pluginId, Factory<? extends ClassPath> classPathFactory) {
+    public ClassPathPluginResolution(Instantiator instantiator, PluginId pluginId, ClassLoaderScope parent, Factory<? extends ClassPath> classPathFactory) {
         this.pluginId = pluginId;
         this.instantiator = instantiator;
+        this.parent = parent;
         this.classPathFactory = classPathFactory;
     }
 
-    public Class<? extends Plugin> resolve(ClassLoaderScope classLoaderScope) {
+    public Class<? extends Plugin> resolve() {
         ClassPath classPath = classPathFactory.create();
-        ClassLoader classLoader = classLoaderScope.addLocal(classPath);
+        ClassLoader classLoader = new URLClassLoader(classPath.getAsURLArray(), parent.getExportClassLoader());
         PluginRegistry pluginRegistry = new DefaultPluginRegistry(classLoader, instantiator);
-        Class<? extends Plugin> typeForId = pluginRegistry.getTypeForId(pluginId);
-        return typeForId;
+        return pluginRegistry.getTypeForId(pluginId.toString());
     }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/CompositePluginResolver.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/CompositePluginResolver.java
similarity index 83%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/CompositePluginResolver.java
rename to subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/CompositePluginResolver.java
index f488fcb24fe7..5a34ee17f63d 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/CompositePluginResolver.java
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/CompositePluginResolver.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.resolve.internal;
+
+import org.gradle.plugin.use.internal.PluginRequest;
 
 import java.util.List;
 
@@ -41,7 +43,10 @@ public PluginResolution resolve(PluginRequest pluginRequest) {
     public String getDescriptionForNotFoundMessage() {
         StringBuilder sb = new StringBuilder("plugin repositories:");
         for (PluginResolver repository : repositories) {
-            sb.append("\n - ").append(repository.getDescriptionForNotFoundMessage());
+            String message = repository.getDescriptionForNotFoundMessage();
+            if (message != null) {
+                sb.append("\n - ").append(message);
+            }
         }
         return sb.toString();
     }
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRegistryPluginResolver.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/CorePluginResolver.java
similarity index 51%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRegistryPluginResolver.java
rename to subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/CorePluginResolver.java
index 0465bb416c75..54882b2e1754 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginRegistryPluginResolver.java
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/CorePluginResolver.java
@@ -14,40 +14,52 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.resolve.internal;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.internal.DocumentationRegistry;
 import org.gradle.api.internal.plugins.PluginRegistry;
 import org.gradle.api.plugins.UnknownPluginException;
+import org.gradle.plugin.internal.PluginId;
+import org.gradle.plugin.use.internal.InvalidPluginRequestException;
+import org.gradle.plugin.use.internal.PluginRequest;
 
-public class PluginRegistryPluginResolver implements PluginResolver {
+public class CorePluginResolver implements PluginResolver {
+
+    public static final String CORE_PLUGIN_NAMESPACE = "org.gradle";
 
     private final DocumentationRegistry documentationRegistry;
     private final PluginRegistry pluginRegistry;
 
-    public PluginRegistryPluginResolver(DocumentationRegistry documentationRegistry, PluginRegistry pluginRegistry) {
+    public CorePluginResolver(DocumentationRegistry documentationRegistry, PluginRegistry pluginRegistry) {
         this.documentationRegistry = documentationRegistry;
         this.pluginRegistry = pluginRegistry;
     }
 
     public PluginResolution resolve(PluginRequest pluginRequest) {
-        try {
-            Class<? extends Plugin> typeForId = pluginRegistry.getTypeForId(pluginRequest.getId());
-            if (pluginRequest.getVersion() != null) {
-                throw new InvalidPluginRequestException(
-                        "Plugin '" + pluginRequest.getId() + "' is a core Gradle plugin, which cannot be specified with a version number. "
-                        + "Such plugins are versioned as part of Gradle. Please remove the version number from the declaration.");
+        PluginId id = pluginRequest.getId();
+
+        if (!id.isQualified() || id.inNamespace(CORE_PLUGIN_NAMESPACE)) {
+            try {
+                Class<? extends Plugin> typeForId = pluginRegistry.getTypeForId(id.getName());
+                if (pluginRequest.getVersion() != null) {
+                    throw new InvalidPluginRequestException(pluginRequest,
+                            "Plugin '" + id + "' is a core Gradle plugin, which cannot be specified with a version number. "
+                                    + "Such plugins are versioned as part of Gradle. Please remove the version number from the declaration."
+                    );
+                }
+                return new SimplePluginResolution(typeForId);
+            } catch (UnknownPluginException e) {
+                return null;
             }
-            return new SimplePluginResolution(typeForId);
-        } catch (UnknownPluginException e) {
+        } else {
             return null;
         }
     }
 
     @Override
     public String toString() {
-        return "PluginRegistryPluginResolver[" + pluginRegistry + "]";
+        return "Core Plugin Resolver";
     }
 
     public String getDescriptionForNotFoundMessage() {
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/NoopPluginResolver.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/NoopPluginResolver.java
new file mode 100644
index 000000000000..eff219eec45e
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/NoopPluginResolver.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.internal;
+
+import org.gradle.api.Plugin;
+import org.gradle.configuration.DefaultScriptPluginFactory;
+import org.gradle.plugin.use.internal.InvalidPluginRequestException;
+import org.gradle.plugin.use.internal.PluginRequest;
+
+// Used for testing the plugins DSL
+public class NoopPluginResolver implements PluginResolver {
+
+    public PluginResolution resolve(PluginRequest pluginRequest) throws InvalidPluginRequestException {
+        if (pluginRequest.getId().equals(DefaultScriptPluginFactory.NOOP_PLUGIN_ID)) {
+            return new SimplePluginResolution(NoopPlugin.class);
+        } else {
+            return null;
+        }
+    }
+
+    public String getDescriptionForNotFoundMessage() {
+        return null; // hidden
+    }
+
+    public static class NoopPlugin implements Plugin<Object> {
+        public void apply(Object target) {
+            // do nothing
+        }
+    }
+
+}
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/NotInPluginRegistryPluginResolverCheck.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/NotInPluginRegistryPluginResolverCheck.java
similarity index 68%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/NotInPluginRegistryPluginResolverCheck.java
rename to subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/NotInPluginRegistryPluginResolverCheck.java
index d48b4845f6bd..feda91aef7df 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/NotInPluginRegistryPluginResolverCheck.java
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/NotInPluginRegistryPluginResolverCheck.java
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.resolve.internal;
 
 import org.gradle.api.internal.plugins.PluginDescriptor;
 import org.gradle.api.internal.plugins.PluginDescriptorLocator;
 import org.gradle.api.internal.plugins.PluginRegistry;
 import org.gradle.api.plugins.UnknownPluginException;
+import org.gradle.plugin.internal.PluginId;
+import org.gradle.plugin.use.internal.InvalidPluginRequestException;
+import org.gradle.plugin.use.internal.PluginRequest;
 
 public class NotInPluginRegistryPluginResolverCheck implements PluginResolver {
 
@@ -34,20 +37,22 @@ public NotInPluginRegistryPluginResolverCheck(PluginResolver delegate, PluginReg
     }
 
     public PluginResolution resolve(PluginRequest pluginRequest) {
-        String pluginId = pluginRequest.getId();
-        PluginDescriptor pluginDescriptor = pluginDescriptorLocator.findPluginDescriptor(pluginId);
+        PluginId pluginId = pluginRequest.getId();
+        PluginDescriptor pluginDescriptor = pluginDescriptorLocator.findPluginDescriptor(pluginId.toString());
         if (pluginDescriptor == null || isCorePlugin(pluginId)) {
             return delegate.resolve(pluginRequest);
         } else {
-            throw new InvalidPluginRequestException(
-                    String.format("Plugin '%s' is already on the script classpath (plugins on the script classpath cannot be used in a plugins {} block; move \"apply plugin: '%s'\" outside of the plugins {} block)", pluginId, pluginId)
-            );
+            throw new InvalidPluginRequestException(pluginRequest, pluginOnClasspathErrorMessage(pluginId.toString()));
         }
     }
 
-    private boolean isCorePlugin(String pluginId) {
+    public static String pluginOnClasspathErrorMessage(String pluginId) {
+        return String.format("Plugin '%s' is already on the script classpath. Plugins on the script classpath cannot be applied in the plugins {} block. Add  \"apply plugin: '%s'\" to the body of the script to use the plugin.", pluginId, pluginId);
+    }
+
+    private boolean isCorePlugin(PluginId pluginId) {
         try {
-            corePluginRegistry.getTypeForId(pluginId);
+            corePluginRegistry.getTypeForId(pluginId.toString());
             return true;
         } catch (UnknownPluginException ignore) {
             return false;
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolution.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolution.java
similarity index 77%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolution.java
rename to subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolution.java
index 2e3314f8448f..8788a1f3019d 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolution.java
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolution.java
@@ -14,18 +14,15 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.resolve.internal;
 
-import org.gradle.api.Incubating;
 import org.gradle.api.Plugin;
-import org.gradle.api.internal.initialization.ClassLoaderScope;
 
 /**
  * The result of attempting to resolve a plugin to a classpath.
  */
-@Incubating
 public interface PluginResolution {
 
-    Class<? extends Plugin> resolve(ClassLoaderScope classLoaderScope);
+    Class<? extends Plugin> resolve();
 
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolver.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolver.java
similarity index 75%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolver.java
rename to subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolver.java
index 71a674d9a6f1..0543b3bd1cde 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/PluginResolver.java
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/PluginResolver.java
@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.resolve.internal;
 
 import org.gradle.api.Incubating;
 import org.gradle.api.Nullable;
+import org.gradle.plugin.use.internal.InvalidPluginRequestException;
+import org.gradle.plugin.use.internal.PluginRequest;
 
 /**
  * A repository of plugins.
@@ -26,7 +28,7 @@
 public interface PluginResolver {
 
     @Nullable
-    PluginResolution resolve(PluginRequest pluginRequest);
+    PluginResolution resolve(PluginRequest pluginRequest) throws InvalidPluginRequestException;
 
     String getDescriptionForNotFoundMessage();
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/SimplePluginResolution.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/SimplePluginResolution.java
similarity index 83%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/SimplePluginResolution.java
rename to subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/SimplePluginResolution.java
index 90980edf0253..a441e6ec3ce2 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/resolve/internal/SimplePluginResolution.java
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/internal/SimplePluginResolution.java
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin.resolve.internal;
+package org.gradle.plugin.use.resolve.internal;
 
 import org.gradle.api.Plugin;
-import org.gradle.api.internal.initialization.ClassLoaderScope;
 
 public class SimplePluginResolution implements PluginResolution {
 
@@ -27,7 +26,7 @@ public SimplePluginResolution(Class<? extends Plugin> pluginClass) {
         this.pluginClass = pluginClass;
     }
 
-    public Class<? extends Plugin> resolve(ClassLoaderScope classLoaderScope) {
+    public Class<? extends Plugin> resolve() {
         return pluginClass;
     }
 
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/ErrorResponse.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/ErrorResponse.java
new file mode 100644
index 000000000000..653e6d2fcb76
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/ErrorResponse.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.portal.internal;
+
+/**
+ * Defines the JSON protocol for plugin portal error responses.
+ */
+class ErrorResponse {
+    String errorCode;
+    String message;
+
+    ErrorResponse(String errorCode, String message) {
+        this.errorCode = errorCode;
+        this.message = message;
+    }
+}
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginPortalClient.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginPortalClient.java
new file mode 100644
index 000000000000..4cc614df77db
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginPortalClient.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.portal.internal;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
+import org.gradle.api.GradleException;
+import org.gradle.api.Nullable;
+import org.gradle.api.Transformer;
+import org.gradle.api.UncheckedIOException;
+import org.gradle.internal.resource.transport.http.HttpResourceAccessor;
+import org.gradle.internal.resource.transport.http.HttpResponseResource;
+import org.gradle.plugin.use.internal.PluginRequest;
+import org.gradle.util.GradleVersion;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+public class PluginPortalClient {
+    private static final Logger LOGGER = LoggerFactory.getLogger(PluginPortalClient.class);
+    private static final String REQUEST_URL = "/api/gradle/%s/plugin/use/%s/%s";
+
+    private final HttpResourceAccessor resourceAccessor;
+
+    public PluginPortalClient(HttpResourceAccessor resourceAccessor) {
+        this.resourceAccessor = resourceAccessor;
+    }
+
+    @Nullable
+    PluginUseMetaData queryPluginMetadata(final PluginRequest pluginRequest, String portalUrl) {
+        String requestUrl = String.format(portalUrl + REQUEST_URL, GradleVersion.current().getVersion(), pluginRequest.getId(), pluginRequest.getVersion());
+        URI requestUri = toUri(requestUrl, "plugin request");
+
+        HttpResponseResource response = null;
+        try {
+            response = resourceAccessor.getRawResource(requestUri);
+            final int statusCode = response.getStatusCode();
+            if (statusCode == 404) {
+                return null;
+            }
+
+            return response.withContent(new Transformer<PluginUseMetaData, InputStream>() {
+                public PluginUseMetaData transform(InputStream inputStream) {
+                    Reader reader;
+                    try {
+                        reader = new InputStreamReader(inputStream, "utf-8");
+                    } catch (UnsupportedEncodingException e) {
+                        throw new AssertionError(e);
+                    }
+                    try {
+                        if (statusCode != 200) {
+                            ErrorResponse errorResponse = new Gson().fromJson(reader, ErrorResponse.class);
+                            throw new GradleException(String.format("Plugin portal returned HTTP %d with message '%s'.", statusCode, errorResponse.message));
+                        }
+
+                        PluginUseMetaData metadata = new Gson().fromJson(reader, PluginUseMetaData.class);
+                        metadata.verify();
+                        return metadata;
+                    } catch (JsonSyntaxException e) {
+                        throw new GradleException("Failed to parse plugin portal JSON response.", e);
+                    } catch (JsonIOException e) {
+                        throw new GradleException("Failed to read plugin portal JSON response.", e);
+                    }
+                }
+            });
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        } finally {
+            try {
+                if (response != null) {
+                    response.close();
+                }
+            } catch (IOException e) {
+                LOGGER.warn("Error closing HTTP resource", e);
+            }
+        }
+    }
+
+    private URI toUri(String url, String kind) {
+        try {
+            return new URI(url);
+        } catch (URISyntaxException e) {
+            throw new GradleException(String.format("Invalid %s URL: %s", kind, url, e));
+        }
+    }
+}
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginPortalResolver.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginPortalResolver.java
new file mode 100644
index 000000000000..eaabd5f3ce02
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginPortalResolver.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.portal.internal;
+
+import org.gradle.StartParameter;
+import org.gradle.api.Action;
+import org.gradle.api.GradleException;
+import org.gradle.api.Nullable;
+import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.artifacts.dsl.RepositoryHandler;
+import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
+import org.gradle.api.internal.artifacts.DependencyResolutionServices;
+import org.gradle.api.internal.artifacts.configurations.ConfigurationContainerInternal;
+import org.gradle.api.internal.artifacts.configurations.ConfigurationInternal;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.StartParameterResolutionOverride;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.LatestVersionMatcher;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.SubVersionMatcher;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionMatcher;
+import org.gradle.api.internal.artifacts.ivyservice.ivyresolve.strategy.VersionRangeMatcher;
+import org.gradle.api.internal.initialization.ClassLoaderScope;
+import org.gradle.api.specs.Specs;
+import org.gradle.internal.Factories;
+import org.gradle.internal.Factory;
+import org.gradle.internal.classpath.ClassPath;
+import org.gradle.internal.classpath.DefaultClassPath;
+import org.gradle.internal.reflect.Instantiator;
+import org.gradle.plugin.use.internal.InvalidPluginRequestException;
+import org.gradle.plugin.use.internal.PluginRequest;
+import org.gradle.plugin.use.resolve.internal.ClassPathPluginResolution;
+import org.gradle.plugin.use.resolve.internal.PluginResolution;
+import org.gradle.plugin.use.resolve.internal.PluginResolver;
+
+import java.io.File;
+import java.util.Set;
+
+public class PluginPortalResolver implements PluginResolver {
+
+    public static final String OVERRIDE_URL_PROPERTY = PluginPortalResolver.class.getName() + ".repo.override";
+    private static final String DEFAULT_API_URL = "http://plugins.gradle.org";
+
+    private static final VersionMatcher RANGE_MATCHER = new VersionRangeMatcher(null);
+    private static final VersionMatcher SUB_MATCHER = new SubVersionMatcher(null);
+    private static final VersionMatcher LATEST_MATCHER = new LatestVersionMatcher();
+
+    private final PluginPortalClient portalClient;
+    private final Instantiator instantiator;
+    private final StartParameter startParameter;
+    private final Factory<DependencyResolutionServices> dependencyResolutionServicesFactory;
+    private final ClassLoaderScope parentScope;
+
+    public PluginPortalResolver(
+            PluginPortalClient portalClient,
+            Instantiator instantiator,
+            StartParameter startParameter,
+            ClassLoaderScope parentScope, Factory<DependencyResolutionServices> dependencyResolutionServicesFactory
+    ) {
+        this.portalClient = portalClient;
+        this.instantiator = instantiator;
+        this.startParameter = startParameter;
+        this.parentScope = parentScope;
+        this.dependencyResolutionServicesFactory = dependencyResolutionServicesFactory;
+    }
+
+    private static String getUrl() {
+        return System.getProperty(OVERRIDE_URL_PROPERTY, DEFAULT_API_URL);
+    }
+
+    @Nullable
+    public PluginResolution resolve(PluginRequest pluginRequest) throws InvalidPluginRequestException {
+        validatePluginRequest(pluginRequest);
+
+        PluginUseMetaData metaData = portalClient.queryPluginMetadata(pluginRequest, getUrl());
+        if (metaData == null) {
+            return null;
+        }
+
+        ClassPath classPath = resolvePluginDependencies(metaData);
+        return new ClassPathPluginResolution(instantiator, pluginRequest.getId(), parentScope, Factories.constant(classPath));
+    }
+
+    // validates request against current limitations
+    // we blow up with a custom message here, relying
+    // on the fact that plugin portal resolver comes last
+    private void validatePluginRequest(PluginRequest pluginRequest) {
+        if (startParameter.isOffline()) {
+            throw new GradleException(String.format("Plugin cannot be resolved from plugin portal because Gradle is running in offline mode."));
+        }
+        if (pluginRequest.getVersion().endsWith("-SNAPSHOT")) {
+            throw new InvalidPluginRequestException(pluginRequest, "Snapshot plugin versions are not supported.");
+        }
+        if (isDynamicVersion(pluginRequest.getVersion())) {
+            throw new InvalidPluginRequestException(pluginRequest, "Dynamic plugin versions are not supported.");
+        }
+    }
+
+    private boolean isDynamicVersion(String version) {
+        return RANGE_MATCHER.canHandle(version) || SUB_MATCHER.canHandle(version) || LATEST_MATCHER.canHandle(version);
+    }
+
+    private ClassPath resolvePluginDependencies(final PluginUseMetaData metadata) {
+        DependencyResolutionServices resolution = dependencyResolutionServicesFactory.create();
+
+        RepositoryHandler repositories = resolution.getResolveRepositoryHandler();
+        repositories.maven(new Action<MavenArtifactRepository>() {
+            public void execute(MavenArtifactRepository mavenArtifactRepository) {
+                mavenArtifactRepository.setUrl(metadata.implementation.get("repo"));
+            }
+        });
+
+        Dependency dependency = resolution.getDependencyHandler().create(metadata.implementation.get("gav"));
+
+        ConfigurationContainerInternal configurations = resolution.getConfigurationContainer();
+        ConfigurationInternal configuration = configurations.detachedConfiguration(dependency);
+
+        // honor start parameters when resolving plugin dependencies
+        StartParameterResolutionOverride resolutionOverride = new StartParameterResolutionOverride(startParameter);
+        resolutionOverride.addResolutionRules(configuration.getResolutionStrategy().getResolutionRules());
+
+        Set<File> files = configuration.getResolvedConfiguration().getFiles(Specs.satisfyAll());
+        return new DefaultClassPath(files);
+    }
+
+    public String getDescriptionForNotFoundMessage() {
+        return "Plugin Portal (" + getUrl() + ")";
+    }
+
+}
diff --git a/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginUseMetaData.java b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginUseMetaData.java
new file mode 100644
index 000000000000..2f3aa39f7c80
--- /dev/null
+++ b/subprojects/plugin-use/src/main/java/org/gradle/plugin/use/resolve/portal/internal/PluginUseMetaData.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.portal.internal;
+
+import org.gradle.api.GradleException;
+
+import java.util.Map;
+
+/**
+ * Defines the JSON protocol for plugin portal responses to plugin metadata queries.
+ */
+class PluginUseMetaData {
+
+    static final String M2_JAR = "M2_JAR";
+
+    String id;
+    String version;
+    Map<String, String> implementation;
+    String implementationType;
+
+    void verify() {
+        if (implementationType == null) {
+            throw new GradleException("Invalid plugin metadata: No implementation type specified.");
+        }
+        if (!implementationType.equals(M2_JAR)) {
+            throw new GradleException(String.format("Invalid plugin metadata: Unsupported implementation type: %s.", implementationType));
+        }
+        if (implementation == null) {
+            throw new GradleException("Invalid plugin metadata: No implementation specified.");
+        }
+        if (implementation.get("gav") == null) {
+            throw new GradleException("Invalid plugin metadata: No module coordinates specified.");
+        }
+        if (implementation.get("repo") == null) {
+            throw new GradleException("Invalid plugin metadata: No module repository specified.");
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+
+        PluginUseMetaData that = (PluginUseMetaData) o;
+
+        if (!id.equals(that.id)) {
+            return false;
+        }
+        if (!implementation.equals(that.implementation)) {
+            return false;
+        }
+        if (!implementationType.equals(that.implementationType)) {
+            return false;
+        }
+        if (!version.equals(that.version)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id.hashCode();
+        result = 31 * result + version.hashCode();
+        result = 31 * result + implementation.hashCode();
+        result = 31 * result + implementationType.hashCode();
+        return result;
+    }
+}
diff --git a/subprojects/plugin-use/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry b/subprojects/plugin-use/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
new file mode 100644
index 000000000000..2d74c247fe78
--- /dev/null
+++ b/subprojects/plugin-use/src/main/resources/META-INF/services/org.gradle.internal.service.scopes.PluginServiceRegistry
@@ -0,0 +1 @@
+org.gradle.plugin.use.internal.PluginUsePluginServiceRegistry
\ No newline at end of file
diff --git a/subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/internal/CorePluginResolverTest.groovy b/subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/internal/CorePluginResolverTest.groovy
new file mode 100644
index 000000000000..4c771824468a
--- /dev/null
+++ b/subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/internal/CorePluginResolverTest.groovy
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.internal
+
+import org.gradle.api.Plugin
+import org.gradle.api.internal.DocumentationRegistry
+import org.gradle.api.internal.plugins.PluginRegistry
+import org.gradle.api.plugins.UnknownPluginException
+import org.gradle.groovy.scripts.StringScriptSource
+import org.gradle.plugin.use.internal.DefaultPluginRequest
+import org.gradle.plugin.use.internal.InvalidPluginRequestException
+import org.gradle.plugin.use.internal.PluginRequest
+import spock.lang.Specification
+
+class CorePluginResolverTest extends Specification {
+
+    static class MyPlugin implements Plugin {
+        @Override
+        void apply(Object target) {
+        }
+    }
+
+    def docRegistry = Mock(DocumentationRegistry)
+    def pluginRegistry = Mock(PluginRegistry)
+
+    def resolver = new CorePluginResolver(docRegistry, pluginRegistry)
+
+    PluginRequest request(String id, String version = null) {
+        new DefaultPluginRequest(id, version, 1, new StringScriptSource("test", "test"))
+    }
+
+    def "non core plugins are ignored"() {
+        expect:
+        resolver.resolve(request("foo.bar")) == null
+    }
+
+    def "can resolve unqualified"() {
+        when:
+        def resolution = resolver.resolve(request("foo"))
+
+        then:
+        1 * pluginRegistry.getTypeForId("foo") >> MyPlugin
+
+        resolution instanceof SimplePluginResolution
+        resolution.resolve() == MyPlugin
+    }
+
+    def "can resolve qualified"() {
+        when:
+        def resolution = resolver.resolve(request("${CorePluginResolver.CORE_PLUGIN_NAMESPACE}.foo"))
+
+        then:
+        1 * pluginRegistry.getTypeForId("foo") >> MyPlugin
+
+        resolution instanceof SimplePluginResolution
+        resolution.resolve() == MyPlugin
+    }
+
+    def "cannot have version number"() {
+        when:
+        resolver.resolve(request("foo", "1.0"))
+
+        then:
+        1 * pluginRegistry.getTypeForId("foo") >> MyPlugin
+
+        and:
+        thrown InvalidPluginRequestException
+    }
+
+    def "ignores plugin with version that isn't found in registry"() {
+        when:
+        def resolution = resolver.resolve(request("foo", "1.0"))
+
+        then:
+        1 * pluginRegistry.getTypeForId("foo") >> { throw new UnknownPluginException("foo") }
+
+        and:
+        resolution == null
+    }
+
+}
diff --git a/subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/portal/internal/PluginPortalClientTest.groovy b/subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/portal/internal/PluginPortalClientTest.groovy
new file mode 100644
index 000000000000..db0b60cd9d37
--- /dev/null
+++ b/subprojects/plugin-use/src/test/groovy/org/gradle/plugin/use/resolve/portal/internal/PluginPortalClientTest.groovy
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.portal.internal
+
+import com.google.gson.Gson
+import org.gradle.api.GradleException
+import org.gradle.api.Transformer
+import org.gradle.internal.resource.transport.http.HttpResourceAccessor
+import org.gradle.internal.resource.transport.http.HttpResponseResource
+import org.gradle.plugin.internal.PluginId
+import org.gradle.plugin.use.internal.PluginRequest
+import spock.lang.Specification
+
+class PluginPortalClientTest extends Specification {
+    private resourceAccessor = Mock(HttpResourceAccessor)
+    private client = new PluginPortalClient(resourceAccessor)
+    private request = Stub(PluginRequest) {
+        getId() >> PluginId.of("foo")
+    }
+
+    def "returns plugin metadata for successful query"() {
+        given:
+        def metaData = new PluginUseMetaData(id: "foo", version: "bar", implementation: [gav: "foo:bar:baz", repo: "http://repo.com"], implementationType: PluginUseMetaData.M2_JAR)
+
+        when:
+        stubResponse(200, toJson(metaData))
+
+        then:
+        client.queryPluginMetadata(request, "http://plugin.portal") == metaData
+    }
+
+    def "returns error response for unsuccessful query"() {
+        def errorResponse = new ErrorResponse("INTERNAL_SERVER_ERROR", "Not feeling well today")
+
+        when:
+        stubResponse(500, toJson(errorResponse))
+        client.queryPluginMetadata(request, "http://plugin.portal")
+
+        then:
+        def e = thrown(GradleException)
+        e.message == "Plugin portal returned HTTP 500 with message 'Not feeling well today'."
+    }
+
+    private void stubResponse(int statusCode, String jsonResponse = null) {
+        interaction {
+            resourceAccessor.getRawResource(_) >> Stub(HttpResponseResource) {
+                getStatusCode() >> statusCode
+                if (jsonResponse != null) {
+                    withContent(_) >> { Transformer<PluginUseMetaData, InputStream> action ->
+                        action.transform(new ByteArrayInputStream(jsonResponse.getBytes("utf8")))
+                    }
+                }
+            }
+        }
+    }
+
+    private String toJson(Object object) {
+        new Gson().toJson(object)
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugin-use/src/testFixtures/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalTestServer.groovy b/subprojects/plugin-use/src/testFixtures/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalTestServer.groovy
new file mode 100644
index 000000000000..0266a2d91b13
--- /dev/null
+++ b/subprojects/plugin-use/src/testFixtures/groovy/org/gradle/plugin/use/resolve/portal/PluginPortalTestServer.groovy
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.plugin.use.resolve.portal
+
+import org.gradle.api.Action
+import org.gradle.integtests.fixtures.executer.GradleExecuter
+import org.gradle.plugin.use.resolve.portal.internal.PluginPortalResolver
+import org.gradle.test.fixtures.maven.MavenFileRepository
+import org.gradle.test.fixtures.server.http.HttpServer
+import org.gradle.test.fixtures.server.http.MavenHttpRepository
+import org.gradle.util.ConfigureUtil
+import org.gradle.util.GradleVersion
+import org.junit.rules.ExternalResource
+
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
+
+import static org.gradle.test.fixtures.server.http.HttpServer.Utils.json
+
+class PluginPortalTestServer extends ExternalResource {
+
+    private final HttpServer http
+
+    final MavenHttpRepository m2repo
+
+    PluginPortalTestServer(GradleExecuter executer, MavenFileRepository repo) {
+        this.http = new HttpServer()
+        this.m2repo = new MavenHttpRepository(http, repo)
+
+        executer.beforeExecute(new Action<GradleExecuter>() {
+            void execute(GradleExecuter e) {
+                if (http.running) {
+                    e.withArgument(
+                            "-D$PluginPortalResolver.OVERRIDE_URL_PROPERTY=$http.address",
+                    )
+                }
+            }
+        })
+    }
+
+    void expectMissing(String pluginId, String version) {
+        http.expectGetMissing("/api/gradle/${GradleVersion.current().version}/plugin/use/$pluginId/$version")
+    }
+
+    static class PluginUseResponse {
+        String id
+        String version
+
+        static class Implementation {
+            String gav
+            String repo
+
+            Implementation(String gav, String repo) {
+                this.gav = gav
+                this.repo = repo
+            }
+        }
+
+        Implementation implementation
+        String implementationType
+
+        PluginUseResponse(String id, String version, Implementation implementation, String implementationType) {
+            this.id = id
+            this.version = version
+            this.implementation = implementation
+            this.implementationType = implementationType
+        }
+    }
+
+    static class ErrorResponse {
+        String errorCode;
+        String message;
+
+        ErrorResponse(String errorCode, String message) {
+            this.errorCode = errorCode
+            this.message = message
+        }
+    }
+
+    public void expectPluginQuery(String pluginId, String pluginVersion, String group, String artifact, String version,
+                                  @DelegatesTo(value = PluginUseResponse, strategy = Closure.DELEGATE_FIRST) Closure<?> configurer = null) {
+        def useResponse = new PluginUseResponse(pluginId, pluginVersion, new PluginUseResponse.Implementation("$group:$artifact:$version", m2repo.uri.toString()), "M2_JAR")
+
+        if (configurer) {
+            ConfigureUtil.configure(configurer, useResponse)
+        }
+
+        http.expect("/api/gradle/${GradleVersion.current().version}/plugin/use/$pluginId/$pluginVersion", ["GET"], new HttpServer.ActionSupport("search action") {
+            void handle(HttpServletRequest request, HttpServletResponse response) {
+                json(response, useResponse)
+            }
+        })
+    }
+
+    public void expectPluginQuery(String pluginId, String pluginVersion, @DelegatesTo(value = HttpServletResponse, strategy = Closure.DELEGATE_FIRST) Closure<?> configurer) {
+        http.expect("/api/gradle/${GradleVersion.current().version}/plugin/use/$pluginId/$pluginVersion", ["GET"], new HttpServer.ActionSupport("search action") {
+            void handle(HttpServletRequest request, HttpServletResponse response) {
+                ConfigureUtil.configure(configurer, response)
+            }
+        })
+    }
+
+    public void expectQueryAndReturnError(String pluginId, String pluginVersion, int httpStatus, String errorCode, String message) {
+        def errorResponse = new ErrorResponse(errorCode, message);
+
+        http.expect("/api/gradle/${GradleVersion.current().version}/plugin/use/$pluginId/$pluginVersion", ["GET"], new HttpServer.ActionSupport("search action") {
+            void handle(HttpServletRequest request, HttpServletResponse response) {
+                response.status = httpStatus
+                json(response, errorResponse)
+            }
+        })
+    }
+
+    void start() {
+        http.start()
+    }
+
+    @Override
+    protected void after() {
+        http.stop()
+    }
+}
diff --git a/subprojects/plugins/plugins.gradle b/subprojects/plugins/plugins.gradle
index cbb72d81e17f..e05efb945a61 100644
--- a/subprojects/plugins/plugins.gradle
+++ b/subprojects/plugins/plugins.gradle
@@ -41,6 +41,7 @@ dependencies {
 
     runtime libraries.commons_cli
 
+    testCompile "com.google.inject:guice:2.0@jar"
     testCompile libraries.jsoup
 }
 
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/GroovyPluginIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/GroovyPluginIntegrationTest.groovy
index 118b8e24e0d8..d8e15b35b63d 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/GroovyPluginIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/GroovyPluginIntegrationTest.groovy
@@ -29,7 +29,7 @@ class GroovyPluginIntegrationTest extends AbstractIntegrationSpec {
             }
 
             dependencies {
-                groovy "org.codehaus.groovy:groovy-all:2.0.5"
+                groovy "org.codehaus.groovy:groovy:2.2.2"
                 compile "com.google.guava:guava:11.0.2"
             }
         """
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/AntForkingGroovyCompilerIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/AntForkingGroovyCompilerIntegrationTest.groovy
deleted file mode 100644
index 4881ba8aaf6c..000000000000
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/AntForkingGroovyCompilerIntegrationTest.groovy
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-package org.gradle.groovy.compile
-
-import org.gradle.integtests.fixtures.TargetVersions
-import org.gradle.util.VersionNumber
-
-@TargetVersions(['1.6.9', '1.7.11', '1.8.8', '2.0.5', '2.1.0'])
-class AntForkingGroovyCompilerIntegrationTest extends GroovyCompilerIntegrationSpec {
-
-    @Override
-    String compilerConfiguration() {
-        '''
-    tasks.withType(GroovyCompile) {
-        groovyOptions.useAnt = true
-        groovyOptions.fork = true
-    }
-'''
-    }
-
-    @Override
-    String getCompilationFailureMessage() {
-        return "Forked groovyc returned error code: 1"
-    }
-
-    @Override
-    String getCompileErrorOutput() {
-        if (version == '1.7.11' || versionNumber >= VersionNumber.parse('1.8.0')) {
-            return output
-        }
-        return errorOutput
-    }
-}
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/AntInProcessGroovyCompilerIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/AntInProcessGroovyCompilerIntegrationTest.groovy
deleted file mode 100644
index 20cc575d3974..000000000000
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/AntInProcessGroovyCompilerIntegrationTest.groovy
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-package org.gradle.groovy.compile
-
-import org.gradle.integtests.fixtures.TargetVersions
-
-// Note that canCompileAgainstGroovyClassThatDependsOnExternalClass() isn't executed
-// for all Groovy versions (but still shown as green). See the (inherited) test method for details.
-@TargetVersions(['1.6.9', '1.7.10', '1.7.11' , '1.8.6', '1.8.8', '2.0.5'])
-class AntInProcessGroovyCompilerIntegrationTest extends BasicGroovyCompilerIntegrationSpec {
-    def setup() {
-        executer.requireGradleHome()
-    }
-
-    @Override
-    def String compilerConfiguration() {
-    '''
-    tasks.withType(GroovyCompile) {
-        groovyOptions.useAnt = true
-        groovyOptions.fork = false
-    }
-'''
-    }
-
-    @Override
-    String getCompilationFailureMessage() {
-        return "Compilation Failed"
-    }
-}
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec.groovy
index a9cb48dff11a..3f85dadc4469 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/BasicGroovyCompilerIntegrationSpec.groovy
@@ -21,10 +21,9 @@ import org.gradle.integtests.fixtures.TargetVersions
 import org.gradle.integtests.fixtures.TestResources
 import org.gradle.integtests.fixtures.executer.ExecutionFailure
 import org.gradle.integtests.fixtures.executer.ExecutionResult
-import org.gradle.util.VersionNumber
 import org.junit.Rule
 
-@TargetVersions(['1.5.8', '1.6.9', '1.7.11', '1.8.8', '2.0.5', '2.1.0'])
+@TargetVersions(['1.5.8', '1.6.9', '1.7.11', '1.8.8', '2.0.5', '2.1.0', '2.2.2', '2.3.0-beta-2'])
 abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegrationSpec {
     @Rule TestResources resources = new TestResources(temporaryFolder)
 
@@ -68,14 +67,6 @@ abstract class BasicGroovyCompilerIntegrationSpec extends MultiVersionIntegratio
     }
 
     def "canCompileAgainstGroovyClassThatDependsOnExternalClass"() {
-        if (getClass() == AntInProcessGroovyCompilerIntegrationTest &&
-                (version == '1.6.9' || version == '1.7.11' || versionNumber >= VersionNumber.parse('1.8.7'))) {
-            // known not to work in 1.7.11, 1.8.7 and beyond (see comment on GRADLE-2404)
-            // only works with 1.6.9 if JUnit makes it on Ant (!) class path, which is no longer the case
-            // note that these problems only apply to useAnt=true; fork=false
-            return
-        }
-
         expect:
         succeeds("test")
     }
@@ -114,9 +105,7 @@ dependencies {
     compile '${groovyDependency.toString()}'
 }
 
-DeprecationLogger.whileDisabled {
-    ${compilerConfiguration()}
-}
+${compilerConfiguration()}
         """
     }
 
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/InProcessGroovyCompilerIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/InProcessGroovyCompilerIntegrationTest.groovy
index 1acfe67b2310..03abe08dffe2 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/InProcessGroovyCompilerIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/InProcessGroovyCompilerIntegrationTest.groovy
@@ -20,7 +20,6 @@ class InProcessGroovyCompilerIntegrationTest extends ApiGroovyCompilerIntegratio
     String compilerConfiguration() {
 '''
     tasks.withType(GroovyCompile) {
-        groovyOptions.useAnt = false
         groovyOptions.fork = false
     }
 '''
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/InvokeDynamicGroovyCompilerSpec.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/InvokeDynamicGroovyCompilerSpec.groovy
index 3576edaf2b4b..04402f38e08f 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/InvokeDynamicGroovyCompilerSpec.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/compile/InvokeDynamicGroovyCompilerSpec.groovy
@@ -34,7 +34,6 @@ class InvokeDynamicGroovyCompilerSpec extends ApiGroovyCompilerIntegrationSpec {
     String compilerConfiguration() {
         '''
 tasks.withType(GroovyCompile) {
-    groovyOptions.useAnt = false
     groovyOptions.fork = false
 }
         '''
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/environment/JreJavaHomeGroovyIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/environment/JreJavaHomeGroovyIntegrationTest.groovy
index 78a005808d31..804491029bdb 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/environment/JreJavaHomeGroovyIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/groovy/environment/JreJavaHomeGroovyIntegrationTest.groovy
@@ -27,7 +27,7 @@ class JreJavaHomeGroovyIntegrationTest extends AbstractIntegrationSpec {
 
     @IgnoreIf({ AvailableJavaHomes.bestJre == null})
     @Unroll
-    def "groovy java cross compilation works in forking mode = #forkMode and useAnt = #useAnt when JAVA_HOME is set to JRE"() {
+    def "groovy java cross compilation works in forking mode = #forkMode when JAVA_HOME is set to JRE"() {
         given:
         def jreJavaHome = AvailableJavaHomes.bestJre
         writeJavaTestSource("src/main/groovy")
@@ -40,7 +40,6 @@ class JreJavaHomeGroovyIntegrationTest extends AbstractIntegrationSpec {
                 }
                 compileGroovy{
                     options.fork = ${forkMode}
-                    DeprecationLogger.whileDisabled { options.useAnt = ${useAnt} }
                 }
                 """
         when:
@@ -50,15 +49,12 @@ class JreJavaHomeGroovyIntegrationTest extends AbstractIntegrationSpec {
         file("build/classes/main/org/test/GroovyClazz.class").exists()
 
         where:
-        forkMode | useAnt
-        false    | false
-        false    | true
-        true     | false
+        forkMode << [true, false]
     }
 
     @Requires(TestPrecondition.WINDOWS)
     @Unroll
-    def "groovy compiler works when gradle is started with no JAVA_HOME defined in forking mode = #forkMode and useAnt = #useAnt"() {
+    def "groovy compiler works when gradle is started with no JAVA_HOME defined in forking mode = #forkMode"() {
         given:
         writeJavaTestSource("src/main/groovy")
         writeGroovyTestSource("src/main/groovy")
@@ -69,8 +65,6 @@ class JreJavaHomeGroovyIntegrationTest extends AbstractIntegrationSpec {
             }
             compileGroovy {
                 options.fork = ${forkMode}
-                options.useAnt = ${useAnt}
-                groovyOptions.useAnt = ${useAnt}
             }
             """
         when:
@@ -83,10 +77,7 @@ class JreJavaHomeGroovyIntegrationTest extends AbstractIntegrationSpec {
         file("build/classes/main/org/test/GroovyClazz.class").exists()
 
         where:
-        forkMode | useAnt
-        false    | false
-        false    | true
-        true     | false
+        forkMode << [true, false]
     }
 
     private writeJavaTestSource(String srcDir, String clazzName = "JavaClazz") {
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/AntForkingJavaCompilerIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/AntForkingJavaCompilerIntegrationTest.groovy
deleted file mode 100644
index 6714cbb9cef5..000000000000
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/AntForkingJavaCompilerIntegrationTest.groovy
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-package org.gradle.java.compile
-
-class AntForkingJavaCompilerIntegrationTest extends BasicJavaCompilerIntegrationSpec {
-    def compilerConfiguration() {
-        '''
-compileJava.options.with {
-    useAnt = true
-    fork = true
-}
-'''
-    }
-
-    def logStatement() {
-        "Compiling with Ant javac task"
-    }
-
-    def getCompilerErrorOutput() {
-        return output
-    }
-}
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/AntInProcessJavaCompilerIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/AntInProcessJavaCompilerIntegrationTest.groovy
deleted file mode 100644
index b4c384f07b7b..000000000000
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/AntInProcessJavaCompilerIntegrationTest.groovy
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-package org.gradle.java.compile
-
-class AntInProcessJavaCompilerIntegrationTest extends BasicJavaCompilerIntegrationSpec {
-    def compilerConfiguration() {
-        '''
-compileJava.options.with {
-    useAnt = true
-    fork = false
-}
-'''
-    }
-
-    def logStatement() {
-        "Compiling with Ant javac task"
-    }
-
-    def getCompilerErrorOutput() {
-        return output
-    }
-}
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/BasicJavaCompilerIntegrationSpec.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/BasicJavaCompilerIntegrationSpec.groovy
index 641be7e61d77..ebf3b9a1334a 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/BasicJavaCompilerIntegrationSpec.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/BasicJavaCompilerIntegrationSpec.groovy
@@ -25,9 +25,7 @@ abstract class BasicJavaCompilerIntegrationSpec extends AbstractIntegrationSpec
         executer.withArguments("-i")
         buildFile << buildScript()
         buildFile << """
-DeprecationLogger.whileDisabled {
     ${compilerConfiguration()}
-}
 """
     }
 
@@ -131,8 +129,12 @@ compileJava.options.debug = false
         '''
 apply plugin: "java"
 
+repositories {
+    mavenCentral()
+}
+
 dependencies {
-    compile localGroovy()
+    compile "org.codehaus.groovy:groovy:2.2.2"
 }
 '''
     }
@@ -148,14 +150,13 @@ package compile.test;
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 
 import java.util.Arrays;
-import java.util.List;
 
 public class Person {
     String name;
     int age;
 
     void hello() {
-        List<Integer> vars = Arrays.asList(3, 1, 2);
+        Iterable<Integer> vars = Arrays.asList(3, 1, 2);
         DefaultGroovyMethods.max(vars);
     }
 }'''
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/CommandLineJavaCompilerIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/CommandLineJavaCompilerIntegrationTest.groovy
index 3826eeb5f325..fa3b911825cb 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/CommandLineJavaCompilerIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/CommandLineJavaCompilerIntegrationTest.groovy
@@ -29,7 +29,6 @@ class CommandLineJavaCompilerIntegrationTest extends JavaCompilerIntegrationSpec
 
         """
 compileJava.options.with {
-    useAnt = false
     fork = true
     forkOptions.executable = "$executable"
 }
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/CrossTaskIncrementalJavaCompilationIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/CrossTaskIncrementalJavaCompilationIntegrationTest.groovy
new file mode 100644
index 000000000000..8ed4d073da1a
--- /dev/null
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/CrossTaskIncrementalJavaCompilationIntegrationTest.groovy
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+
+
+package org.gradle.java.compile
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.CompilationOutputsFixture
+
+public class CrossTaskIncrementalJavaCompilationIntegrationTest extends AbstractIntegrationSpec {
+
+    CompilationOutputsFixture impl
+
+    def setup() {
+        impl = new CompilationOutputsFixture(file("impl/build/classes"))
+
+        buildFile << """
+            subprojects {
+                apply plugin: 'java'
+                tasks.withType(JavaCompile) {
+                    options.incremental = true
+                    options.fork = true
+                }
+                repositories { mavenCentral() }
+            }
+            project(':impl') {
+                dependencies { compile project(':api') }
+            }
+        """
+        settingsFile << "include 'api', 'impl'"
+    }
+
+    private File java(Map projectToClassBodies) {
+        File out
+        projectToClassBodies.each { project, bodies ->
+            bodies.each { body ->
+                def className = (body =~ /(?s).*?class (\w+) .*/)[0][1]
+                assert className: "unable to find class name"
+                def f = file("$project/src/main/java/${className}.java")
+                f.createFile()
+                f.text = body
+                out = f
+            }
+        }
+        out
+    }
+
+    def "detects changed class in an upstream project"() {
+        java api: ["class A {}", "class B {}"], impl: ["class ImplA extends A {}", "class ImplB extends B {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class A { String change; }"]
+        run "impl:compileJava"
+
+        then:
+        impl.recompiledClasses("ImplA")
+    }
+
+    def "detects change to transitive dependency in an upstream project"() {
+        java api: ["class A {}", "class B extends A {}"]
+        java impl: ["class SomeImpl {}", "class ImplB extends B {}", "class ImplB2 extends ImplB {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class A { String change; }"]
+        run "impl:compileJava"
+
+        then:
+        impl.recompiledClasses("ImplB", "ImplB2")
+    }
+
+    def "deletion of jar without dependents does not recompile any classes"() {
+        java api: ["class A {}"], impl: ["class SomeImpl {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        buildFile << """
+            project(':impl') {
+                configurations.compile.dependencies.clear() //so that api jar is no longer on classpath
+            }
+        """
+        run "impl:compileJava"
+
+        then:
+        impl.noneRecompiled()
+    }
+
+    def "deletion of jar with dependents causes compilation failure"() {
+        java api: ["class A {}"], impl: ["class ImplA extends A {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        buildFile << """
+            project(':impl') {
+                configurations.compile.dependencies.clear() //so that api jar is no longer on classpath
+            }
+        """
+        fails "impl:compileJava"
+
+        then:
+        impl.noneRecompiled()
+    }
+
+    def "detects change to dependency and ensures class dependency info refreshed"() {
+        java api: ["class A {}", "class B extends A {}"]
+        java impl: ["class SomeImpl {}", "class ImplB extends B {}", "class ImplB2 extends ImplB {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class B { /* remove extends */ }"]
+        run "impl:compileJava"
+
+        then: impl.recompiledClasses("ImplB", "ImplB2")
+
+        when:
+        impl.snapshot()
+        java api: ["class A { /* change */ }"]
+        run "impl:compileJava"
+
+        then: impl.noneRecompiled() //because after earlier change to B, class A is no longer a dependency
+    }
+
+    def "detects deleted class in an upstream project and fails compilation"() {
+        def b = java(api: ["class A {}", "class B {}"])
+        java impl: ["class ImplA extends A {}", "class ImplB extends B {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        assert b.delete()
+        fails "impl:compileJava"
+
+        then:
+        impl.noneRecompiled()
+    }
+
+    def "recompilation not necessary when upstream does not change any of the actual dependencies"() {
+        java api: ["class A {}", "class B {}"], impl: ["class ImplA extends A {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class B { String change; }"]
+        run "impl:compileJava"
+
+        then:
+        impl.noneRecompiled()
+    }
+
+    def "deletion of jar with non-private constant causes full rebuild"() {
+        java api: ["class A { final static int x = 1; }"], impl: ["class X {}", "class Y {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        buildFile << """
+            project(':impl') {
+                configurations.compile.dependencies.clear() //so that api jar is no longer on classpath
+            }
+        """
+        run "impl:compileJava"
+
+        then:
+        impl.recompiledClasses("X", "Y")
+    }
+
+    def "change in an upstream class with non-private constant causes full rebuild"() {
+        java api: ["class A {}", "class B { final static int x = 1; }"], impl: ["class ImplA extends A {}", "class ImplB extends B {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class B { /* change */ }"]
+        run "impl:compileJava"
+
+        then:
+        impl.recompiledClasses('ImplA', 'ImplB')
+    }
+
+    def "change in an upstream transitive class with non-private constant does not cause full rebuild"() {
+        java api: ["class A { final static int x = 1; }", "class B extends A {}"], impl: ["class ImplA extends A {}", "class ImplB extends B {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class B { /* change */ }"]
+        run "impl:compileJava"
+
+        then:
+        impl.recompiledClasses('ImplB')
+    }
+
+    def "private constant in upstream project does not trigger full rebuild"() {
+        java api: ["class A {}", "class B { private final static int x = 1; }"], impl: ["class ImplA extends A {}", "class ImplB extends B {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class B { /* change */ }"]
+        run "impl:compileJava"
+
+        then:
+        impl.recompiledClasses('ImplB')
+    }
+
+    def "detects changed classes when upstream project was built in isolation"() {
+        java api: ["class A {}", "class B {}"], impl: ["class ImplA extends A {}", "class ImplB extends B {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class A { String change; }"]
+        run "api:compileJava"
+        run "impl:compileJava"
+
+        then:
+        impl.recompiledClasses("ImplA")
+    }
+
+    def "detects class changes in subsequent runs ensuring the jar snapshots are refreshed"() {
+        java api: ["class A {}", "class B {}"], impl: ["class ImplA extends A {}", "class ImplB extends B {}"]
+        impl.snapshot { run "compileJava" }
+
+        when:
+        java api: ["class A { String change; }"]
+        run "api:compileJava"
+        run "impl:compileJava" //different build invocation
+
+        then: impl.recompiledClasses("ImplA")
+
+        when:
+        impl.snapshot()
+        java api: ["class B { String change; }"]
+        run "compileJava"
+
+        then: impl.recompiledClasses("ImplB")
+    }
+
+    def "changes to resources in jar do not incur recompilation"() {
+        java impl: ["class A {}"]
+        impl.snapshot { run "impl:compileJava" }
+
+        when:
+        file("api/src/main/resources/some-resource.txt") << "xxx"
+        java api: ["class A { String change; }"]
+        run "impl:compileJava"
+
+        then: impl.noneRecompiled()
+    }
+
+    def "handles multiple compile tasks in the same project"() {
+        settingsFile << "\n include 'other'" //add an extra project
+        java impl: ["class ImplA extends A {}"], api: ["class A {}"], other: ["class Other {}"]
+
+        //new separate compile task (integTestCompile) depends on class from the extra project
+        file("impl/build.gradle") << """
+            sourceSets { integTest.java.srcDir 'src/integTest/java' }
+            dependencies { integTestCompile project(":other") }
+        """
+        file("impl/src/integTest/java/SomeIntegTest.java") << "class SomeIntegTest extends Other {}"
+
+        impl.snapshot { run "compileIntegTestJava", "compileJava" }
+
+        when: //when api class is changed
+        java api: ["class A { String change; }"]
+        run "compileIntegTestJava", "compileJava", "-i"
+
+        then: //only impl class is recompiled
+        impl.recompiledClasses("ImplA")
+
+        when: //when other class is changed
+        impl.snapshot()
+        java other: ["class Other { String change; }"]
+        run "compileIntegTestJava", "compileJava", "-i"
+
+        then: //only integTest class is recompiled
+        impl.recompiledClasses("SomeIntegTest")
+    }
+
+    def "handles new jar on classpath that has duplicate class as an existing jar"() {
+        //TODO
+    }
+
+    def "class in source dir wins over a duplicate found in some jar on classpath"() {
+        //TODO
+    }
+
+    def "the order of classpath items is unchanged"() {
+        //TODO
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/InProcessJavaCompilerIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/InProcessJavaCompilerIntegrationTest.groovy
index c5daf6733740..0a39b93a9b43 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/InProcessJavaCompilerIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/InProcessJavaCompilerIntegrationTest.groovy
@@ -19,7 +19,6 @@ class InProcessJavaCompilerIntegrationTest extends JavaCompilerIntegrationSpec {
     def compilerConfiguration() {
         '''
 compileJava.options.with {
-    useAnt = false
     fork = false
 }
 '''
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/IncrementalJavaCompilationIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/IncrementalJavaCompilationIntegrationTest.groovy
deleted file mode 100644
index c5ba87e20dd6..000000000000
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/IncrementalJavaCompilationIntegrationTest.groovy
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.java.compile
-
-import org.gradle.integtests.fixtures.AbstractIntegrationSpec
-
-class IncrementalJavaCompilationIntegrationTest extends AbstractIntegrationSpec {
-
-    def setup() {
-        buildFile << """
-            allprojects {
-                apply plugin: 'java'
-                compileJava.options.incremental = true
-            }
-
-            task cleanFiles(type: Delete) {
-                delete("changedFiles.txt", "unchangedFiles.txt")
-            }
-
-            compileJava {
-                dependsOn cleanFiles
-                def times = [:]
-                doFirst {
-                    fileTree("build/classes/main").each {
-                        if (it.file) {
-                            times[it] = it.lastModified()
-                        }
-                    }
-                }
-                doLast {
-                    sleep(1100) //lastModified granularity
-                    def changedFiles = ""
-                    def unchangedFiles = ""
-                    times.each { k,v ->
-                        if (k.lastModified() != v) {
-                            changedFiles += k.name + ","
-                        } else {
-                            unchangedFiles += k.name + ","
-                        }
-                    }
-                    file("changedFiles.txt").text = changedFiles
-                    file("unchangedFiles.txt").text = unchangedFiles
-                }
-            }
-        """
-
-        file("src/main/java/org/Person.java") << """package org;
-        public interface Person {
-            String getName();
-        }"""
-        file("src/main/java/org/PersonImpl.java") << """package org;
-        public class PersonImpl implements Person {
-            public String getName() { return "Szczepan"; }
-        }"""
-        file("src/main/java/org/AnotherPersonImpl.java") << """package org;
-        public class AnotherPersonImpl extends PersonImpl {
-            public String getName() { return "Szczepan Faber " + WithConst.X; }
-        }"""
-        file("src/main/java/org/WithConst.java") << """package org;
-        public class WithConst {
-            final static int X = 100;
-        }"""
-    }
-
-    Set getChangedFiles() {
-        file("changedFiles.txt").text.split(",").findAll { it.length() > 0 }.collect { it.replaceAll("\\.class", "")}
-    }
-
-    Set getUnchangedFiles() {
-        file("unchangedFiles.txt").text.split(",").findAll { it.length() > 0 }.collect { it.replaceAll("\\.class", "")}
-    }
-
-    def "compiles only a single class that was changed"() {
-        run "compileJava"
-
-        file("src/main/java/org/AnotherPersonImpl.java").text = """package org;
-        public class AnotherPersonImpl implements Person {
-            public String getName() { return "Hans"; }
-        }"""
-
-        when: run "compileJava"
-
-        then: changedFiles == ['AnotherPersonImpl'] as Set
-    }
-
-    def "refreshes the class dependencies with each run"() {
-        run "compileJava"
-
-        file("src/main/java/org/AnotherPersonImpl.java").text = """package org;
-        public class AnotherPersonImpl {}""" //remove the dependency to the interface
-
-        when: run "compileJava"
-
-        then: changedFiles == ['AnotherPersonImpl'] as Set
-
-        when:
-        file("src/main/java/org/Person.java").text = """package org;
-        public interface Person {
-            String getName();
-            String toString();
-        }"""
-        run "compileJava"
-
-        then: changedFiles == ['PersonImpl', 'Person'] as Set
-    }
-
-    def "detects class transitive dependents"() {
-        when: run "compileJava"
-
-        then:
-        changedFiles.empty
-        unchangedFiles.empty
-
-        when:
-        file("src/main/java/org/Person.java").text = """package org;
-        public interface Person {
-            String toString();
-        }"""
-
-        run "compileJava"
-
-        then:
-        changedFiles == ['AnotherPersonImpl', 'PersonImpl', 'Person'] as Set
-    }
-
-    def "is sensitive to deletion and change"() {
-        run "compileJava"
-
-        assert file("src/main/java/org/PersonImpl.java").delete()
-
-        file("src/main/java/org/AnotherPersonImpl.java").text = """package org;
-        public class AnotherPersonImpl implements Person {
-            public String getName() { return "Hans"; }
-        }"""
-
-        when: run "compileJava"
-
-        then:
-        !file("build/classes/main/org/PersonImpl.class").exists()
-        changedFiles == ['AnotherPersonImpl', 'PersonImpl'] as Set
-    }
-
-    def "is sensitive to inlined constants"() {
-        run "compileJava"
-
-        file("src/main/java/org/WithConst.java").text = """package org;
-        public class WithConst {
-            static final int X = 20;
-        }"""
-
-        when: run "compileJava"
-
-        then:
-        unchangedFiles.empty
-        changedFiles.containsAll(['WithConst', 'AnotherPersonImpl', 'PersonImpl', 'Person'])
-    }
-
-    def "is sensitive to source annotations"() {
-        file("src/main/java/org/ClassAnnotation.java").text = """package org; import java.lang.annotation.*;
-            @Retention(RetentionPolicy.RUNTIME) public @interface ClassAnnotation {}
-        """
-        file("src/main/java/org/SourceAnnotation.java").text = """package org; import java.lang.annotation.*;
-            @Retention(RetentionPolicy.SOURCE) public @interface SourceAnnotation {}
-        """
-        file("src/main/java/org/UsesClassAnnotation.java").text = """package org;
-            @ClassAnnotation public class UsesClassAnnotation {}
-        """
-        file("src/main/java/org/UsesSourceAnnotation.java").text = """package org;
-            @SourceAnnotation public class UsesSourceAnnotation {}
-        """
-        run "compileJava"
-
-        file("src/main/java/org/ClassAnnotation.java").text = """package org; import java.lang.annotation.*;
-            @Retention(RetentionPolicy.RUNTIME) public @interface ClassAnnotation {
-                String foo() default "foo";
-            }"""
-
-        when: run "compileJava"
-
-        then:
-        unchangedFiles.empty
-        changedFiles.containsAll(['WithConst', 'AnotherPersonImpl', 'PersonImpl', 'Person'])
-    }
-
-    def "removal of class causes deletion of inner classes"() {
-        file("src/main/java/org/B.java") << """package org;
-            public class B {
-                public static class InnerB {}
-            }
-        """
-
-        when: run "compileJava"
-
-        then:
-        def classes = [file('build/classes/main/org/B.class'), file('build/classes/main/org/B$InnerB.class')]
-        classes.each { assert it.exists() }
-
-        when:
-        assert file("src/main/java/org/B.java").delete()
-        run "compileJava"
-
-        then:
-        classes.each { assert !it.exists() }
-    }
-}
\ No newline at end of file
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/SourceIncrementalJavaCompilationIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/SourceIncrementalJavaCompilationIntegrationTest.groovy
new file mode 100644
index 000000000000..6988f41fe684
--- /dev/null
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/java/compile/SourceIncrementalJavaCompilationIntegrationTest.groovy
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.java.compile;
+
+import org.gradle.integtests.fixtures.AbstractIntegrationSpec
+import org.gradle.integtests.fixtures.CompilationOutputsFixture;
+
+public class SourceIncrementalJavaCompilationIntegrationTest extends AbstractIntegrationSpec {
+
+    CompilationOutputsFixture outputs
+
+    def setup() {
+        outputs = new CompilationOutputsFixture(file("build/classes"))
+
+        buildFile << """
+            apply plugin: 'java'
+            compileJava.options.incremental = true
+        """
+    }
+
+    private File java(String ... classBodies) {
+        File out
+        for (String body : classBodies) {
+            def className = (body =~ /(?s).*?class (\w+) .*/)[0][1]
+            assert className: "unable to find class name"
+            def f = file("src/main/java/${className}.java")
+            f.createFile()
+            f.text = body
+            out = f
+        }
+        out
+    }
+
+    def "detects deletion of an isolated source class with an inner class"() {
+        def a = java """class A {
+            class InnerA {}
+        }"""
+        java "class B {}"
+
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        assert a.delete()
+        run "compileJava"
+
+        then:
+        outputs.noneRecompiled() //B is not recompiled
+        outputs.deletedClasses 'A', 'A$InnerA' //inner class is also deleted
+    }
+
+    def "detects deletion of a source base class that leads to compilation failure"() {
+        def a = java "class A {}"
+        java "class B extends A {}"
+
+        outputs.snapshot { run "compileJava" }
+
+        when: assert a.delete()
+        then:
+        fails "compileJava"
+        outputs.noneRecompiled()
+        outputs.deletedClasses 'A', 'B'
+    }
+
+    def "detects change of an isolated source class with an inner class"() {
+        java """class A {
+            class InnerA {}
+        }"""
+        java "class B {}"
+
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java """class A {
+            class InnerA { /* change */ }
+        }"""
+        run "compileJava"
+
+        then:
+        outputs.recompiledClasses 'A', 'A$InnerA'
+    }
+
+    def "detects change of an isolated class"() {
+        java "class A {}", "class B {}"
+
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class A { /* change */ }"
+        run "compileJava"
+
+        then:
+        outputs.recompiledClasses 'A'
+    }
+
+    def "detects deletion of an inner class"() {
+        java """class A {
+            class InnerA {}
+        }"""
+        java "class B {}"
+
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class A {}"
+        run "compileJava"
+
+        then:
+        outputs.recompiledClasses 'A'
+        outputs.deletedClasses 'A$InnerA'
+    }
+
+    def "detects rename of an inner class"() {
+        java """class A {
+            class InnerA {}
+        }"""
+        java "class B {}"
+
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java """class A {
+            class InnerA2 {}
+        }"""
+        run "compileJava"
+
+        then:
+        outputs.recompiledClasses 'A', 'A$InnerA2'
+        outputs.deletedClasses 'A$InnerA'
+    }
+
+    def "detects addition af a new class with an inner class"() {
+        java "class B {}"
+
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java """class A {
+            class InnerA {}
+        }"""
+        run "compileJava"
+
+        then:
+        outputs.recompiledClasses 'A', 'A$InnerA'
+    }
+
+    def "detects transitive dependencies"() {
+        java "class A {}", "class B extends A {}", "class C extends B {}", "class D {}"
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class A { /* change */ }"
+        run "compileJava"
+
+        then: outputs.recompiledClasses 'A', 'B', 'C'
+
+        when:
+        outputs.snapshot()
+        java "class B { /* change */ }"
+        run "compileJava"
+
+        then: outputs.recompiledClasses 'B', 'C'
+    }
+
+    def "detects transitive dependencies with inner classes"() {
+        java "class A {}", "class B extends A {}", "class D {}"
+        java """class C extends B {
+            class InnerC {}
+        }
+        """
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class A { /* change */ }"
+        run "compileJava"
+
+        then: outputs.recompiledClasses 'A', 'B', 'C', 'C$InnerC'
+    }
+
+    def "handles cycles in class dependencies"() {
+        java "class A {}", "class D {}"
+        java "class B extends A { C c; }", "class C extends B {}" //cycle
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class A { /* change */ }"
+        run "compileJava"
+
+        then: outputs.recompiledClasses 'A', 'B', 'C'
+    }
+
+    def "change to an annotation class triggers full rebuild"() {
+        def annotationClass = file("src/main/java/SourceAnnotation.java") << """import java.lang.annotation.*;
+            @Retention(RetentionPolicy.SOURCE) public @interface SourceAnnotation {}
+        """
+        java "class A {}", "class B {}"
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        annotationClass.text += "/* change */"
+        run "compileJava"
+
+        then: outputs.recompiledClasses 'A', 'B', 'SourceAnnotation'
+    }
+
+    def "changed class with private constant does not incur full rebuild"() {
+        java "class A {}", "class B { private final static int x = 1;}"
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class B { /* change */ }"
+        run "compileJava"
+
+        then: outputs.recompiledClasses 'B'
+    }
+
+    def "changed class with non-private constant incurs full rebuild"() {
+        java "class A {}", "class B { final static int x = 1;}"
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class B { /* change */ }"
+        run "compileJava"
+
+        then: outputs.recompiledClasses 'B', 'A'
+    }
+
+    def "dependent class with non-private constant does not incur full rebuild"() {
+        java "class A {}", "class B extends A { final static int x = 1;}", "class C {}"
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class A { /* change */ }"
+        run "compileJava"
+
+        then: outputs.recompiledClasses 'B', 'A'
+    }
+
+    def "detects class changes in subsequent runs ensuring the class dependency data is refreshed"() {
+        java "class A {}", "class B {}", "class C {}"
+        outputs.snapshot { run "compileJava" }
+
+        when:
+        java "class B extends A {}"
+        run "compileJava"
+
+        then: outputs.recompiledClasses('B')
+
+        when:
+        outputs.snapshot()
+        java "class A { /* change */ }"
+        run "compileJava"
+
+        then: outputs.recompiledClasses('A', 'B')
+    }
+
+    def "handles multiple compile tasks within a single project"() {
+        java "class A {}", "class B extends A {}"
+        file("src/integTest/java/X.java") << "class X {}"
+        file("src/integTest/java/Y.java") << "class Y extends X {}"
+
+        //new separate compile task (integTestCompile)
+        file("build.gradle") << """
+            sourceSets { integTest.java.srcDir 'src/integTest/java' }
+        """
+
+        outputs.snapshot { run "compileIntegTestJava", "compileJava" }
+
+        when: //when A class is changed
+        java "class A { String change; }"
+        run "compileIntegTestJava", "compileJava", "-i"
+
+        then: //only B and A are recompiled
+        outputs.recompiledClasses("A", "B")
+
+        when: //when X class is changed
+        outputs.snapshot()
+        file("src/integTest/java/X.java").text = "class X { String change;}"
+        run "compileIntegTestJava", "compileJava", "-i"
+
+        then: //only X and Y are recompiled
+        outputs.recompiledClasses("X", "Y")
+    }
+
+    def "detects changes in classes that live in directories on the classpath"() {
+        //TODO
+    }
+
+    def "class in source dir wins over a duplicate found in classpath directory"() {
+        //TODO
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/java/environment/JreJavaHomeJavaIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/java/environment/JreJavaHomeJavaIntegrationTest.groovy
index efe9017107c5..9371c54c76fd 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/java/environment/JreJavaHomeJavaIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/java/environment/JreJavaHomeJavaIntegrationTest.groovy
@@ -27,7 +27,7 @@ class JreJavaHomeJavaIntegrationTest extends AbstractIntegrationSpec {
 
     @IgnoreIf({ AvailableJavaHomes.bestJre == null })
     @Unroll
-    def "java compilation works in forking mode = #forkMode and useAnt = #useAnt when JAVA_HOME is set to JRE"() {
+    def "java compilation works in forking mode = #forkMode when JAVA_HOME is set to JRE"() {
         given:
         def jreJavaHome = AvailableJavaHomes.bestJre
         writeJavaTestSource("src/main/java");
@@ -36,44 +36,36 @@ class JreJavaHomeJavaIntegrationTest extends AbstractIntegrationSpec {
         apply plugin:'java'
         compileJava {
             options.fork = ${forkMode}
-            options.useAnt = ${useAnt}
         }
         """
         when:
-        executer.withEnvironmentVars("JAVA_HOME": jreJavaHome.absolutePath).withDeprecationChecksDisabled().withTasks("compileJava").run().output
+        executer.withEnvironmentVars("JAVA_HOME": jreJavaHome.absolutePath).withTasks("compileJava").run().output
         then:
         file("build/classes/main/org/test/JavaClazz.class").exists()
 
         where:
-        forkMode | useAnt
-        false    | false
-        false    | true
-        true     | false
+        forkMode << [true, false]
     }
 
     @Requires(TestPrecondition.WINDOWS)
     @Unroll
-    def "java compilation works in forking mode = #forkMode and useAnt = #useAnt when gradle is started with no JAVA_HOME defined"() {
+    def "java compilation works in forking mode = #forkMode when gradle is started with no JAVA_HOME defined"() {
         given:
         writeJavaTestSource("src/main/java");
         file('build.gradle') << """
         apply plugin:'java'
         compileJava {
             options.fork = ${forkMode}
-            options.useAnt = ${useAnt}
         }
         """
         def envVars = System.getenv().findAll { !(it.key in ['GRADLE_OPTS', 'JAVA_HOME', 'Path']) }
         envVars.put("Path", "C:\\Windows\\System32")
         when:
-        executer.withEnvironmentVars(envVars).withDeprecationChecksDisabled().withTasks("compileJava").run()
+        executer.withEnvironmentVars(envVars).withTasks("compileJava").run()
         then:
         file("build/classes/main/org/test/JavaClazz.class").exists()
         where:
-        forkMode | useAnt
-        false    | false
-        false    | true
-        true     | false
+        forkMode << [true, false]
     }
 
     private writeJavaTestSource(String srcDir) {
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/testing/TestReportIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/testing/TestReportIntegrationTest.groovy
index 3b2d3c60d4f9..a802cc018351 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/testing/TestReportIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/testing/TestReportIntegrationTest.groovy
@@ -140,11 +140,11 @@ public class SuperTest {
 $testFilePrelude
 public class SubTest {
     @Category(SubClassTests.class) @Test public void onlySub() {
-        System.out.println("org.gradle.testing.SubTest#onlySub");
+        System.out.println("org.gradle.testing.SubTest#onlySub " + System.getProperty("category"));
         assertEquals("sub", System.getProperty("category"));
     }
     @Category(SubClassTests.class) @Test public void passing() {
-        System.out.println("org.gradle.testing.SubTest#passing");
+        System.out.println("org.gradle.testing.SubTest#passing " + System.getProperty("category"));
     }
 }
 """
@@ -169,7 +169,10 @@ public class SubClassTests extends SuperClassTests {
                 .assertTestFailed("failing", equalTo('java.lang.AssertionError: failing test'))
                 .assertStdout(allOf(containsString('org.gradle.testing.SuperTest#failing\n'), containsString('org.gradle.testing.SuperTest#passing\n')))
         htmlReport.testClass("org.gradle.testing.SubTest").assertTestCount(4, 1, 0).assertTestPassed("passing") // onlySub is passing once and failing once
-                .assertStdout(allOf(containsString('org.gradle.testing.SubTest#passing\n'), containsString('org.gradle.testing.SubTest#onlySub\n')))
+                .assertStdout(allOf(containsString('org.gradle.testing.SubTest#passing sub\n'),
+                        containsString('org.gradle.testing.SubTest#passing super\n'),
+                        containsString('org.gradle.testing.SubTest#onlySub sub\n'),
+                        containsString('org.gradle.testing.SubTest#onlySub super\n')))
     }
 
     @Issue("http://issues.gradle.org//browse/GRADLE-2821")
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec.groovy
index a12334f52361..1b4d4c82d459 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitCategoriesIntegrationSpec.groovy
@@ -59,6 +59,6 @@ public class JUnitCategoriesIntegrationSpec extends AbstractIntegrationSpec {
 
     def testTaskFailsIfCategoriesNotSupported() {
         when: fails('test')
-        then: failure.error.contains("JUnit Categories defined but declared JUnit version does not support Categories.")
+        then: failure.assertHasCause("JUnit Categories defined but declared JUnit version does not support Categories.")
     }
 }
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitFilteringSupportIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitFilteringSupportIntegrationTest.groovy
index e949b6e690c1..4ece704487d7 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitFilteringSupportIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/testing/junit/JUnitFilteringSupportIntegrationTest.groovy
@@ -38,7 +38,7 @@ public class JUnitFilteringSupportIntegrationTest extends AbstractIntegrationSpe
         when: fails("test")
 
         then:
-        failure.error.contains("Test filtering is not supported for given version of JUnit. Please upgrade JUnit version to at least 4.6.")
+        failure.assertHasCause("Test filtering is not supported for given version of JUnit. Please upgrade JUnit version to at least 4.6.")
     }
 
     void "informs that we dont support filtering for JUnit 3.x"() {
@@ -57,6 +57,6 @@ public class JUnitFilteringSupportIntegrationTest extends AbstractIntegrationSpe
 
         when: fails("test")
 
-        then: failure.error.contains("Test filtering is not supported for given version of JUnit. Please upgrade JUnit version to at least 4.6.")
+        then: failure.assertHasCause("Test filtering is not supported for given version of JUnit. Please upgrade JUnit version to at least 4.6.")
     }
 }
\ No newline at end of file
diff --git a/subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGLoggingIntegrationTest.groovy b/subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGLoggingIntegrationTest.groovy
index 4eee33ceec27..5a0e472770b0 100644
--- a/subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGLoggingIntegrationTest.groovy
+++ b/subprojects/plugins/src/integTest/groovy/org/gradle/testing/testng/TestNGLoggingIntegrationTest.groovy
@@ -34,7 +34,7 @@ class TestNGLoggingIntegrationTest extends AbstractIntegrationSpec {
             }
 
             dependencies {
-                compile "org.codehaus.groovy:groovy-all:2.0.5"
+                compile "org.codehaus.groovy:groovy:2.2.2"
                 testCompile "org.testng:testng:6.3.1"
             }
 
@@ -121,7 +121,7 @@ Gradle test FAILED
             }
 
             dependencies {
-                compile "org.codehaus.groovy:groovy-all:2.0.5"
+                compile "org.codehaus.groovy:groovy:2.2.2"
                 testCompile "org.testng:testng:6.3.1"
             }
 
diff --git a/subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canUseAstTransformThatReferencesGroovyTestCase/build.gradle b/subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canUseAstTransformThatReferencesGroovyTestCase/build.gradle
index 4a687c9d28ee..ed543f4dfa93 100644
--- a/subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canUseAstTransformThatReferencesGroovyTestCase/build.gradle
+++ b/subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canUseAstTransformThatReferencesGroovyTestCase/build.gradle
@@ -5,6 +5,5 @@ repositories {
 }
 
 dependencies {
-    compile localGroovy()
-    testCompile "junit:junit:4.10"
+    compile "junit:junit:4.10"
 }
\ No newline at end of file
diff --git a/subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canUseAstTransformThatReferencesGroovyTestCase/src/test/groovy/TestCaseTransformTest.groovy b/subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canUseAstTransformThatReferencesGroovyTestCase/src/test/groovy/TestCaseTransformTest.groovy
index f9ced500dd35..f5ed8e450a0f 100644
--- a/subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canUseAstTransformThatReferencesGroovyTestCase/src/test/groovy/TestCaseTransformTest.groovy
+++ b/subprojects/plugins/src/integTest/resources/org/gradle/groovy/compile/GroovyCompilerIntegrationSpec/canUseAstTransformThatReferencesGroovyTestCase/src/test/groovy/TestCaseTransformTest.groovy
@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-import org.junit.Test
-
+@TestCase
 class TestCaseTransformTest {
-    @Test
-    void addsGroovyTestCaseAsSuperclass() {
-        assert MyTestCase.superclass == GroovyTestCase
+    void testAddsGroovyTestCaseAsSuperclass() {
+        assert getClass().superclass == GroovyTestCase
+        shouldFail(IOException.class) {
+            throw new IOException()
+        }
     }
-
-    @TestCase
-    static abstract class MyTestCase {}
-}
-
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/integTest/resources/org/gradle/testing/TestEnvironmentIntegrationTest/canRunTestsWithCustomSystemClassLoader/src/test/java/org/gradle/MySystemClassLoader.java b/subprojects/plugins/src/integTest/resources/org/gradle/testing/TestEnvironmentIntegrationTest/canRunTestsWithCustomSystemClassLoader/src/test/java/org/gradle/MySystemClassLoader.java
index 49be87a9ba56..24b2a7f6df7a 100644
--- a/subprojects/plugins/src/integTest/resources/org/gradle/testing/TestEnvironmentIntegrationTest/canRunTestsWithCustomSystemClassLoader/src/test/java/org/gradle/MySystemClassLoader.java
+++ b/subprojects/plugins/src/integTest/resources/org/gradle/testing/TestEnvironmentIntegrationTest/canRunTestsWithCustomSystemClassLoader/src/test/java/org/gradle/MySystemClassLoader.java
@@ -7,7 +7,7 @@
 public class MySystemClassLoader extends URLClassLoader {
     public MySystemClassLoader(ClassLoader parent) {
         super(new URL[0], parent);
-        // Should be constructed with the default system ClassLoader as parent
+        // Should be constructed with the default system ClassLoader as root
         assertEquals(getClass().getClassLoader(), parent);
     }
 }
diff --git a/subprojects/plugins/src/integTest/resources/org/gradle/testing/TestEnvironmentIntegrationTest/canRunTestsWithCustomSystemClassLoaderAndJavaAgent/src/main/java/org/gradle/MySystemClassLoader.java b/subprojects/plugins/src/integTest/resources/org/gradle/testing/TestEnvironmentIntegrationTest/canRunTestsWithCustomSystemClassLoaderAndJavaAgent/src/main/java/org/gradle/MySystemClassLoader.java
index adcdd5c280ff..82475b8752e1 100644
--- a/subprojects/plugins/src/integTest/resources/org/gradle/testing/TestEnvironmentIntegrationTest/canRunTestsWithCustomSystemClassLoaderAndJavaAgent/src/main/java/org/gradle/MySystemClassLoader.java
+++ b/subprojects/plugins/src/integTest/resources/org/gradle/testing/TestEnvironmentIntegrationTest/canRunTestsWithCustomSystemClassLoaderAndJavaAgent/src/main/java/org/gradle/MySystemClassLoader.java
@@ -13,7 +13,7 @@
 public class MySystemClassLoader extends URLClassLoader {
     public MySystemClassLoader(ClassLoader parent) throws URISyntaxException, ClassNotFoundException {
         super(new URL[0], parent);
-        // Should be constructed with the default system ClassLoader as parent
+        // Should be constructed with the default system ClassLoader as root
         assertEquals(getClass().getClassLoader(), parent);
         addClasspathFor("org.gradle.MyAgent");
         addClasspathFor("org.gradle.JUnitTest");
diff --git a/subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/shared/build.gradle b/subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/shared/build.gradle
index 79280e7d5221..693fa2727cc4 100644
--- a/subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/shared/build.gradle
+++ b/subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/shared/build.gradle
@@ -5,7 +5,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.codehaus.groovy:groovy-all:2.0.5"
+    compile "org.codehaus.groovy:groovy:2.2.2"
     testCompile "junit:junit:4.11"
 }
 
diff --git a/subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/standardOutputLogging/build.gradle b/subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/standardOutputLogging/build.gradle
index 68c2ba15ca8c..b29d4ba7711c 100644
--- a/subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/standardOutputLogging/build.gradle
+++ b/subprojects/plugins/src/integTest/resources/org/gradle/testing/junit/JUnitLoggingIntegrationTest/standardOutputLogging/build.gradle
@@ -21,7 +21,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.codehaus.groovy:groovy-all:2.0.5"
+    compile "org.codehaus.groovy:groovy:2.2.2"
     testCompile "junit:junit:4.11"
 }
 
diff --git a/subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Failing/build.gradle b/subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Failing/build.gradle
index 0e7278cc3be6..b812e5c38428 100644
--- a/subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Failing/build.gradle
+++ b/subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Failing/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-	compile "org.codehaus.groovy:groovy-all:2.0.5"
+	compile "org.codehaus.groovy:groovy:2.2.2"
     testCompile 'org.testng:testng:6.3.1'
 }
 
diff --git a/subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Passing/build.gradle b/subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Passing/build.gradle
index 0e7278cc3be6..b812e5c38428 100644
--- a/subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Passing/build.gradle
+++ b/subprojects/plugins/src/integTest/resources/org/gradle/testing/testng/TestNGIntegrationTest/groovyJdk15Passing/build.gradle
@@ -7,7 +7,7 @@ repositories {
 }
 
 dependencies {
-	compile "org.codehaus.groovy:groovy-all:2.0.5"
+	compile "org.codehaus.groovy:groovy:2.2.2"
     testCompile 'org.testng:testng:6.3.1'
 }
 
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingScheme.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryNamingScheme.java
similarity index 95%
rename from subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingScheme.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryNamingScheme.java
index e7fd06436190..395243458941 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingScheme.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryNamingScheme.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.language.jvm.internal;
+package org.gradle.api.internal.jvm;
 
 import org.gradle.api.Nullable;
-import org.gradle.language.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 import org.gradle.util.GUtil;
 
 import java.util.Collections;
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinary.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/DefaultClassDirectoryBinary.java
similarity index 87%
rename from subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinary.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/DefaultClassDirectoryBinary.java
index c7485c0147ae..93fd5e472b61 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinary.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/jvm/DefaultClassDirectoryBinary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2014 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.jvm.internal;
+package org.gradle.api.internal.jvm;
 
 import org.gradle.api.DomainObjectCollection;
 import org.gradle.api.internal.DefaultDomainObjectSet;
+import org.gradle.api.jvm.ClassDirectoryBinary;
 import org.gradle.language.base.LanguageSourceSet;
-import org.gradle.language.base.internal.AbstractBuildableModelElement;
-import org.gradle.language.base.internal.BinaryInternal;
-import org.gradle.language.base.internal.BinaryNamingScheme;
-import org.gradle.language.jvm.ClassDirectoryBinary;
+import org.gradle.runtime.base.internal.AbstractBuildableModelElement;
+import org.gradle.runtime.base.internal.BinaryInternal;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 
 import java.io.File;
 
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/SourceSetCompileClasspath.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/SourceSetCompileClasspath.java
index 6f4176da4a5b..6a3201892941 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/SourceSetCompileClasspath.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/SourceSetCompileClasspath.java
@@ -17,7 +17,7 @@
 
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.tasks.*;
-import org.gradle.language.jvm.Classpath;
+import org.gradle.runtime.jvm.Classpath;
 
 public class SourceSetCompileClasspath implements Classpath {
     private final SourceSet sourceSet;
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/AntGroovyCompiler.groovy b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/AntGroovyCompiler.groovy
deleted file mode 100644
index 93a34f129cdb..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/AntGroovyCompiler.groovy
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile
-
-import org.gradle.api.file.FileCollection
-import org.gradle.api.internal.ClassPathRegistry
-import org.gradle.api.internal.project.IsolatedAntBuilder
-import org.gradle.api.tasks.WorkResult
-import org.gradle.api.tasks.compile.CompileOptions
-import org.gradle.util.VersionNumber
-
-/**
- * Please note: includeAntRuntime=false is ignored if groovyc is used in non fork mode. In this case the runtime classpath is
- * added to the compile classpath.
- * See: http://jira.codehaus.org/browse/GROOVY-2717
- */
-class AntGroovyCompiler implements org.gradle.api.internal.tasks.compile.Compiler<GroovyJavaJointCompileSpec> {
-    private final IsolatedAntBuilder ant
-    private final ClassPathRegistry classPathRegistry
-
-    List nonGroovycJavacOptions = ['verbose', 'deprecation', 'includeJavaRuntime', 'includeAntRuntime', 'optimize', 'fork', 'failonerror', 'listfiles', 'nowarn', 'depend']
-
-    def AntGroovyCompiler(IsolatedAntBuilder ant, ClassPathRegistry classPathRegistry) {
-        this.ant = ant;
-        this.classPathRegistry = classPathRegistry;
-    }
-
-    WorkResult execute(GroovyJavaJointCompileSpec spec) {
-        int numFilesCompiled;
-
-        // Add in commons-cli, as the Groovy POM does not (for some versions of Groovy)
-        Collection antBuilderClasspath = (spec.groovyClasspath as List) + classPathRegistry.getClassPath("COMMONS_CLI").asFiles
-
-        def groovyVersion = sniffGroovyVersion(spec.groovyClasspath)
-        // in Groovy 1.7.11, 1.8.7, and beyond, the combination of includeAntRuntime=false and fork=false is no longer allowed by the
-        // groovyc Ant task and fails hard. That's why we have to enforce includeAntRuntime=true whenever fork=false in these versions,
-        // even though this breaks some stuff. For example, compiling a class that extends GroovyTestCase runs into a NoClassDefFoundError:
-        // org/junit/TestCase then.
-        def includeAntRuntime = groovyVersion == VersionNumber.parse("1.7.11") || groovyVersion >= VersionNumber.parse("1.8.7") ? !spec.groovyCompileOptions.fork : false
-
-        ant.withGroovy(antBuilderClasspath).execute {
-            taskdef(name: 'groovyc', classname: 'org.codehaus.groovy.ant.Groovyc')
-            def task = groovyc([includeAntRuntime: includeAntRuntime, destdir: spec.destinationDir, classpath: ((spec.classpath as List) + antBuilderClasspath).join(File.pathSeparator)]
-                    + spec.groovyCompileOptions.optionMap()) {
-                spec.source.addToAntBuilder(delegate, 'src', FileCollection.AntType.MatchingTask)
-                javac([source: spec.sourceCompatibility, target: spec.targetCompatibility] + filterNonGroovycOptions(spec.compileOptions)) {
-                    spec.compileOptions.compilerArgs.each {value ->
-                        compilerarg(value: value)
-                    }
-                }
-            }
-            numFilesCompiled = task.fileList.length
-        }
-
-        return { numFilesCompiled > 0 } as WorkResult
-    }
-
-    private Map filterNonGroovycOptions(CompileOptions options) {
-        // todo check if groupBy allows a more concise solution
-        Map result = [:]
-        options.optionMap().each {String key, Object value ->
-            if (!nonGroovycJavacOptions.contains(key)) {
-                result[key] = value
-            }
-        }
-        result
-    }
-
-    private VersionNumber sniffGroovyVersion(Iterable<File> classpath) {
-        def classLoader = new URLClassLoader(classpath*.toURI()*.toURL() as URL[], (ClassLoader) null)
-        try {
-            def clazz = classLoader.loadClass("groovy.lang.GroovySystem")
-            return VersionNumber.parse(clazz.getVersion())
-        } catch (ClassNotFoundException ignored) {
-            return VersionNumber.UNKNOWN
-        } catch (LinkageError ignored) {
-            return VersionNumber.UNKNOWN
-        }
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompiler.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompiler.java
index 802cf7bbb879..8cf298007c45 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompiler.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/CleaningJavaCompiler.java
@@ -16,8 +16,8 @@
 package org.gradle.api.internal.tasks.compile;
 
 import org.gradle.api.AntBuilder;
-import org.gradle.internal.Factory;
 import org.gradle.api.internal.TaskOutputsInternal;
+import org.gradle.internal.Factory;
 import org.gradle.language.jvm.internal.SimpleStaleClassCleaner;
 import org.gradle.language.jvm.internal.StaleClassCleaner;
 
@@ -34,7 +34,7 @@ public CleaningJavaCompiler(Compiler<JavaCompileSpec> compiler, Factory<AntBuild
     }
 
     @Override
-    protected Compiler<JavaCompileSpec> getCompiler() {
+    public Compiler<JavaCompileSpec> getCompiler() {
         return compiler;
     }
 
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactory.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactory.java
index a4fb7f2b918b..4e838acb26d0 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactory.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactory.java
@@ -15,14 +15,11 @@
  */
 package org.gradle.api.internal.tasks.compile;
 
-import org.gradle.api.AntBuilder;
 import org.gradle.api.internal.file.DefaultTemporaryFileProvider;
 import org.gradle.api.internal.file.TemporaryFileProvider;
 import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.api.internal.tasks.compile.daemon.CompilerDaemonManager;
 import org.gradle.api.internal.tasks.compile.daemon.DaemonJavaCompiler;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
 import org.gradle.api.tasks.compile.CompileOptions;
 import org.gradle.internal.Factory;
 
@@ -30,17 +27,13 @@
 import java.io.Serializable;
 
 public class DefaultJavaCompilerFactory implements JavaCompilerFactory {
-    private final static Logger LOGGER = Logging.getLogger(DefaultJavaCompilerFactory.class);
-
     private final ProjectInternal project;
-    private final Factory<AntBuilder> antBuilderFactory;
     private final JavaCompilerFactory inProcessCompilerFactory;
     private final CompilerDaemonManager compilerDaemonManager;
     private boolean jointCompilation;
 
-    public DefaultJavaCompilerFactory(ProjectInternal project, Factory<AntBuilder> antBuilderFactory, JavaCompilerFactory inProcessCompilerFactory, CompilerDaemonManager compilerDaemonManager){
+    public DefaultJavaCompilerFactory(ProjectInternal project, JavaCompilerFactory inProcessCompilerFactory, CompilerDaemonManager compilerDaemonManager){
         this.project = project;
-        this.antBuilderFactory = antBuilderFactory;
         this.inProcessCompilerFactory = inProcessCompilerFactory;
         this.compilerDaemonManager = compilerDaemonManager;
     }
@@ -55,12 +48,6 @@ public void setJointCompilation(boolean flag) {
     }
 
     public Compiler<JavaCompileSpec> create(CompileOptions options) {
-        fallBackToAntIfNecessary(options);
-
-        if (options.isUseAnt()) {
-            return new AntJavaCompiler(antBuilderFactory);
-        }
-
         Compiler<JavaCompileSpec> result = createTargetCompiler(options);
         if (!jointCompilation) {
             result = new NormalizingJavaCompiler(result);
@@ -68,15 +55,6 @@ public Compiler<JavaCompileSpec> create(CompileOptions options) {
         return result;
     }
 
-    private void fallBackToAntIfNecessary(CompileOptions options) {
-        if (options.isUseAnt()) { return; }
-
-        if (options.getCompiler() != null) {
-            LOGGER.warn("Falling back to Ant javac task ('CompileOptions.useAnt = true') because 'CompileOptions.compiler' is set.");
-            options.setUseAnt(true);
-        }
-    }
-
     private Compiler<JavaCompileSpec> createTargetCompiler(CompileOptions options) {
         if (options.isFork() && options.getForkOptions().getExecutable() != null) {
             return new CommandLineJavaCompiler(createSerializableTempFileProvider(), project.getProjectDir());
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/GroovyCompilerFactory.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/GroovyCompilerFactory.java
index b4d5e5dd7474..c1f0081c7d70 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/GroovyCompilerFactory.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/GroovyCompilerFactory.java
@@ -16,8 +16,6 @@
 
 package org.gradle.api.internal.tasks.compile;
 
-import org.gradle.api.internal.ClassPathRegistry;
-import org.gradle.api.internal.project.IsolatedAntBuilder;
 import org.gradle.api.internal.project.ProjectInternal;
 import org.gradle.api.internal.tasks.compile.daemon.CompilerDaemonFactory;
 import org.gradle.api.internal.tasks.compile.daemon.CompilerDaemonManager;
@@ -27,23 +25,16 @@
 import org.gradle.api.tasks.compile.GroovyCompileOptions;
 import org.gradle.internal.Factory;
 import org.gradle.util.DeprecationLogger;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class GroovyCompilerFactory {
-    private static final Logger LOGGER = LoggerFactory.getLogger(GroovyCompilerFactory.class);
     private final ProjectInternal project;
-    private final IsolatedAntBuilder antBuilder;
-    private final ClassPathRegistry classPathRegistry;
     private final DefaultJavaCompilerFactory javaCompilerFactory;
     private final CompilerDaemonManager compilerDaemonManager;
     private final InProcessCompilerDaemonFactory inProcessCompilerDaemonFactory;
 
-    public GroovyCompilerFactory(ProjectInternal project, IsolatedAntBuilder antBuilder, ClassPathRegistry classPathRegistry, DefaultJavaCompilerFactory javaCompilerFactory,
-                                 CompilerDaemonManager compilerDaemonManager, InProcessCompilerDaemonFactory inProcessCompilerDaemonFactory) {
+    public GroovyCompilerFactory(ProjectInternal project, DefaultJavaCompilerFactory javaCompilerFactory, CompilerDaemonManager compilerDaemonManager,
+                                 InProcessCompilerDaemonFactory inProcessCompilerDaemonFactory) {
         this.project = project;
-        this.antBuilder = antBuilder;
-        this.classPathRegistry = classPathRegistry;
         this.javaCompilerFactory = javaCompilerFactory;
         this.compilerDaemonManager = compilerDaemonManager;
         this.inProcessCompilerDaemonFactory = inProcessCompilerDaemonFactory;
@@ -52,19 +43,6 @@ public GroovyCompilerFactory(ProjectInternal project, IsolatedAntBuilder antBuil
     Compiler<GroovyJavaJointCompileSpec> create(final GroovyCompileOptions groovyOptions, final CompileOptions javaOptions) {
         return DeprecationLogger.whileDisabled(new Factory<Compiler<GroovyJavaJointCompileSpec>>() {
             public Compiler<GroovyJavaJointCompileSpec> create() {
-                // Some sanity checking of options
-                if (groovyOptions.isUseAnt() && !javaOptions.isUseAnt()) {
-                    LOGGER.warn("When groovyOptions.useAnt is enabled, options.useAnt must also be enabled. Ignoring options.useAnt = false.");
-                    javaOptions.setUseAnt(true);
-                } else if (!groovyOptions.isUseAnt() && javaOptions.isUseAnt()) {
-                    LOGGER.warn("When groovyOptions.useAnt is disabled, options.useAnt must also be disabled. Ignoring options.useAnt = true.");
-                    javaOptions.setUseAnt(false);
-                }
-
-                if (groovyOptions.isUseAnt()) {
-                    return new AntGroovyCompiler(antBuilder, classPathRegistry);
-                }
-
                 javaCompilerFactory.setJointCompilation(true);
                 Compiler<JavaCompileSpec> javaCompiler = javaCompilerFactory.create(javaOptions);
                 Compiler<GroovyJavaJointCompileSpec> groovyCompiler = new ApiGroovyCompiler(javaCompiler);
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/InProcessJavaCompilerFactory.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/InProcessJavaCompilerFactory.java
index b91b6df2bacc..b61422f4b313 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/InProcessJavaCompilerFactory.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/InProcessJavaCompilerFactory.java
@@ -30,7 +30,7 @@ public Compiler<JavaCompileSpec> create(CompileOptions options) {
         if (SUN_COMPILER_AVAILABLE) {
             return new SunCompilerFactory().create();
         }
-        throw new RuntimeException("Cannot find a Java compiler API. Please let us know which JDK/platform you are using. To work around this problem, try 'compileJava.options.useAnt=true'.");
+        throw new RuntimeException("Cannot find a Java compiler API. Please let us know which JDK/platform you are using.");
     }
 
     private Compiler<JavaCompileSpec> createJdk6Compiler() {
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfo.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfo.java
deleted file mode 100644
index 23019d9163a0..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfo.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import org.gradle.api.file.FileTree;
-import org.gradle.api.file.FileVisitDetails;
-import org.gradle.api.file.FileVisitor;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class AllFromJarRebuildInfo extends DefaultRebuildInfo {
-    AllFromJarRebuildInfo(JarArchive jarContents) {
-        super(false, classesInJar(jarContents.contents));
-    }
-
-    private static Set<String> classesInJar(FileTree jarContents) {
-        final Set<String> out = new HashSet<String>();
-        jarContents.visit(new FileVisitor() {
-            public void visitDir(FileVisitDetails dirDetails) {}
-            public void visitFile(FileVisitDetails fileDetails) {
-                out.add(fileDetails.getPath().replaceAll("/", ".").replaceAll("\\.class$", ""));
-            }
-        });
-        return out;
-    }
-}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependencyInfoUpdater.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependencyInfoUpdater.java
new file mode 100644
index 000000000000..0f1a97fcfe23
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependencyInfoUpdater.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental;
+
+import org.gradle.api.file.FileTree;
+import org.gradle.api.internal.file.FileOperations;
+import org.gradle.api.internal.tasks.compile.JavaCompileSpec;
+import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassDependenciesAnalyzer;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfoExtractor;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfoWriter;
+import org.gradle.api.internal.tasks.compile.incremental.recomp.RecompilationNotNecessary;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.api.tasks.WorkResult;
+import org.gradle.util.Clock;
+
+public class ClassDependencyInfoUpdater {
+
+    private final static Logger LOG = Logging.getLogger(ClassDependencyInfoUpdater.class);
+
+    private final ClassDependencyInfoWriter writer;
+    private final FileOperations fileOperations;
+    private ClassDependenciesAnalyzer analyzer;
+
+    public ClassDependencyInfoUpdater(ClassDependencyInfoWriter writer, FileOperations fileOperations, ClassDependenciesAnalyzer analyzer) {
+        this.writer = writer;
+        this.fileOperations = fileOperations;
+        this.analyzer = analyzer;
+    }
+
+    public void updateInfo(JavaCompileSpec spec, WorkResult compilationResult) {
+        if (compilationResult instanceof RecompilationNotNecessary) {
+            //performance tweak, update not necessary
+            return;
+        }
+
+        Clock clock = new Clock();
+        FileTree tree = fileOperations.fileTree(spec.getDestinationDir());
+        ClassDependencyInfoExtractor extractor = new ClassDependencyInfoExtractor(analyzer);
+        tree.visit(extractor);
+        ClassDependencyInfo info = extractor.getDependencyInfo();
+        writer.writeInfo(info);
+        LOG.lifecycle("Performed class dependency analysis in {}, wrote results into {}", clock.getTime(), writer);
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependents.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependents.java
deleted file mode 100644
index 6041b2dc40e2..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependents.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import java.io.Serializable;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-public class ClassDependents implements Serializable {
-
-    private final Set<String> dependentClasses = new LinkedHashSet<String>();
-    private boolean dependentToAll;
-
-    public Set<String> getDependentClasses() {
-        return dependentClasses;
-    }
-
-    public boolean isDependentToAll() {
-        return dependentToAll;
-    }
-
-    public ClassDependents addClass(String className) {
-        dependentClasses.add(className);
-        return this;
-    }
-
-    public void setDependentToAll() {
-        dependentToAll = true;
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/CompilationSourceDirs.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/CompilationSourceDirs.java
new file mode 100644
index 000000000000..d6d58c084d46
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/CompilationSourceDirs.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental;
+
+import org.gradle.api.file.SourceDirectorySet;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+
+public class CompilationSourceDirs {
+
+    private List<Object> source;
+
+    public CompilationSourceDirs(List<Object> source) {
+        this.source = source;
+    }
+
+    List<File> getSourceDirs() {
+        List<File> sourceDirs = new LinkedList<File>();
+        for (Object s : source) {
+            if (s instanceof SourceDirectorySet) {
+                sourceDirs.addAll(((SourceDirectorySet) s).getSrcDirs());
+            } else {
+                throw new UnsupportedOperationException();
+            }
+        }
+        return sourceDirs;
+    }
+
+    public boolean areSourceDirsKnown() {
+        for (Object s : source) {
+            if (!(s instanceof SourceDirectorySet)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/DefaultRebuildInfo.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/DefaultRebuildInfo.java
deleted file mode 100644
index c3c1841f0831..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/DefaultRebuildInfo.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfo;
-import org.gradle.api.tasks.util.PatternSet;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
-
-class DefaultRebuildInfo implements RebuildInfo {
-
-    static final RebuildInfo NOTHING_TO_REBUILD = new DefaultRebuildInfo(false, Collections.<String>emptyList());
-    static final RebuildInfo FULL_REBUILD = new DefaultRebuildInfo(true, Collections.<String>emptyList());
-
-    private boolean fullRebuildRequired;
-    protected final Collection<String> changedClassesInJar;
-
-    DefaultRebuildInfo(boolean fullRebuildRequired, Collection<String> changedClassesInJar) {
-        this.fullRebuildRequired = fullRebuildRequired;
-        this.changedClassesInJar = changedClassesInJar;
-    }
-
-    public boolean isFullRebuildRequired() {
-        return fullRebuildRequired;
-    }
-
-    //TODO SF tests
-    public void configureCompilation(PatternSet changedSourceOnly, SelectiveJavaCompiler compiler, ClassDependencyInfo dependencyInfo) {
-        for (String c : changedClassesInJar) {
-            Set<String> actualDependents = dependencyInfo.getActualDependents(c);
-            for (String d : actualDependents) {
-                compiler.addStaleClass(d);
-                changedSourceOnly.include(d.replaceAll("\\.", "/").concat(".java"));
-            }
-        }
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationFinalizer.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationFinalizer.java
new file mode 100644
index 000000000000..5e5cf4ad0479
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationFinalizer.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental;
+
+import org.gradle.api.internal.tasks.compile.Compiler;
+import org.gradle.api.internal.tasks.compile.JavaCompileSpec;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarSnapshotsMaker;
+import org.gradle.api.tasks.WorkResult;
+
+class IncrementalCompilationFinalizer implements Compiler<JavaCompileSpec> {
+
+    private final Compiler<JavaCompileSpec> delegate;
+    private final JarSnapshotsMaker jarSnapshotsMaker;
+    private final ClassDependencyInfoUpdater dependencyInfoUpdater;
+
+    public IncrementalCompilationFinalizer(Compiler<JavaCompileSpec> delegate, JarSnapshotsMaker jarSnapshotsMaker,
+                                           ClassDependencyInfoUpdater dependencyInfoUpdater) {
+        this.delegate = delegate;
+        this.jarSnapshotsMaker = jarSnapshotsMaker;
+        this.dependencyInfoUpdater = dependencyInfoUpdater;
+    }
+
+    public WorkResult execute(JavaCompileSpec spec) {
+        WorkResult out = delegate.execute(spec);
+
+        dependencyInfoUpdater.updateInfo(spec, out);
+        jarSnapshotsMaker.storeJarSnapshots(spec.getClasspath());
+
+        return out;
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationInitializer.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationInitializer.java
new file mode 100644
index 000000000000..b2eada7bcc10
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationInitializer.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental;
+
+import com.google.common.collect.Iterables;
+import org.gradle.api.file.FileTree;
+import org.gradle.api.internal.file.FileOperations;
+import org.gradle.api.internal.file.collections.SimpleFileCollection;
+import org.gradle.api.internal.tasks.compile.JavaCompileSpec;
+import org.gradle.api.tasks.util.PatternSet;
+
+import java.util.Collection;
+
+import static java.util.Arrays.asList;
+
+class IncrementalCompilationInitializer {
+    private final FileOperations fileOperations;
+
+    public IncrementalCompilationInitializer(FileOperations fileOperations) {
+        this.fileOperations = fileOperations;
+    }
+
+    public void initializeCompilation(JavaCompileSpec spec, Collection<String> staleClasses) {
+        if (staleClasses.isEmpty()) {
+            spec.setSource(new SimpleFileCollection());
+            return; //do nothing. No classes need recompilation.
+        }
+
+        PatternSet classesToDelete = new PatternSet();
+        PatternSet sourceToCompile = new PatternSet();
+
+        preparePatterns(staleClasses, classesToDelete, sourceToCompile);
+
+        //selectively configure the source
+        spec.setSource(spec.getSource().getAsFileTree().matching(sourceToCompile));
+        //since we're compiling selectively we need to include the classes compiled previously
+        spec.setClasspath(Iterables.concat(spec.getClasspath(), asList(spec.getDestinationDir())));
+        //get rid of stale files
+        FileTree deleteMe = fileOperations.fileTree(spec.getDestinationDir()).matching(classesToDelete);
+        fileOperations.delete(deleteMe);
+    }
+
+    void preparePatterns(Collection<String> staleClasses, PatternSet classesToDelete, PatternSet sourceToCompile) {
+        assert !staleClasses.isEmpty(); //if stale classes are empty (e.g. nothing to recompile), the patterns will not have any includes and will match all (e.g. recompile everything).
+        for (String staleClass : staleClasses) {
+            String path = staleClass.replaceAll("\\.", "/");
+            classesToDelete.include(path.concat(".class"));
+            classesToDelete.include(path.concat("$*.class"));
+
+            //the stale class might be a source class that was deleted
+            //it's no harm to include it in sourceToCompile anyway
+            sourceToCompile.include(path.concat(".java"));
+        }
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupport.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupport.java
index 52c90cfbd247..2078d40a22de 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupport.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupport.java
@@ -16,36 +16,61 @@
 
 package org.gradle.api.internal.tasks.compile.incremental;
 
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfo;
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfoExtractor;
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfoSerializer;
+import org.gradle.api.internal.file.FileOperations;
+import org.gradle.api.internal.tasks.compile.CleaningJavaCompiler;
+import org.gradle.api.internal.tasks.compile.Compiler;
+import org.gradle.api.internal.tasks.compile.JavaCompileSpec;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfoSerializer;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarSnapshotsMaker;
+import org.gradle.api.internal.tasks.compile.incremental.recomp.RecompilationSpecProvider;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
-import org.gradle.api.tasks.compile.CompileOptions;
-import org.gradle.util.Clock;
+import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
 
 public class IncrementalCompilationSupport {
 
     private static final Logger LOG = Logging.getLogger(IncrementalCompilationSupport.class);
-    private JarSnapshotFeeder jarSnapshotFeeder;
+    private final JarSnapshotsMaker jarSnapshotsMaker;
+    private final ClassDependencyInfoSerializer dependencyInfoSerializer;
+    private final FileOperations fileOperations;
+    private final CleaningJavaCompiler cleaningCompiler;
+    private final String displayName;
+    private final RecompilationSpecProvider staleClassDetecter;
+    private final ClassDependencyInfoUpdater classDependencyInfoUpdater;
+    private final CompilationSourceDirs sourceDirs;
 
-    public IncrementalCompilationSupport(JarSnapshotFeeder jarSnapshotFeeder) {
-        this.jarSnapshotFeeder = jarSnapshotFeeder;
+    public IncrementalCompilationSupport(JarSnapshotsMaker jarSnapshotsMaker, ClassDependencyInfoSerializer dependencyInfoSerializer,
+                                         FileOperations fileOperations, CleaningJavaCompiler cleaningCompiler, String displayName,
+                                         RecompilationSpecProvider staleClassDetecter, ClassDependencyInfoUpdater classDependencyInfoUpdater,
+                                         CompilationSourceDirs sourceDirs) {
+        this.jarSnapshotsMaker = jarSnapshotsMaker;
+        this.dependencyInfoSerializer = dependencyInfoSerializer;
+        this.fileOperations = fileOperations;
+        this.cleaningCompiler = cleaningCompiler;
+        this.displayName = displayName;
+        this.staleClassDetecter = staleClassDetecter;
+        this.classDependencyInfoUpdater = classDependencyInfoUpdater;
+        this.sourceDirs = sourceDirs;
     }
 
-    public void compilationComplete(CompileOptions options,
-                                    ClassDependencyInfoExtractor extractor,
-                                    ClassDependencyInfoSerializer serializer,
-                                    Iterable<JarArchive> jarsOnClasspath) {
-        if (options.isIncremental()) {
-            Clock clock = new Clock();
-            ClassDependencyInfo info = extractor.extractInfo("");
-            serializer.writeInfo(info);
-            LOG.lifecycle("Performed class dependency analysis in {}, wrote results into {}", clock.getTime(), serializer);
+    public Compiler<JavaCompileSpec> prepareCompiler(final IncrementalTaskInputs inputs) {
+        final Compiler<JavaCompileSpec> compiler = getCompiler(inputs, sourceDirs);
+        return new IncrementalCompilationFinalizer(compiler, jarSnapshotsMaker, classDependencyInfoUpdater);
+    }
 
-//            clock = new Clock();
-//            jarSnapshotFeeder.storeJarSnapshots(jarsOnClasspath);
-//            LOG.lifecycle("Wrote jar snapshots in {}.", clock.getTime());
+    private Compiler<JavaCompileSpec> getCompiler(IncrementalTaskInputs inputs, CompilationSourceDirs sourceDirs) {
+        if (!inputs.isIncremental()) {
+            LOG.lifecycle("{} - is not incremental (e.g. outputs have changed, no previous execution, etc)", displayName);
+            return cleaningCompiler;
+        }
+        if (!sourceDirs.areSourceDirsKnown()) {
+            LOG.lifecycle("{} - is not incremental. Unable to infer the source directories.", displayName);
+            return cleaningCompiler;
+        }
+        if (!dependencyInfoSerializer.isInfoAvailable()) {
+            LOG.lifecycle("{} - is not incremental. No class dependency data available from previous build.", displayName);
+            return cleaningCompiler;
         }
+        return new SelectiveCompiler(inputs, cleaningCompiler, staleClassDetecter, new IncrementalCompilationInitializer(fileOperations));
     }
 }
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalJavaCompilerFactory.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalJavaCompilerFactory.java
new file mode 100644
index 000000000000..43e31106120d
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalJavaCompilerFactory.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental;
+
+import org.gradle.api.Project;
+import org.gradle.api.internal.file.FileOperations;
+import org.gradle.api.internal.hash.DefaultHasher;
+import org.gradle.api.internal.tasks.compile.CleaningJavaCompiler;
+import org.gradle.api.internal.tasks.compile.Compiler;
+import org.gradle.api.internal.tasks.compile.JavaCompileSpec;
+import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassDependenciesAnalyzer;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfoSerializer;
+import org.gradle.api.internal.tasks.compile.incremental.jar.ClasspathJarFinder;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarSnapshotsMaker;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarSnapshotter;
+import org.gradle.api.internal.tasks.compile.incremental.jar.LocalJarSnapshotCache;
+import org.gradle.api.internal.tasks.compile.incremental.recomp.RecompilationSpecProvider;
+import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
+
+import java.io.File;
+import java.util.List;
+
+public class IncrementalJavaCompilerFactory {
+
+    private final IncrementalCompilationSupport incrementalSupport;
+
+    public IncrementalJavaCompilerFactory(Project project, String compileTaskPath, CleaningJavaCompiler cleaningJavaCompiler, List<Object> source) {
+        //bunch of services that enable incremental java compilation.
+        ClassDependenciesAnalyzer analyzer = new ClassDependenciesAnalyzer(); //TODO needs cross-project caching
+        JarSnapshotter jarSnapshotter = new JarSnapshotter(new DefaultHasher(), analyzer); //TODO needs cross-project caching
+
+        String cacheFileBaseName = compileTaskPath.replaceAll(":", "_"); //TODO SF weak. task can be renamed in place of a task that was deleted.
+        LocalJarSnapshotCache jarSnapshotCache = new LocalJarSnapshotCache(new File(project.getBuildDir(), cacheFileBaseName + "-jar-snapshot-cache.bin"));
+        ClassDependencyInfoSerializer dependencyInfoSerializer = new ClassDependencyInfoSerializer(new File(project.getBuildDir(), cacheFileBaseName + "-class-info.bin"));
+
+        JarSnapshotsMaker jarSnapshotsMaker = new JarSnapshotsMaker(jarSnapshotCache, jarSnapshotter, new ClasspathJarFinder((FileOperations) project));
+        CompilationSourceDirs sourceDirs = new CompilationSourceDirs(source);
+        SourceToNameConverter sourceToNameConverter = new SourceToNameConverter(sourceDirs); //TODO replace with converter that parses input source class
+        RecompilationSpecProvider recompilationSpecProvider = new RecompilationSpecProvider(sourceToNameConverter, dependencyInfoSerializer, (FileOperations) project, jarSnapshotter, jarSnapshotCache);
+        ClassDependencyInfoUpdater classDependencyInfoUpdater = new ClassDependencyInfoUpdater(dependencyInfoSerializer, (FileOperations) project, analyzer);
+        incrementalSupport = new IncrementalCompilationSupport(jarSnapshotsMaker, dependencyInfoSerializer, (FileOperations) project,
+                cleaningJavaCompiler, compileTaskPath, recompilationSpecProvider, classDependencyInfoUpdater, sourceDirs);
+    }
+
+    public Compiler<JavaCompileSpec> createCompiler(IncrementalTaskInputs inputs) {
+        return incrementalSupport.prepareCompiler(inputs);
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarChangeProcessor.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarChangeProcessor.java
deleted file mode 100644
index 28523c01573e..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarChangeProcessor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import org.gradle.api.tasks.incremental.InputFileDetails;
-
-public class JarChangeProcessor {
-
-    private JarSnapshotFeeder jarSnapshotFeeder;
-
-    public JarChangeProcessor(JarSnapshotFeeder jarSnapshotFeeder) {
-        this.jarSnapshotFeeder = jarSnapshotFeeder;
-    }
-
-    //TODO SF coverage
-    public RebuildInfo processJarChange(InputFileDetails jarChangeDetails, JarArchive jarArchive) {
-        JarSnapshot existing = jarSnapshotFeeder.changedJar(jarChangeDetails.getFile());
-        if (jarChangeDetails.isAdded()) {
-            return DefaultRebuildInfo.NOTHING_TO_REBUILD;
-        }
-
-        if (jarChangeDetails.isRemoved()) {
-            if (existing != null) {
-                return new AllFromJarRebuildInfo(jarArchive);
-            } else {
-                return DefaultRebuildInfo.FULL_REBUILD;
-            }
-        }
-
-        if (jarChangeDetails.isModified()) {
-            if (existing != null) {
-                JarSnapshot newSnapshot = jarSnapshotFeeder.createSnapshot(jarArchive);
-                JarDelta jarDelta = existing.compareToSnapshot(newSnapshot);
-                return new SpecificClassesRebuildInfo(jarDelta);
-            } else {
-                return new AllFromJarRebuildInfo(jarArchive);
-            }
-        }
-
-        throw new IllegalArgumentException("Unknown input file details provided: " + jarChangeDetails);
-    }
-}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshot.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshot.java
deleted file mode 100644
index a110c19e33ec..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshot.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import java.io.Serializable;
-import java.util.*;
-
-class JarSnapshot implements Serializable {
-
-    final Map<String, byte[]> classHashes;
-
-    JarSnapshot(Map<String, byte[]> classHashes) {
-        this.classHashes = classHashes;
-    }
-
-    JarDelta compareToSnapshot(JarSnapshot other) {
-        final List<String> changedClasses = new LinkedList<String>();
-        for (String thisCls : classHashes.keySet()) {
-            byte[] hash = other.classHashes.get(thisCls);
-            if (hash == null || !Arrays.equals(hash, classHashes.get(thisCls))) {
-                changedClasses.add(thisCls);
-            }
-        }
-        return new JarDelta() {
-            public Collection<String> getChangedClasses() {
-                return changedClasses;
-            }
-        };
-    }
-}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotter.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotter.java
deleted file mode 100644
index 5f94967b3d57..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2014 the original author or authors.
- *
- * 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.
- */
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import org.gradle.api.file.FileTree;
-import org.gradle.api.file.FileVisitDetails;
-import org.gradle.api.file.FileVisitor;
-import org.gradle.api.internal.hash.Hasher;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class JarSnapshotter {
-
-    private final Hasher hasher;
-
-    public JarSnapshotter(Hasher hasher) {
-        this.hasher = hasher;
-    }
-
-    JarSnapshot createSnapshot(FileTree archivedClasses) {
-        final Map<String, byte[]> hashes = new HashMap<String, byte[]>();
-        archivedClasses.visit(new FileVisitor() {
-            public void visitDir(FileVisitDetails dirDetails) {
-            }
-
-            public void visitFile(FileVisitDetails fileDetails) {
-                hashes.put(fileDetails.getPath().replaceAll("/", ".").replaceAll("\\.class$", ""), hasher.hash(fileDetails.getFile()));
-            }
-        });
-        return new JarSnapshot(hashes);
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClass.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClass.java
deleted file mode 100644
index 0339ff3356ed..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClass.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import java.io.File;
-
-public class JavaSourceClass {
-    private final String relativePath;
-    private final File compileDestination;
-
-    public JavaSourceClass(String relativePath, File compileDestination) {
-        this.relativePath = relativePath;
-        this.compileDestination = compileDestination;
-    }
-
-    public String getRelativePath() {
-        return relativePath;
-    }
-
-    public String getClassName() {
-        return relativePath.replaceAll("/", ".").replaceAll("\\.java$", "");
-    }
-
-    public File getOutputFile() {
-        return new File(compileDestination, relativePath.replaceAll("\\.java$", ".class"));
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/RebuildInfo.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/RebuildInfo.java
deleted file mode 100644
index 72458be3e59f..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/RebuildInfo.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfo;
-import org.gradle.api.tasks.util.PatternSet;
-
-interface RebuildInfo {
-    boolean isFullRebuildRequired();
-    void configureCompilation(PatternSet changedSourceOnly, SelectiveJavaCompiler compiler, ClassDependencyInfo dependencyInfo);
-}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompilation.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompilation.java
deleted file mode 100644
index b2716e6c9cce..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompilation.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import org.gradle.api.Action;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.file.FileTree;
-import org.gradle.api.internal.file.FileOperations;
-import org.gradle.api.internal.file.collections.SimpleFileCollection;
-import org.gradle.api.internal.hash.DefaultHasher;
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfo;
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfoSerializer;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
-import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
-import org.gradle.api.tasks.incremental.InputFileDetails;
-import org.gradle.api.tasks.util.PatternSet;
-import org.gradle.util.Clock;
-
-import java.io.File;
-import java.util.Set;
-
-public class SelectiveCompilation {
-    private final FileCollection source;
-    private final FileCollection classpath;
-    private final JarSnapshotFeeder jarSnapshotFeeder;
-    private SelectiveJavaCompiler compiler;
-    private static final Logger LOG = Logging.getLogger(SelectiveCompilation.class);
-    private String fullRebuildNeeded;
-    private boolean compilationNeeded = true;
-    private final FileOperations operations;
-
-    public SelectiveCompilation(IncrementalTaskInputs inputs, FileTree source, FileCollection compileClasspath, final File compileDestination,
-                                final ClassDependencyInfoSerializer dependencyInfoSerializer, final JarSnapshotCache jarSnapshotCache, final SelectiveJavaCompiler compiler,
-                                Iterable<File> sourceDirs, final FileOperations operations) {
-        this.operations = operations;
-        this.jarSnapshotFeeder = new JarSnapshotFeeder(jarSnapshotCache, new JarSnapshotter(new DefaultHasher()));
-        this.compiler = compiler;
-
-        Clock clock = new Clock();
-        final InputOutputMapper mapper = new InputOutputMapper(sourceDirs, compileDestination);
-
-        //load dependency info
-        final ClassDependencyInfo dependencyInfo = dependencyInfoSerializer.readInfo();
-
-        //including only source java classes that were changed
-        final PatternSet changedSourceOnly = new PatternSet();
-        InputFileDetailsAction action = new InputFileDetailsAction(mapper, compiler, changedSourceOnly, dependencyInfo);
-        inputs.outOfDate(action);
-        inputs.removed(action);
-        if (fullRebuildNeeded != null) {
-            LOG.lifecycle("Stale classes detection completed in {}. Rebuild needed: {}.", clock.getTime(), fullRebuildNeeded);
-            this.classpath = compileClasspath;
-            this.source = source;
-            return;
-        }
-
-        compiler.deleteStaleClasses();
-        Set<File> filesToCompile = source.matching(changedSourceOnly).getFiles();
-        if (filesToCompile.isEmpty()) {
-            this.compilationNeeded = false;
-            this.classpath = compileClasspath;
-            this.source = source;
-        } else {
-            this.classpath = compileClasspath.plus(new SimpleFileCollection(compileDestination));
-            this.source = source.matching(changedSourceOnly);
-        }
-        LOG.lifecycle("Stale classes detection completed in {}. Compile include patterns: {}.", clock.getTime(), changedSourceOnly.getIncludes());
-    }
-
-    public FileCollection getSource() {
-        return source;
-    }
-
-    public FileCollection getClasspath() {
-        return classpath;
-    }
-
-    public boolean getCompilationNeeded() {
-        return compilationNeeded;
-    }
-
-    public boolean getFullRebuildRequired() {
-        return fullRebuildNeeded != null;
-    }
-
-    private class InputFileDetailsAction implements Action<InputFileDetails> {
-        private final InputOutputMapper mapper;
-        private final SelectiveJavaCompiler compiler;
-        private final PatternSet changedSourceOnly;
-        private final ClassDependencyInfo dependencyInfo;
-
-        public InputFileDetailsAction(InputOutputMapper mapper, SelectiveJavaCompiler compiler, PatternSet changedSourceOnly, ClassDependencyInfo dependencyInfo) {
-            this.mapper = mapper;
-            this.compiler = compiler;
-            this.changedSourceOnly = changedSourceOnly;
-            this.dependencyInfo = dependencyInfo;
-        }
-
-        public void execute(InputFileDetails inputFileDetails) {
-            if (fullRebuildNeeded != null) {
-                return;
-            }
-            File inputFile = inputFileDetails.getFile();
-            String name = inputFile.getName();
-            if (name.endsWith(".java")) {
-                JavaSourceClass source = mapper.toJavaSourceClass(inputFile);
-                compiler.addStaleClass(source);
-                changedSourceOnly.include(source.getRelativePath());
-                Set<String> actualDependents = dependencyInfo.getActualDependents(source.getClassName());
-                if (actualDependents == null) {
-                    fullRebuildNeeded = "change to " + source.getClassName() + " requires full rebuild";
-                    return;
-                }
-                for (String d : actualDependents) {
-                    JavaSourceClass dSource = mapper.toJavaSourceClass(d);
-                    compiler.addStaleClass(dSource);
-                    changedSourceOnly.include(dSource.getRelativePath());
-                }
-            }
-            if (name.endsWith(".jar")) {
-                fullRebuildNeeded = "change to " + inputFile + " requires full rebuild";
-                return;
-            }
-        }
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompiler.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompiler.java
new file mode 100644
index 000000000000..c8ecff2349cb
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveCompiler.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental;
+
+import org.gradle.api.internal.tasks.compile.CleaningJavaCompiler;
+import org.gradle.api.internal.tasks.compile.JavaCompileSpec;
+import org.gradle.api.internal.tasks.compile.incremental.recomp.RecompilationNotNecessary;
+import org.gradle.api.internal.tasks.compile.incremental.recomp.RecompilationSpec;
+import org.gradle.api.internal.tasks.compile.incremental.recomp.RecompilationSpecProvider;
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.api.tasks.WorkResult;
+import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
+import org.gradle.util.Clock;
+
+class SelectiveCompiler implements org.gradle.api.internal.tasks.compile.Compiler<JavaCompileSpec> {
+    private static final Logger LOG = Logging.getLogger(SelectiveCompiler.class);
+    private final IncrementalTaskInputs inputs;
+    private final CleaningJavaCompiler cleaningCompiler;
+    private final RecompilationSpecProvider recompilationSpecProvider;
+    private final IncrementalCompilationInitializer incrementalCompilationInitilizer;
+
+    public SelectiveCompiler(IncrementalTaskInputs inputs, CleaningJavaCompiler cleaningCompiler,
+                             RecompilationSpecProvider recompilationSpecProvider, IncrementalCompilationInitializer compilationInitializer) {
+        this.inputs = inputs;
+        this.cleaningCompiler = cleaningCompiler;
+        this.recompilationSpecProvider = recompilationSpecProvider;
+        incrementalCompilationInitilizer = compilationInitializer;
+    }
+
+    public WorkResult execute(JavaCompileSpec spec) {
+        Clock clock = new Clock();
+        RecompilationSpec recompilationSpec = recompilationSpecProvider.provideRecompilationSpec(inputs);
+
+        if (recompilationSpec.isFullRebuildNeeded()) {
+            LOG.lifecycle("Detection of classes for compilation took {}. Full rebuild is needed due to a change to: {}.", clock.getTime(), recompilationSpec.getFullRebuildCause());
+            return cleaningCompiler.execute(spec);
+        }
+
+        incrementalCompilationInitilizer.initializeCompilation(spec, recompilationSpec.getClassNames());
+        if (spec.getSource().isEmpty()) {
+            LOG.lifecycle("Detection of classes for compilation took {}. No recompilation is needed!", clock.getTime());
+            return new RecompilationNotNecessary();
+        }
+
+        try {
+            //use the original compiler to avoid cleaning up all the files
+            return cleaningCompiler.getCompiler().execute(spec);
+        } finally {
+            LOG.lifecycle("Detection of {} classes for compilation and the compilation took {}.", recompilationSpec.getClassNames().size(), clock.getTime());
+        }
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveJavaCompiler.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveJavaCompiler.java
deleted file mode 100644
index cdc99590f515..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SelectiveJavaCompiler.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental;
-
-import org.gradle.api.file.FileTree;
-import org.gradle.api.internal.tasks.compile.Compiler;
-import org.gradle.api.internal.tasks.compile.JavaCompileSpec;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
-import org.gradle.api.tasks.WorkResult;
-import org.gradle.api.tasks.util.PatternSet;
-import org.gradle.util.Clock;
-
-import java.io.File;
-import java.util.Set;
-
-public class SelectiveJavaCompiler implements Compiler<JavaCompileSpec> {
-    private Compiler<JavaCompileSpec> compiler;
-    private final FileTree destinationDir;
-    private final PatternSet staleClasses = new PatternSet();
-    private final static Logger LOG = Logging.getLogger(SelectiveJavaCompiler.class);
-
-    public SelectiveJavaCompiler(Compiler<JavaCompileSpec> compiler, FileTree destinationDir) {
-        this.compiler = compiler;
-        this.destinationDir = destinationDir;
-    }
-
-    public WorkResult execute(JavaCompileSpec spec) {
-        return compiler.execute(spec);
-    }
-
-    void deleteStaleClasses() {
-        Clock clock = new Clock();
-        Set<File> files = destinationDir.matching(staleClasses).getFiles();
-        for (File file : files) {
-            file.delete();
-        }
-        LOG.lifecycle("Deleting {} stale classes took {}", files.size(), clock.getTime());
-    }
-
-    public void addStaleClass(JavaSourceClass source) {
-        addStaleClass(source.getClassName());
-    }
-
-    public void addStaleClass(String className) {
-        String path = className.replaceAll("\\.", "/");
-        String cls = path.concat(".class");
-        String inner = path.concat("$*.class");
-        staleClasses.include(cls);
-        staleClasses.include(inner);
-    }
-}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapper.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SourceToNameConverter.java
similarity index 54%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapper.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SourceToNameConverter.java
index d60ed46076b6..3ca513175ce1 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapper.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/SourceToNameConverter.java
@@ -19,42 +19,30 @@
 import org.gradle.util.GFileUtils;
 
 import java.io.File;
+import java.util.List;
 
 import static java.lang.String.format;
 
-public class InputOutputMapper {
+public class SourceToNameConverter {
 
-    private Iterable<File> sourceDirs;
-    private File compileDestination;
+    private CompilationSourceDirs sourceDirs;
 
-    public InputOutputMapper(Iterable<File> sourceDirs, File compileDestination) {
+    public SourceToNameConverter(CompilationSourceDirs sourceDirs) {
         this.sourceDirs = sourceDirs;
-        this.compileDestination = compileDestination;
     }
 
-    public JavaSourceClass toJavaSourceClass(File javaSourceClass) {
-        for (File sourceDir : sourceDirs) {
+    public String getClassName(File javaSourceClass) {
+        List<File> dirs = sourceDirs.getSourceDirs();
+        for (File sourceDir : dirs) {
             if (javaSourceClass.getAbsolutePath().startsWith(sourceDir.getAbsolutePath())) { //perf tweak only
                 String relativePath = GFileUtils.relativePath(sourceDir, javaSourceClass);
                 if (!relativePath.startsWith("..")) {
-                    return new JavaSourceClass(relativePath, compileDestination);
+                    return relativePath.replaceAll("/", ".").replaceAll("\\.java$", "");
                 }
             }
         }
         throw new IllegalArgumentException(format("Unable to find source java class: '%s' because it does not belong to any of the source dirs: '%s'",
-                javaSourceClass, sourceDirs));
+                javaSourceClass, dirs));
 
     }
-
-    public JavaSourceClass toJavaSourceClass(String className) {
-        String relativePath = className.replaceAll("\\.", "/").concat(".java");
-        for (File sourceDir : sourceDirs) {
-            File sourceFile = new File(sourceDir, relativePath);
-            if (sourceFile.isFile()) {
-                return new JavaSourceClass(relativePath, compileDestination);
-            }
-        }
-        throw new IllegalArgumentException(format("Unable to find source java class for '%s'. The source file '%s' was not found in source dirs: '%s'",
-                className, relativePath, sourceDirs));
-    }
 }
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysis.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysis.java
index ac2fd2db8624..a6122a736c1e 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysis.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassAnalysis.java
@@ -20,18 +20,18 @@
 
 public class ClassAnalysis {
     private final List<String> classDependencies;
-    private boolean dependentToAll;
+    private final boolean dependencyToAll;
 
-    public ClassAnalysis(List<String> classDependencies, boolean dependentToAll) {
+    public ClassAnalysis(List<String> classDependencies, boolean dependencyToAll) {
         this.classDependencies = classDependencies;
-        this.dependentToAll = dependentToAll;
+        this.dependencyToAll = dependencyToAll;
     }
 
     public List<String> getClassDependencies() {
         return classDependencies;
     }
 
-    public boolean isDependentToAll() {
-        return dependentToAll;
+    public boolean isDependencyToAll() {
+        return dependencyToAll;
     }
 }
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesVisitor.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesVisitor.java
index 274c24361fc7..29b28bcb26cc 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesVisitor.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesVisitor.java
@@ -20,7 +20,7 @@
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.Opcodes;
 
-public class ClassDependenciesVisitor extends ClassVisitor {
+class ClassDependenciesVisitor extends ClassVisitor {
 
     private final static int API = Opcodes.ASM4;
     boolean dependentToAll;
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassRelevancyFilter.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassRelevancyFilter.java
index e163c2bdbdc1..ea19ca8bbce6 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassRelevancyFilter.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassRelevancyFilter.java
@@ -16,7 +16,7 @@
 
 package org.gradle.api.internal.tasks.compile.incremental.analyzer;
 
-public class ClassRelevancyFilter {
+class ClassRelevancyFilter {
 
     private String excludedClassName;
 
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfo.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfo.java
new file mode 100644
index 000000000000..7129e7376b5b
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfo.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps;
+
+import java.io.Serializable;
+import java.util.*;
+
+public class ClassDependencyInfo implements Serializable {
+
+    private final Map<String, ? extends DependentsSet> dependents;
+
+    public ClassDependencyInfo(Map<String, ? extends DependentsSet> dependents) {
+        this.dependents = dependents;
+    }
+
+    public DependentsSet getRelevantDependents(Iterable<String> classes) {
+        List<String> result = new LinkedList<String>();
+        for (String cls : classes) {
+            DependentsSet d = getRelevantDependents(cls);
+            if (d.isDependencyToAll()) {
+                return d;
+            }
+            result.addAll(d.getDependentClasses());
+        }
+        return new DefaultDependentsSet(result);
+    }
+
+    public DependentsSet getRelevantDependents(String className) {
+        DependentsSet deps = dependents.get(className);
+        if (deps == null) {
+            return new DefaultDependentsSet();
+        }
+        if (deps.isDependencyToAll()) {
+            return new DependencyToAll();
+        }
+        Set<String> result = new HashSet<String>();
+        recurseDependents(new HashSet<String>(), result, deps.getDependentClasses());
+        result.remove(className);
+        return new DefaultDependentsSet(result);
+    }
+
+    private void recurseDependents(Set<String> visited, Set<String> result, Set<String> dependentClasses) {
+        for (String d : dependentClasses) {
+            if (!visited.add(d)) {
+                continue;
+            }
+            if (!d.contains("$")) { //filter out the inner classes
+                result.add(d);
+            }
+            DependentsSet currentDependents = dependents.get(d);
+            recurseDependents(visited, result, currentDependents.getDependentClasses());
+        }
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoExtractor.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoExtractor.java
new file mode 100644
index 000000000000..810818321c53
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoExtractor.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps;
+
+import org.gradle.api.file.FileVisitDetails;
+import org.gradle.api.file.FileVisitor;
+import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassAnalysis;
+import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassDependenciesAnalyzer;
+
+import java.io.File;
+import java.io.IOException;
+
+public class ClassDependencyInfoExtractor implements FileVisitor {
+
+    private final ClassDependenciesAnalyzer analyzer;
+    private final String packagePrefix;
+    private final ClassDependentsAccumulator accumulator;
+
+    public ClassDependencyInfoExtractor(ClassDependenciesAnalyzer analyzer) {
+        this(analyzer, "");
+    }
+
+    ClassDependencyInfoExtractor(ClassDependenciesAnalyzer analyzer, String packagePrefix) {
+        this.analyzer = analyzer;
+        this.packagePrefix = packagePrefix;
+        accumulator = new ClassDependentsAccumulator(packagePrefix);
+    }
+
+    public void visitDir(FileVisitDetails dirDetails) {}
+
+    public void visitFile(FileVisitDetails fileDetails) {
+        File file = fileDetails.getFile();
+        if (!file.getName().endsWith(".class")) {
+            return;
+        }
+        String className = fileDetails.getPath().replaceAll("/", ".").replaceAll("\\.class$", "");
+        if (!className.startsWith(packagePrefix)) {
+            return;
+        }
+
+        try {
+            ClassAnalysis analysis = analyzer.getClassAnalysis(className, file);
+            accumulator.addClass(className, analysis.isDependencyToAll(), analysis.getClassDependencies());
+        } catch (IOException e) {
+            throw new RuntimeException("Problems extracting class dependency from " + file, e);
+        }
+    }
+
+    public ClassDependencyInfo getDependencyInfo() {
+        return new ClassDependencyInfo(accumulator.getDependentsMap());
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoProvider.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoProvider.java
new file mode 100644
index 000000000000..3bc824025cfa
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoProvider.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps;
+
+public interface ClassDependencyInfoProvider {
+    ClassDependencyInfo provideInfo();
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializer.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoSerializer.java
similarity index 80%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializer.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoSerializer.java
index cde3b1eef999..861ea4e726e2 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializer.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoSerializer.java
@@ -14,25 +14,27 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.graph;
+package org.gradle.api.internal.tasks.compile.incremental.deps;
 
 import org.gradle.api.internal.tasks.compile.incremental.DummySerializer;
 
 import java.io.File;
 
-public class ClassDependencyInfoSerializer {
+public class ClassDependencyInfoSerializer implements ClassDependencyInfoProvider, ClassDependencyInfoWriter {
     private File storage;
 
+    //TODO use standard caching
+    //TODO LocalClassDependencyInfoCache
+
     public ClassDependencyInfoSerializer(File storage) {
         this.storage = storage;
     }
 
     public void writeInfo(ClassDependencyInfo info) {
-        //TODO SF this needs to use our standard serialization machinery
         DummySerializer.writeTargetTo(storage, info);
     }
 
-    public ClassDependencyInfo readInfo() {
+    public ClassDependencyInfo provideInfo() {
         return (ClassDependencyInfo) DummySerializer.readFrom(storage);
     }
 
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoWriter.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoWriter.java
new file mode 100644
index 000000000000..addb575a4027
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoWriter.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps;
+
+public interface ClassDependencyInfoWriter {
+    void writeInfo(ClassDependencyInfo info);
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependentsAccumulator.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependentsAccumulator.java
new file mode 100644
index 000000000000..0f6874d2dc66
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependentsAccumulator.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ClassDependentsAccumulator {
+
+    private final Map<String, DefaultDependentsSet> dependents = new HashMap<String, DefaultDependentsSet>();
+    private final String packagePrefix;
+
+    public ClassDependentsAccumulator(String packagePrefix) {
+        this.packagePrefix = packagePrefix;
+    }
+
+    public void addClass(String className, boolean dependencyToAll, List<String> classDependencies) {
+        if (className.startsWith(packagePrefix)) {
+            rememberClass(className).setDependencyToAll(dependencyToAll);
+        }
+        for (String dependency : classDependencies) {
+            if (!dependency.equals(className) && dependency.startsWith(packagePrefix)) {
+                DefaultDependentsSet d = rememberClass(dependency);
+                if (className.startsWith(packagePrefix)) {
+                    d.addDependent(className);
+                }
+            }
+        }
+    }
+
+    private DefaultDependentsSet rememberClass(String className) {
+        DefaultDependentsSet d = dependents.get(className);
+        if (d == null) {
+            d = new DefaultDependentsSet();
+            dependents.put(className, d);
+        }
+        return d;
+    }
+
+    public Map<String, DependentsSet> getDependentsMap() {
+        return (Map) dependents;
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DefaultDependentsSet.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DefaultDependentsSet.java
new file mode 100644
index 000000000000..70eb32368448
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DefaultDependentsSet.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import static java.util.Arrays.asList;
+
+public class DefaultDependentsSet implements Serializable, DependentsSet {
+
+    private final Set<String> dependentClasses = new HashSet<String>();
+    private boolean dependencyToAll;
+
+    public DefaultDependentsSet(boolean dependencyToAll) {
+        this(dependencyToAll, Collections.<String>emptyList());
+    }
+
+    public DefaultDependentsSet(Collection<String> dependentClasses) {
+        this(false, dependentClasses);
+    }
+
+    public DefaultDependentsSet(boolean dependencyToAll, Collection<String> dependentClasses) {
+        this.dependencyToAll = dependencyToAll;
+        this.dependentClasses.addAll(dependentClasses);
+    }
+
+    public DefaultDependentsSet() {}
+
+    public Set<String> getDependentClasses() {
+        return dependentClasses;
+    }
+
+    public boolean isDependencyToAll() {
+        return dependencyToAll;
+    }
+
+    public DefaultDependentsSet addDependent(String className) {
+        dependentClasses.add(className);
+        return this;
+    }
+
+    public static DefaultDependentsSet dependents(String ... dependentClasses) {
+        return new DefaultDependentsSet(asList(dependentClasses));
+    }
+
+    public void setDependencyToAll(boolean dependencyToAll) {
+        this.dependencyToAll = dependencyToAll;
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DependencyToAll.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DependencyToAll.java
new file mode 100644
index 000000000000..056ba2787807
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DependencyToAll.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps;
+
+import java.util.Set;
+
+public class DependencyToAll implements DependentsSet {
+    public Set<String> getDependentClasses() {
+        throw new UnsupportedOperationException("This instance of dependents set does not have dependent classes information.");
+    }
+
+    public boolean isDependencyToAll() {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DependentsSet.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DependentsSet.java
new file mode 100644
index 000000000000..de42a5ebfcec
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/DependentsSet.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps;
+
+import java.util.Set;
+
+public interface DependentsSet {
+    Set<String> getDependentClasses();
+    boolean isDependencyToAll();
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProvider.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/OutputToNameConverter.java
similarity index 85%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProvider.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/OutputToNameConverter.java
index 84aa40fa28b0..d112b426335c 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProvider.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/OutputToNameConverter.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental;
+package org.gradle.api.internal.tasks.compile.incremental.deps;
 
 import java.io.File;
 
 import static org.gradle.util.GFileUtils.relativePath;
 
-public class ClassNameProvider {
+class OutputToNameConverter {
 
     private final File compiledClassesDir;
 
-    public ClassNameProvider(File compiledClassesDir) {
+    public OutputToNameConverter(File compiledClassesDir) {
         this.compiledClassesDir = compiledClassesDir;
     }
 
-    public String provideName(File classFile) {
+    public String getClassName(File classFile) {
         String path = relativePath(compiledClassesDir, classFile);
         if (path.startsWith("/") || path.startsWith(".")) {
             throw new IllegalArgumentException("Given input class file: '" + classFile + "' is not located inside of '" + compiledClassesDir + "'.");
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfo.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfo.java
deleted file mode 100644
index e5414a19b81f..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfo.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental.graph;
-
-import org.gradle.api.internal.tasks.compile.incremental.ClassDependents;
-
-import java.io.Serializable;
-import java.util.*;
-
-public class ClassDependencyInfo implements Serializable {
-
-    private final Map<String, ClassDependents> dependents;
-
-    public ClassDependencyInfo(Map<String, ClassDependents> dependents) {
-        this.dependents = dependents;
-    }
-
-    public Set<String> getActualDependents(String className) {
-        Set<String> out = new HashSet<String>();
-        Set<String> visited = new HashSet<String>();
-        ClassDependents deps = dependents.get(className);
-        if (deps == null) {
-            return Collections.emptySet();
-        }
-        if (deps.isDependentToAll()) {
-            return null;
-        }
-        recurseDependents(visited, out, className, deps);
-        out.remove(className);
-        return out;
-    }
-
-    private void recurseDependents(Set<String> visited, Collection<String> accumulator, String className, ClassDependents incomingDependents) {
-        if (!visited.add(className) || incomingDependents == null) {
-            return;
-        }
-        for (String dependent : incomingDependents.getDependentClasses()) {
-            if (!dependent.contains("$") && !dependent.equals(className)) { //naive
-                accumulator.add(dependent);
-            }
-            ClassDependents currentDependents = this.dependents.get(dependent);
-            recurseDependents(visited, accumulator, dependent, currentDependents);
-        }
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractor.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractor.java
deleted file mode 100644
index dd2543ad7e10..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractor.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental.graph;
-
-import org.apache.commons.io.FileUtils;
-import org.gradle.api.internal.tasks.compile.incremental.ClassDependents;
-import org.gradle.api.internal.tasks.compile.incremental.ClassNameProvider;
-import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassAnalysis;
-import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassDependenciesAnalyzer;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-public class ClassDependencyInfoExtractor {
-
-    private File classesDir;
-
-    public ClassDependencyInfoExtractor(File classesDir) {
-        this.classesDir = classesDir;
-    }
-
-    public ClassDependencyInfo extractInfo(String packagePrefix) {
-        Map<String, ClassDependents> dependents = new HashMap<String, ClassDependents>();
-        Iterator output = FileUtils.iterateFiles(classesDir, new String[]{"class"}, true);
-        ClassNameProvider nameProvider = new ClassNameProvider(classesDir);
-        while (output.hasNext()) {
-            File classFile = (File) output.next();
-            String className = nameProvider.provideName(classFile);
-            if (!className.startsWith(packagePrefix)) {
-                continue;
-            }
-            try {
-                ClassAnalysis analysis = new ClassDependenciesAnalyzer().getClassAnalysis(className, classFile);
-                for (String dependency : analysis.getClassDependencies()) {
-                    if (!dependency.equals(className) && dependency.startsWith(packagePrefix)) {
-                        getOrCreateDependentMapping(dependents, dependency).addClass(className);
-                    }
-                }
-                if (analysis.isDependentToAll()) {
-                    getOrCreateDependentMapping(dependents, className).setDependentToAll();
-                }
-            } catch (IOException e) {
-                throw new RuntimeException("Problems extracting class dependency from " + classFile, e);
-            }
-        }
-        return new ClassDependencyInfo(dependents);
-    }
-
-    private ClassDependents getOrCreateDependentMapping(Map<String, ClassDependents> dependents, String dependency) {
-        ClassDependents d = dependents.get(dependency);
-        if (d == null) {
-            d = new ClassDependents();
-            dependents.put(dependency, d);
-        }
-        return d;
-    }
-}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/ClassSnapshot.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/ClassSnapshot.java
new file mode 100644
index 000000000000..d9ca98393821
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/ClassSnapshot.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.jar;
+
+import org.gradle.api.internal.tasks.compile.incremental.deps.DefaultDependentsSet;
+import org.gradle.api.internal.tasks.compile.incremental.deps.DependentsSet;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+class ClassSnapshot implements Serializable {
+
+    private final byte[] hash;
+    private final Collection<String> dependentClasses;
+
+    public ClassSnapshot(byte[] hash) {
+        this(hash, null);
+    }
+
+    public ClassSnapshot(byte[] hash, Collection<String> dependentClasses) {
+        this.hash = hash;
+        this.dependentClasses = dependentClasses;
+    }
+
+    public DependentsSet getDependents() {
+        if (dependentClasses == null) {
+            return new DefaultDependentsSet(true);
+        }
+        return new DefaultDependentsSet(dependentClasses);
+    }
+
+    public byte[] getHash() {
+        return hash;
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/ClasspathJarFinder.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/ClasspathJarFinder.java
new file mode 100644
index 000000000000..55c46c1c9a03
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/ClasspathJarFinder.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.jar;
+
+import org.gradle.api.internal.file.FileOperations;
+
+import java.io.File;
+import java.util.LinkedList;
+import java.util.List;
+
+public class ClasspathJarFinder {
+    private final FileOperations fileOperations;
+
+    public ClasspathJarFinder(FileOperations fileOperations) {
+        this.fileOperations = fileOperations;
+    }
+
+    public Iterable<JarArchive> findJarArchives(Iterable<File> classpath) {
+        List<JarArchive> out = new LinkedList<JarArchive>();
+        for (File file : classpath) {
+            if (file.getName().endsWith(".jar")) {
+                out.add(new JarArchive(file, fileOperations.zipTree(file)));
+            }
+        }
+        return out;
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarArchive.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarArchive.java
similarity index 89%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarArchive.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarArchive.java
index d29b4c9c92d4..6869f59433cc 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarArchive.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarArchive.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.tasks.compile.incremental;
+package org.gradle.api.internal.tasks.compile.incremental.jar;
 
 import org.gradle.api.file.FileTree;
 import org.gradle.api.tasks.util.PatternSet;
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarChangeDependentsFinder.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarChangeDependentsFinder.java
new file mode 100644
index 000000000000..fe88aa71924c
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarChangeDependentsFinder.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.jar;
+
+import org.gradle.api.internal.tasks.compile.incremental.deps.DefaultDependentsSet;
+import org.gradle.api.internal.tasks.compile.incremental.deps.DependentsSet;
+import org.gradle.api.internal.tasks.compile.incremental.model.PreviousCompilation;
+import org.gradle.api.tasks.incremental.InputFileDetails;
+
+public class JarChangeDependentsFinder {
+
+    private JarSnapshotter jarSnapshotter;
+    private PreviousCompilation previousCompilation;
+
+    public JarChangeDependentsFinder(JarSnapshotter jarSnapshotter, PreviousCompilation previousCompilation) {
+        this.jarSnapshotter = jarSnapshotter;
+        this.previousCompilation = previousCompilation;
+    }
+
+    //TODO SF coverage
+    public DependentsSet getActualDependents(InputFileDetails jarChangeDetails, JarArchive jarArchive) {
+        JarSnapshot existing = previousCompilation.getJarSnapshot(jarChangeDetails.getFile());
+        if (jarChangeDetails.isAdded()) {
+            return new DefaultDependentsSet();
+        }
+
+        if (existing == null) {
+            //we don't know what classes were dependents of the jar in the previous build
+            //for example, a class (in jar) with a constant might have changed into a class without a constant - we need to rebuild everything
+            return new DefaultDependentsSet(true);
+        }
+
+        if (jarChangeDetails.isRemoved()) {
+            DependentsSet allClasses = existing.getAllClasses();
+            if (allClasses.isDependencyToAll()) {
+                //at least one of the classes in jar is a 'dependency-to-all'.
+                return allClasses;
+            }
+            //recompile all dependents of all the classes from jar
+            return previousCompilation.getDependents(allClasses.getDependentClasses());
+        }
+
+        if (jarChangeDetails.isModified()) {
+            JarSnapshot newSnapshot = jarSnapshotter.createSnapshot(jarArchive);
+            DependentsSet affectedClasses = newSnapshot.getAffectedClassesSince(existing);
+            if (affectedClasses.isDependencyToAll()) {
+                //at least one of the classes changed in the jar is a 'dependency-to-all'
+                return affectedClasses;
+            }
+            //recompile all dependents of the classes changed in the jar
+            return previousCompilation.getDependents(affectedClasses.getDependentClasses());
+        }
+
+        throw new IllegalArgumentException("Unknown input file details provided: " + jarChangeDetails);
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshot.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshot.java
new file mode 100644
index 000000000000..d67549a4899a
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshot.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.jar;
+
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo;
+import org.gradle.api.internal.tasks.compile.incremental.deps.DefaultDependentsSet;
+import org.gradle.api.internal.tasks.compile.incremental.deps.DependentsSet;
+
+import java.io.Serializable;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+public class JarSnapshot implements Serializable {
+
+    final Map<String, byte[]> hashes;
+    final ClassDependencyInfo info;
+
+    /**
+     * @param hashes hashes of all classes from the jar
+     * @param info dependency info of classes in this jar
+     */
+    public JarSnapshot(Map<String, byte[]> hashes, ClassDependencyInfo info) {
+        assert hashes != null;
+        assert info != null;
+
+        this.hashes = hashes;
+        this.info = info;
+    }
+
+    public DependentsSet getAllClasses() {
+        final Set<String> result = new HashSet<String>();
+        for (Map.Entry<String, byte[]> cls : hashes.entrySet()) {
+            String className = cls.getKey();
+            //TODO SF change to info.isDependencyToAll(className);
+            DependentsSet dependents = info.getRelevantDependents(className);
+            if (dependents.isDependencyToAll()) {
+                return dependents;
+            }
+            result.add(className);
+        }
+        return new DefaultDependentsSet(result);
+    }
+
+    public DependentsSet getAffectedClassesSince(JarSnapshot other) {
+        final Set<String> affected = new HashSet<String>();
+        for (Map.Entry<String, byte[]> otherClass : other.hashes.entrySet()) {
+            String otherClassName = otherClass.getKey();
+            byte[] otherClassBytes = otherClass.getValue();
+            byte[] thisClsBytes = hashes.get(otherClassName);
+            if (thisClsBytes == null || !Arrays.equals(thisClsBytes, otherClassBytes)) {
+                //removed since or changed since
+                affected.add(otherClassName);
+                DependentsSet dependents = other.info.getRelevantDependents(otherClassName);
+                if (dependents.isDependencyToAll()) {
+                    return dependents;
+                }
+                affected.addAll(dependents.getDependentClasses());
+            }
+            //we ignore added since
+        }
+        return new DefaultDependentsSet(affected);
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeeder.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotsMaker.java
similarity index 50%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeeder.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotsMaker.java
index 67fadc8f858e..3f67f81d4a19 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeeder.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotsMaker.java
@@ -14,44 +14,39 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental;
+package org.gradle.api.internal.tasks.compile.incremental.jar;
+
+import org.gradle.api.logging.Logger;
+import org.gradle.api.logging.Logging;
+import org.gradle.util.Clock;
 
 import java.io.File;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 
-public class JarSnapshotFeeder {
+public class JarSnapshotsMaker {
+
+    private static final Logger LOG = Logging.getLogger(JarSnapshotsMaker.class);
 
-    private final JarSnapshotCache jarSnapshotCache;
-    private final Set<File> changedJars = new HashSet<File>();
+    private final LocalJarSnapshotCache jarSnapshotCache;
     private final JarSnapshotter jarSnapshotter;
+    private ClasspathJarFinder classpathJarFinder;
 
-    public JarSnapshotFeeder(JarSnapshotCache jarSnapshotCache, JarSnapshotter jarSnapshotter) {
+    public JarSnapshotsMaker(LocalJarSnapshotCache jarSnapshotCache, JarSnapshotter jarSnapshotter, ClasspathJarFinder classpathJarFinder) {
         this.jarSnapshotCache = jarSnapshotCache;
         this.jarSnapshotter = jarSnapshotter;
+        this.classpathJarFinder = classpathJarFinder;
     }
 
-    public JarSnapshot changedJar(File jarFile) {
-        JarSnapshot snapshot = jarSnapshotCache.getSnapshot(jarFile);
-        changedJars.add(jarFile);
-        return snapshot;
-    }
+    public void storeJarSnapshots(Iterable<File> classpath) {
+        Clock clock = new Clock();
+        Iterable<JarArchive> jarArchives = classpathJarFinder.findJarArchives(classpath);
 
-    public void storeJarSnapshots(Iterable<JarArchive> jars) {
         Map<File, JarSnapshot> newSnapshots = new HashMap<File, JarSnapshot>();
-        for (JarArchive jar : jars) {
-            if (!changedJars.contains(jar.file) && jarSnapshotCache.getSnapshot(jar.file) != null) {
-                //if jar was not changed and the the snapshot already exists, skip
-                continue;
-            }
-            newSnapshots.put(jar.file, jarSnapshotter.createSnapshot(jar.contents));
+        for (JarArchive jar : jarArchives) {
+            newSnapshots.put(jar.file, jarSnapshotter.createSnapshot(jar));
         }
         jarSnapshotCache.putSnapshots(newSnapshots);
-    }
-
-    public JarSnapshot createSnapshot(JarArchive jarArchive) {
-        return jarSnapshotter.createSnapshot(jarArchive.contents);
+        LOG.lifecycle("Created and written jar snapshots in {}.", clock.getTime());
     }
 }
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotter.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotter.java
new file mode 100644
index 000000000000..4c44b0280a81
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotter.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+package org.gradle.api.internal.tasks.compile.incremental.jar;
+
+import org.gradle.api.file.FileTree;
+import org.gradle.api.file.FileVisitDetails;
+import org.gradle.api.file.FileVisitor;
+import org.gradle.api.internal.hash.Hasher;
+import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassDependenciesAnalyzer;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfoExtractor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class JarSnapshotter {
+
+    private final Hasher hasher;
+    private final ClassDependenciesAnalyzer analyzer;
+
+    public JarSnapshotter(Hasher hasher, ClassDependenciesAnalyzer analyzer) {
+        this.hasher = hasher;
+        this.analyzer = analyzer;
+    }
+
+    public JarSnapshot createSnapshot(JarArchive jarArchive) {
+        FileTree classes = jarArchive.contents;
+        return createSnapshot(classes, new ClassDependencyInfoExtractor(analyzer));
+    }
+
+    JarSnapshot createSnapshot(FileTree classes, final ClassDependencyInfoExtractor extractor) {
+        final Map<String, byte[]> hashes = new HashMap<String, byte[]>();
+        classes.visit(new FileVisitor() {
+            public void visitDir(FileVisitDetails dirDetails) {
+            }
+
+            public void visitFile(FileVisitDetails fileDetails) {
+                extractor.visitFile(fileDetails);
+                String className = fileDetails.getPath().replaceAll("/", ".").replaceAll("\\.class$", "");
+                byte[] classHash = hasher.hash(fileDetails.getFile());
+                hashes.put(className, classHash);
+            }
+        });
+
+        return new JarSnapshot(hashes, extractor.getDependencyInfo());
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCache.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/LocalJarSnapshotCache.java
similarity index 66%
rename from subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCache.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/LocalJarSnapshotCache.java
index e8cffc563000..91f8b15396e5 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCache.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/LocalJarSnapshotCache.java
@@ -14,20 +14,24 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental;
+package org.gradle.api.internal.tasks.compile.incremental.jar;
+
+import org.gradle.api.internal.tasks.compile.incremental.DummySerializer;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-//TODO SF this obviously needs to be replaced with a proper cache
-public class JarSnapshotCache {
+public class LocalJarSnapshotCache {
+
+    //TODO use standard caching mechanisms
+    //TODO just store File->checksum, use shared jar snapshot cache for contents
 
-    private File sharedJarSnapshotCache;
+    private File storage;
     private Map<File, JarSnapshot> snapshots;
 
-    public JarSnapshotCache(File sharedJarSnapshotCache) {
-        this.sharedJarSnapshotCache = sharedJarSnapshotCache;
+    public LocalJarSnapshotCache(File storage) {
+        this.storage = storage;
     }
 
     public JarSnapshot getSnapshot(File jar) {
@@ -38,13 +42,13 @@ public JarSnapshot getSnapshot(File jar) {
     public void putSnapshots(Map<File, JarSnapshot> newSnapshots) {
         init();
         this.snapshots.putAll(newSnapshots);
-        DummySerializer.writeTargetTo(sharedJarSnapshotCache, this.snapshots);
+        DummySerializer.writeTargetTo(storage, this.snapshots);
     }
 
     private void init() {
         if (snapshots == null) {
-            if (sharedJarSnapshotCache.isFile()) {
-                snapshots = (Map) DummySerializer.readFrom(sharedJarSnapshotCache);
+            if (storage.isFile()) {
+                snapshots = (Map) DummySerializer.readFrom(storage);
             } else {
                 snapshots = new HashMap<File, JarSnapshot>();
             }
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/model/PreviousCompilation.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/model/PreviousCompilation.java
new file mode 100644
index 000000000000..aef075dffb91
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/model/PreviousCompilation.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.model;
+
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo;
+import org.gradle.api.internal.tasks.compile.incremental.deps.DependentsSet;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarSnapshot;
+import org.gradle.api.internal.tasks.compile.incremental.jar.LocalJarSnapshotCache;
+
+import java.io.File;
+import java.util.Set;
+
+public class PreviousCompilation {
+
+    private ClassDependencyInfo dependencyInfo;
+    private LocalJarSnapshotCache jarSnapshotCache;
+
+    public PreviousCompilation(ClassDependencyInfo dependencyInfo, LocalJarSnapshotCache jarSnapshotCache) {
+        this.dependencyInfo = dependencyInfo;
+        this.jarSnapshotCache = jarSnapshotCache;
+    }
+
+    public DependentsSet getDependents(Set<String> allClasses) {
+        return dependencyInfo.getRelevantDependents(allClasses);
+    }
+
+    public JarSnapshot getJarSnapshot(File file) {
+        return jarSnapshotCache.getSnapshot(file);
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/DefaultRecompilationSpec.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/DefaultRecompilationSpec.java
new file mode 100644
index 000000000000..6dea0f5448e6
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/DefaultRecompilationSpec.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.recomp;
+
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+
+class DefaultRecompilationSpec implements RecompilationSpec {
+
+    final Collection<String> classesToCompile = new LinkedHashSet<String>();
+    private final ClassDependencyInfo initialDependencyInfo;
+    File fullRebuildCause;
+
+    public DefaultRecompilationSpec(ClassDependencyInfo initialDependencyInfo) {
+        this.initialDependencyInfo = initialDependencyInfo;
+    }
+
+    public Collection<String> getClassNames() {
+        return classesToCompile;
+    }
+
+    public boolean isFullRebuildNeeded() {
+        return fullRebuildCause != null;
+    }
+
+    public File getFullRebuildCause() {
+        return fullRebuildCause;
+    }
+
+    public ClassDependencyInfo getInitialDependencyInfo() {
+        return initialDependencyInfo;
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/JarChangeProcessor.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/JarChangeProcessor.java
new file mode 100644
index 000000000000..850cd79d5b96
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/JarChangeProcessor.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.recomp;
+
+import org.gradle.api.internal.file.FileOperations;
+import org.gradle.api.internal.tasks.compile.incremental.deps.DependentsSet;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarArchive;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarChangeDependentsFinder;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarSnapshotter;
+import org.gradle.api.internal.tasks.compile.incremental.model.PreviousCompilation;
+import org.gradle.api.tasks.incremental.InputFileDetails;
+
+class JarChangeProcessor {
+
+    private final FileOperations fileOperations;
+    private final JarSnapshotter jarSnapshotter;
+    private final PreviousCompilation previousCompilation;
+
+    public JarChangeProcessor(FileOperations fileOperations, JarSnapshotter jarSnapshotter, PreviousCompilation previousCompilation) {
+        this.fileOperations = fileOperations;
+        this.jarSnapshotter = jarSnapshotter;
+        this.previousCompilation = previousCompilation;
+    }
+
+    public void processChange(InputFileDetails input, DefaultRecompilationSpec spec) {
+        JarArchive jarArchive = new JarArchive(input.getFile(), fileOperations.zipTree(input.getFile()));
+        JarChangeDependentsFinder dependentsFinder = new JarChangeDependentsFinder(jarSnapshotter, previousCompilation);
+        DependentsSet actualDependents = dependentsFinder.getActualDependents(input, jarArchive);
+        if (actualDependents.isDependencyToAll()) {
+            spec.fullRebuildCause = input.getFile();
+            return;
+        }
+        spec.classesToCompile.addAll(actualDependents.getDependentClasses());
+    }
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/JavaChangeProcessor.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/JavaChangeProcessor.java
new file mode 100644
index 000000000000..ec87ec8b1d71
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/JavaChangeProcessor.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.recomp;
+
+import org.gradle.api.internal.tasks.compile.incremental.SourceToNameConverter;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo;
+import org.gradle.api.internal.tasks.compile.incremental.deps.DependentsSet;
+import org.gradle.api.tasks.incremental.InputFileDetails;
+
+class JavaChangeProcessor {
+
+    private final ClassDependencyInfo dependencyInfo;
+    private final SourceToNameConverter sourceToNameConverter;
+
+    public JavaChangeProcessor(ClassDependencyInfo dependencyInfo, SourceToNameConverter sourceToNameConverter) {
+        this.dependencyInfo = dependencyInfo;
+        this.sourceToNameConverter = sourceToNameConverter;
+    }
+
+    public void processChange(InputFileDetails input, DefaultRecompilationSpec spec) {
+        String className = sourceToNameConverter.getClassName(input.getFile());
+        spec.classesToCompile.add(className);
+        DependentsSet actualDependents = dependencyInfo.getRelevantDependents(className);
+        if (actualDependents.isDependencyToAll()) {
+            spec.fullRebuildCause = input.getFile();
+            return;
+        }
+        spec.classesToCompile.addAll(actualDependents.getDependentClasses());
+    }
+}
\ No newline at end of file
diff --git a/subprojects/core/src/main/groovy/org/gradle/plugin/PluginHandler.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationNotNecessary.java
similarity index 73%
rename from subprojects/core/src/main/groovy/org/gradle/plugin/PluginHandler.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationNotNecessary.java
index 19b9aaf687ab..cef5b29778cc 100644
--- a/subprojects/core/src/main/groovy/org/gradle/plugin/PluginHandler.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationNotNecessary.java
@@ -14,18 +14,13 @@
  * limitations under the License.
  */
 
-package org.gradle.plugin;
+package org.gradle.api.internal.tasks.compile.incremental.recomp;
 
-import org.gradle.api.Incubating;
+import org.gradle.api.tasks.WorkResult;
 
-import java.util.Map;
-
-/**
- * A manager of plugins.
- */
-@Incubating
-public interface PluginHandler {
-
-    void apply(Map<String, ?> attributes);
+public class RecompilationNotNecessary implements WorkResult {
 
+    public boolean getDidWork() {
+        return true;
+    }
 }
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationSpec.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationSpec.java
new file mode 100644
index 000000000000..844bfe1908a8
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationSpec.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.recomp;
+
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo;
+
+import java.io.File;
+import java.util.Collection;
+
+public interface RecompilationSpec {
+    Collection<String> getClassNames();
+    boolean isFullRebuildNeeded();
+    File getFullRebuildCause();
+
+    //dependency info that was used to determine this recompilation spec
+    ClassDependencyInfo getInitialDependencyInfo();
+}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationSpecProvider.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationSpecProvider.java
new file mode 100644
index 000000000000..34276a239acf
--- /dev/null
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/compile/incremental/recomp/RecompilationSpecProvider.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.recomp;
+
+import org.gradle.api.Action;
+import org.gradle.api.internal.file.FileOperations;
+import org.gradle.api.internal.tasks.compile.incremental.SourceToNameConverter;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo;
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfoProvider;
+import org.gradle.api.internal.tasks.compile.incremental.jar.JarSnapshotter;
+import org.gradle.api.internal.tasks.compile.incremental.jar.LocalJarSnapshotCache;
+import org.gradle.api.internal.tasks.compile.incremental.model.PreviousCompilation;
+import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
+import org.gradle.api.tasks.incremental.InputFileDetails;
+
+public class RecompilationSpecProvider {
+
+    private final SourceToNameConverter sourceToNameConverter;
+    private final ClassDependencyInfoProvider dependencyInfoProvider;
+    private final FileOperations fileOperations;
+    private final JarSnapshotter jarSnapshotter;
+    private LocalJarSnapshotCache jarSnapshotCache;
+
+    public RecompilationSpecProvider(SourceToNameConverter sourceToNameConverter, ClassDependencyInfoProvider dependencyInfoProvider,
+                                     FileOperations fileOperations, JarSnapshotter jarSnapshotter, LocalJarSnapshotCache jarSnapshotCache) {
+        this.sourceToNameConverter = sourceToNameConverter;
+        this.dependencyInfoProvider = dependencyInfoProvider;
+        this.fileOperations = fileOperations;
+        this.jarSnapshotter = jarSnapshotter;
+        this.jarSnapshotCache = jarSnapshotCache;
+    }
+
+    public RecompilationSpec provideRecompilationSpec(IncrementalTaskInputs inputs) {
+        //load the dependency info
+        ClassDependencyInfo dependencyInfo = dependencyInfoProvider.provideInfo();
+        PreviousCompilation previousCompilation = new PreviousCompilation(dependencyInfo, jarSnapshotCache);
+
+        //creating an action that will be executed against all changes
+        DefaultRecompilationSpec spec = new DefaultRecompilationSpec(dependencyInfo);
+        JavaChangeProcessor javaChangeProcessor = new JavaChangeProcessor(dependencyInfo, sourceToNameConverter);
+        JarChangeProcessor jarChangeProcessor = new JarChangeProcessor(fileOperations, jarSnapshotter, previousCompilation);
+        InputChangeAction action = new InputChangeAction(spec, javaChangeProcessor, jarChangeProcessor);
+
+        //go!
+        inputs.outOfDate(action);
+        if (action.spec.fullRebuildCause != null) {
+            //short circuit in case we already know that that full rebuild is needed
+            return action.spec;
+        }
+        inputs.removed(action);
+        return action.spec;
+    }
+
+    private static class InputChangeAction implements Action<InputFileDetails> {
+        private final DefaultRecompilationSpec spec;
+        private final JavaChangeProcessor javaChangeProcessor;
+        private final JarChangeProcessor jarChangeProcessor;
+
+        public InputChangeAction(DefaultRecompilationSpec spec, JavaChangeProcessor javaChangeProcessor, JarChangeProcessor jarChangeProcessor) {
+            this.spec = spec;
+            this.javaChangeProcessor = javaChangeProcessor;
+            this.jarChangeProcessor = jarChangeProcessor;
+        }
+
+        public void execute(InputFileDetails input) {
+            if (spec.fullRebuildCause != null) {
+                return;
+            }
+            if (input.getFile().getName().endsWith(".java")) {
+                javaChangeProcessor.processChange(input, spec);
+            }
+            if (input.getFile().getName().endsWith(".jar")) {
+                jarChangeProcessor.processChange(input, spec);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/testng/TestNGTestClassProcessor.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/testng/TestNGTestClassProcessor.java
index f14ee1cea5dd..cbc92cfc6f35 100755
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/testng/TestNGTestClassProcessor.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/testng/TestNGTestClassProcessor.java
@@ -88,13 +88,12 @@ public void stop() {
         }
 
         testNg.setUseDefaultListeners(options.getUseDefaultListeners());
-        testNg.addListener((Object) adaptListener(testResultProcessor));
-        if (!options.getIncludedTests().isEmpty()) {
-            testNg.addListener(new SelectedTestsFilter(options.getIncludedTests()));
-        }
         testNg.setVerbose(0);
         testNg.setGroups(CollectionUtils.join(",", options.getIncludeGroups()));
         testNg.setExcludedGroups(CollectionUtils.join(",", options.getExcludeGroups()));
+
+        //adding custom test listeners before Gradle's listeners.
+        //this way, custom listeners are more powerful and, for example, they can change test status.
         for (String listenerClass : options.getListeners()) {
             try {
                 testNg.addListener(applicationClassLoader.loadClass(listenerClass).newInstance());
@@ -102,6 +101,10 @@ public void stop() {
                 throw new GradleException(String.format("Could not add a test listener with class '%s'.", listenerClass), e);
             }
         }
+        testNg.addListener((Object) adaptListener(testResultProcessor));
+        if (!options.getIncludedTests().isEmpty()) {
+            testNg.addListener(new SelectedTestsFilter(options.getIncludedTests()));
+        }
 
         if (!suiteFiles.isEmpty()) {
             testNg.setTestSuites(GFileUtils.toPaths(suiteFiles));
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/ClassDirectoryBinary.java b/subprojects/plugins/src/main/groovy/org/gradle/api/jvm/ClassDirectoryBinary.java
similarity index 95%
rename from subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/ClassDirectoryBinary.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/jvm/ClassDirectoryBinary.java
index e8b852bced72..1bababa0cad4 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/ClassDirectoryBinary.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/jvm/ClassDirectoryBinary.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.jvm;
+package org.gradle.api.jvm;
 
 import org.gradle.api.DomainObjectCollection;
 import org.gradle.api.Incubating;
-import org.gradle.language.base.Binary;
+import org.gradle.runtime.base.Binary;
 import org.gradle.language.base.LanguageSourceSet;
 
 import java.io.File;
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/package-info.java b/subprojects/plugins/src/main/groovy/org/gradle/api/jvm/package-info.java
similarity index 86%
rename from subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/package-info.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/jvm/package-info.java
index 9d4903f1941d..a4863ce5f329 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/artifacts/resolution/package-info.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/jvm/package-info.java
@@ -15,6 +15,6 @@
  */
 
 /**
- * Classes comprising the artifact resolution API.
+ * Classes for adapting the legacy plugins to the new component model.
  */
-package org.gradle.api.artifacts.resolution;
\ No newline at end of file
+package org.gradle.api.jvm;
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/BasePlugin.java b/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/BasePlugin.java
index 6d492e5868ba..373032cda51b 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/BasePlugin.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/BasePlugin.java
@@ -29,15 +29,13 @@
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.DefaultProjectPublication;
 import org.gradle.api.internal.artifacts.ivyservice.projectmodule.ProjectPublicationRegistry;
 import org.gradle.api.internal.plugins.BuildConfigurationRule;
-import org.gradle.api.internal.plugins.CleanRule;
 import org.gradle.api.internal.plugins.DefaultArtifactPublicationSet;
 import org.gradle.api.internal.plugins.UploadRule;
-import org.gradle.api.tasks.Delete;
 import org.gradle.api.tasks.Upload;
 import org.gradle.api.tasks.bundling.AbstractArchiveTask;
 import org.gradle.api.tasks.bundling.Jar;
 import org.gradle.configuration.project.ProjectConfigurationActionContainer;
-import org.gradle.language.base.plugins.LanguageBasePlugin;
+import org.gradle.language.base.plugins.LifecycleBasePlugin;
 
 import javax.inject.Inject;
 import java.io.File;
@@ -47,10 +45,11 @@
  * <p>A  {@link org.gradle.api.Plugin}  which defines a basic project lifecycle and some common convention properties.</p>
  */
 public class BasePlugin implements Plugin<Project> {
-    public static final String CLEAN_TASK_NAME = "clean";
-    public static final String ASSEMBLE_TASK_NAME = "assemble";
+    public static final String CLEAN_TASK_NAME = LifecycleBasePlugin.CLEAN_TASK_NAME;
+    public static final String ASSEMBLE_TASK_NAME = LifecycleBasePlugin.ASSEMBLE_TASK_NAME;
+    public static final String BUILD_GROUP = LifecycleBasePlugin.BUILD_GROUP;
+
     public static final String UPLOAD_ARCHIVES_TASK_NAME = "uploadArchives";
-    public static final String BUILD_GROUP = LanguageBasePlugin.BUILD_GROUP;
     public static final String UPLOAD_GROUP = "upload";
 
     private final ProjectPublicationRegistry publicationRegistry;
@@ -63,6 +62,8 @@ public BasePlugin(ProjectPublicationRegistry publicationRegistry, ProjectConfigu
     }
 
     public void apply(Project project) {
+        project.getPlugins().apply(LifecycleBasePlugin.class);
+
         BasePluginConvention convention = new BasePluginConvention(project);
         project.getConvention().getPlugins().put("base", convention);
 
@@ -71,17 +72,7 @@ public void apply(Project project) {
         configureUploadArchivesTask();
         configureArchiveDefaults(project, convention);
         configureConfigurations(project);
-
-        addClean(project);
-        addCleanRule(project);
-        addAssemble(project);
-    }
-
-    private void addAssemble(Project project) {
-        Task assembleTask = project.getTasks().create(ASSEMBLE_TASK_NAME);
-        assembleTask.setDescription("Assembles the outputs of this project.");
-        assembleTask.setGroup(BUILD_GROUP);
-        assembleTask.dependsOn(project.getConfigurations().getByName(Dependency.ARCHIVES_CONFIGURATION).getAllArtifacts().getBuildDependencies());
+        configureAssemble(project);
     }
 
     private void configureArchiveDefaults(final Project project, final BasePluginConvention pluginConvention) {
@@ -120,21 +111,6 @@ public String call() throws Exception {
         });
     }
 
-    private void addClean(final Project project) {
-        Delete clean = project.getTasks().create(CLEAN_TASK_NAME, Delete.class);
-        clean.setDescription("Deletes the build directory.");
-        clean.setGroup(BUILD_GROUP);
-        clean.delete(new Callable<File>() {
-            public File call() throws Exception {
-                return project.getBuildDir();
-            }
-        });
-    }
-
-    private void addCleanRule(Project project) {
-        project.getTasks().addRule(new CleanRule(project.getTasks()));
-    }
-
     private void configureBuildConfigurationRule(Project project) {
         project.getTasks().addRule(new BuildConfigurationRule(project.getConfigurations(), project.getTasks()));
     }
@@ -185,4 +161,9 @@ public void execute(PublishArtifact artifact) {
             }
         });
     }
+
+    private void configureAssemble(Project project) {
+        Task assembleTask = project.getTasks().getByName(ASSEMBLE_TASK_NAME);
+        assembleTask.dependsOn(project.getConfigurations().getByName(Dependency.ARCHIVES_CONFIGURATION).getAllArtifacts().getBuildDependencies());
+    }
 }
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaBasePlugin.java b/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaBasePlugin.java
index 4dc2d170989b..d3948a260d46 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaBasePlugin.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaBasePlugin.java
@@ -32,12 +32,12 @@
 import org.gradle.api.tasks.javadoc.Javadoc;
 import org.gradle.api.tasks.testing.*;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.BinaryContainer;
+import org.gradle.runtime.base.BinaryContainer;
 import org.gradle.language.base.FunctionalSourceSet;
 import org.gradle.language.base.ProjectSourceSet;
 import org.gradle.language.java.internal.DefaultJavaSourceSet;
-import org.gradle.language.jvm.ClassDirectoryBinary;
-import org.gradle.language.jvm.Classpath;
+import org.gradle.api.jvm.ClassDirectoryBinary;
+import org.gradle.runtime.jvm.Classpath;
 import org.gradle.language.jvm.ResourceSet;
 import org.gradle.language.jvm.internal.DefaultResourceSet;
 import org.gradle.util.WrapUtil;
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaLanguagePlugin.java b/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaLanguagePlugin.java
index 00d5da7f033c..5ce734b52417 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaLanguagePlugin.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JavaLanguagePlugin.java
@@ -19,9 +19,9 @@
 import org.gradle.api.internal.ConventionMapping;
 import org.gradle.api.internal.file.DefaultSourceDirectorySet;
 import org.gradle.api.internal.file.FileResolver;
-import org.gradle.language.base.BinaryContainer;
-import org.gradle.language.base.internal.BinaryInternal;
-import org.gradle.language.base.internal.BinaryNamingScheme;
+import org.gradle.runtime.base.BinaryContainer;
+import org.gradle.runtime.base.internal.BinaryInternal;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 import org.gradle.language.java.internal.DefaultJavaSourceSet;
 import org.gradle.language.java.JavaSourceSet;
 import org.gradle.api.tasks.compile.AbstractCompile;
@@ -29,17 +29,16 @@
 import org.gradle.internal.reflect.Instantiator;
 import org.gradle.language.base.FunctionalSourceSet;
 import org.gradle.language.base.ProjectSourceSet;
-import org.gradle.language.jvm.internal.DefaultClasspath;
+import org.gradle.runtime.jvm.internal.DefaultClasspath;
 import org.gradle.language.base.internal.DefaultProjectSourceSet;
-import org.gradle.language.jvm.ClassDirectoryBinary;
-import org.gradle.language.jvm.plugins.JvmLanguagePlugin;
+import org.gradle.api.jvm.ClassDirectoryBinary;
 
 import javax.inject.Inject;
 import java.util.concurrent.Callable;
 
 /**
- * Plugin for compiling Java code. Applies the {@link org.gradle.language.jvm.plugins.JvmLanguagePlugin}.
- * Adds a {@link JavaCompile} task for each {@link JavaSourceSet} added to a {@link org.gradle.language.jvm.ClassDirectoryBinary}.
+ * Plugin for compiling Java code. Applies the {@link JvmLanguagePlugin}.
+ * Adds a {@link JavaCompile} task for each {@link JavaSourceSet} added to a {@link org.gradle.api.jvm.ClassDirectoryBinary}.
  * Registers the {@link JavaSourceSet} element type for each {@link org.gradle.language.base.FunctionalSourceSet} added to {@link org.gradle.language.base.ProjectSourceSet}.
  */
 @Incubating
diff --git a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/JvmLanguagePlugin.java b/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JvmLanguagePlugin.java
similarity index 89%
rename from subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/JvmLanguagePlugin.java
rename to subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JvmLanguagePlugin.java
index 56c415ffba0a..c546660d9fab 100644
--- a/subprojects/language-jvm/src/main/groovy/org/gradle/language/jvm/plugins/JvmLanguagePlugin.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/plugins/JvmLanguagePlugin.java
@@ -13,37 +13,38 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.language.jvm.plugins;
+package org.gradle.api.plugins;
 
 import org.gradle.api.*;
 import org.gradle.api.internal.ConventionMapping;
 import org.gradle.api.internal.file.DefaultSourceDirectorySet;
 import org.gradle.api.internal.file.FileResolver;
+import org.gradle.api.internal.jvm.DefaultClassDirectoryBinary;
 import org.gradle.api.internal.plugins.DslObject;
+import org.gradle.api.jvm.ClassDirectoryBinary;
 import org.gradle.api.tasks.Copy;
 import org.gradle.internal.reflect.Instantiator;
-import org.gradle.language.base.BinaryContainer;
 import org.gradle.language.base.FunctionalSourceSet;
 import org.gradle.language.base.ProjectSourceSet;
-import org.gradle.language.base.internal.BinaryInternal;
-import org.gradle.language.base.internal.BinaryNamingScheme;
 import org.gradle.language.base.plugins.LanguageBasePlugin;
-import org.gradle.language.jvm.ClassDirectoryBinary;
 import org.gradle.language.jvm.ResourceSet;
-import org.gradle.language.jvm.internal.DefaultClassDirectoryBinary;
 import org.gradle.language.jvm.internal.DefaultResourceSet;
 import org.gradle.language.jvm.tasks.ProcessResources;
+import org.gradle.runtime.base.BinaryContainer;
+import org.gradle.runtime.base.internal.BinaryInternal;
+import org.gradle.runtime.base.internal.BinaryNamingScheme;
 
 import javax.inject.Inject;
 import java.io.File;
 import java.util.concurrent.Callable;
 
+// TODO:DAZ Replace with JvmComponentPlugin, or make this extend JvmComponentPlugin
 /**
  * Base plugin for JVM language support. Applies the {@link org.gradle.language.base.plugins.LanguageBasePlugin}.
- * Registers the {@link org.gradle.language.jvm.ClassDirectoryBinary} element type for the {@link org.gradle.language.base.BinaryContainer}.
- * Adds a lifecycle task named {@code classes} for each {@link org.gradle.language.jvm.ClassDirectoryBinary}.
+ * Registers the {@link org.gradle.api.jvm.ClassDirectoryBinary} element type for the {@link org.gradle.runtime.base.BinaryContainer}.
+ * Adds a lifecycle task named {@code classes} for each {@link org.gradle.api.jvm.ClassDirectoryBinary}.
  * Registers the {@link org.gradle.language.jvm.ResourceSet} element type for each {@link org.gradle.language.base.FunctionalSourceSet} added to {@link org.gradle.language.base.ProjectSourceSet}.
- * Adds a {@link Copy} task named {@code processXYZResources} for each {@link org.gradle.language.jvm.ResourceSet} added to a {@link org.gradle.language.jvm.ClassDirectoryBinary}.
+ * Adds a {@link Copy} task named {@code processXYZResources} for each {@link org.gradle.language.jvm.ResourceSet} added to a {@link org.gradle.api.jvm.ClassDirectoryBinary}.
  */
 @Incubating
 public class JvmLanguagePlugin implements Plugin<Project> {
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/GroovyRuntime.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/GroovyRuntime.java
index cfca7e1221f8..bcff668f60ed 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/GroovyRuntime.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/GroovyRuntime.java
@@ -98,10 +98,6 @@ public FileCollection createDelegate() {
                 List<Dependency> dependencies = Lists.newArrayList();
                 // project.getDependencies().create(String) seems to be the only feasible way to create a Dependency with a classifier
                 dependencies.add(project.getDependencies().create(notation));
-                if (groovyJar.getVersion().getMajor() >= 2) {
-                    // add groovy-ant to bring in AntGroovyCompiler
-                    dependencies.add(project.getDependencies().create(notation.replace(":groovy:", ":groovy-ant:")));
-                }
                 return project.getConfigurations().detachedConfiguration(dependencies.toArray(new Dependency[dependencies.size()]));
             }
 
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/Upload.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/Upload.java
index 2eeaf01e9413..53daad6f2515 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/Upload.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/Upload.java
@@ -46,12 +46,9 @@ public class Upload extends ConventionTask {
     private File descriptorDestination;
     private RepositoryHandler repositories;
 
-    private final ArtifactPublicationServices publicationServices;
-
     @Inject
-    public Upload(ArtifactPublicationServices publicationServices) {
-        this.publicationServices = publicationServices;
-        repositories = publicationServices.createRepositoryHandler();
+    protected ArtifactPublicationServices getPublicationServices() {
+        throw new UnsupportedOperationException();
     }
 
     @TaskAction
@@ -59,9 +56,9 @@ protected void upload() {
         getLogger().info("Publishing configuration: " + configuration);
         ModuleInternal module = ((ConfigurationInternal) configuration).getModule();
 
-        ArtifactPublisher artifactPublisher = publicationServices.createArtifactPublisher();
+        ArtifactPublisher artifactPublisher = getPublicationServices().createArtifactPublisher();
         File descriptorDestination = isUploadDescriptor() ? getDescriptorDestination() : null;
-        List<PublicationAwareRepository> publishRepositories = collect(repositories, Transformers.cast(PublicationAwareRepository.class));
+        List<PublicationAwareRepository> publishRepositories = collect(getRepositories(), Transformers.cast(PublicationAwareRepository.class));
 
         try {
             artifactPublisher.publish(publishRepositories, module, configuration, descriptorDestination);
@@ -97,6 +94,9 @@ public void setDescriptorDestination(File descriptorDestination) {
      * Returns the repositories to upload to.
      */
     public RepositoryHandler getRepositories() {
+        if (repositories == null) {
+            repositories = getPublicationServices().createRepositoryHandler();
+        }
         return repositories;
     }
 
@@ -115,7 +115,7 @@ public void setConfiguration(Configuration configuration) {
      * Configures the set of repositories to upload to.
      */
     public RepositoryHandler repositories(Closure configureClosure) {
-        return ConfigureUtil.configure(configureClosure, repositories);
+        return ConfigureUtil.configure(configureClosure, getRepositories());
     }
 
     /**
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/bundling/Jar.groovy b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/bundling/Jar.groovy
index f64f02e46f35..ae9d2fb0dc80 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/bundling/Jar.groovy
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/bundling/Jar.groovy
@@ -18,13 +18,11 @@ package org.gradle.api.tasks.bundling
 
 import org.gradle.api.file.CopySpec
 import org.gradle.api.file.FileCopyDetails
-import org.gradle.api.internal.file.FileResolver
 import org.gradle.api.internal.file.collections.FileTreeAdapter
 import org.gradle.api.internal.file.collections.MapFileTree
 import org.gradle.api.internal.file.copy.DefaultCopySpec
 import org.gradle.api.java.archives.Manifest
 import org.gradle.api.java.archives.internal.DefaultManifest
-import org.gradle.internal.nativeplatform.filesystem.Chmod
 import org.gradle.util.ConfigureUtil
 
 /**
@@ -38,11 +36,11 @@ public class Jar extends Zip {
 
     Jar() {
         extension = DEFAULT_EXTENSION
-        manifest = new DefaultManifest(getServices().get(FileResolver))
+        manifest = new DefaultManifest(fileResolver)
         // Add these as separate specs, so they are not affected by the changes to the main spec
         metaInf = rootSpec.addFirst().into('META-INF')
         metaInf.addChild().from {
-            MapFileTree manifestSource = new MapFileTree(temporaryDirFactory, services.get(Chmod))
+            MapFileTree manifestSource = new MapFileTree(temporaryDirFactory, fileSystem)
             manifestSource.add('MANIFEST.MF') {OutputStream outstr ->
                 Manifest manifest = getManifest() ?: new DefaultManifest(null)
                 manifest.writeTo(new OutputStreamWriter(outstr))
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/Compile.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/Compile.java
deleted file mode 100644
index 7eedf8db19b3..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/Compile.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.tasks.compile;
-
-import org.gradle.api.AntBuilder;
-import org.gradle.api.file.FileCollection;
-import org.gradle.api.file.FileTree;
-import org.gradle.api.file.SourceDirectorySet;
-import org.gradle.api.internal.file.FileOperations;
-import org.gradle.api.internal.hash.DefaultHasher;
-import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.api.internal.tasks.compile.*;
-import org.gradle.api.internal.tasks.compile.Compiler;
-import org.gradle.api.internal.tasks.compile.daemon.CompilerDaemonManager;
-import org.gradle.api.internal.tasks.compile.incremental.*;
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfoExtractor;
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfoSerializer;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
-import org.gradle.api.tasks.Nested;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.WorkResult;
-import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
-import org.gradle.internal.Factory;
-import org.gradle.util.Clock;
-import org.gradle.util.DeprecationLogger;
-import org.gradle.util.SingleMessageLogger;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
-import static java.util.Collections.emptyList;
-
-/**
- * Compiles Java source files.
- *
- * @deprecated This class has been replaced by {@link JavaCompile}.
- */
-@Deprecated
-public class Compile extends AbstractCompile {
-
-    private static final Logger LOG = Logging.getLogger(Compile.class);
-
-    private Compiler<JavaCompileSpec> cleaningCompiler;
-    private File dependencyCacheDir;
-    private final CompileOptions compileOptions = new CompileOptions();
-    private final Compiler<JavaCompileSpec> javaCompiler;
-    private final IncrementalCompilationSupport incrementalCompilation;
-
-    public Compile() {
-        if (!(this instanceof JavaCompile)) {
-            DeprecationLogger.nagUserOfReplacedTaskType("Compile", "JavaCompile task type");
-        }
-        Factory<AntBuilder> antBuilderFactory = getServices().getFactory(AntBuilder.class);
-        JavaCompilerFactory inProcessCompilerFactory = new InProcessJavaCompilerFactory();
-        ProjectInternal projectInternal = (ProjectInternal) getProject();
-        CompilerDaemonManager compilerDaemonManager = getServices().get(CompilerDaemonManager.class);
-        JavaCompilerFactory defaultCompilerFactory = new DefaultJavaCompilerFactory(projectInternal, antBuilderFactory, inProcessCompilerFactory, compilerDaemonManager);
-        javaCompiler = new DelegatingJavaCompiler(defaultCompilerFactory);
-        cleaningCompiler = new CleaningJavaCompiler(javaCompiler, antBuilderFactory, getOutputs());
-        JarSnapshotFeeder jarSnapshotFeeder = new JarSnapshotFeeder(getJarSnapshotCache(), new JarSnapshotter(new DefaultHasher()));
-        incrementalCompilation = new IncrementalCompilationSupport(jarSnapshotFeeder);
-    }
-
-    private FileCollection compileClasspath; //TODO SF remove this hack
-
-    @TaskAction
-    protected void compile(IncrementalTaskInputs inputs) {
-        if (!maybeCompileIncrementally(inputs)) {
-            compile();
-        }
-        incrementalCompilation.compilationComplete(compileOptions,
-                new ClassDependencyInfoExtractor(getDestinationDir()),
-                getDependencyInfoSerializer(), Collections.<JarArchive>emptyList());
-    }
-
-    private ClassDependencyInfoSerializer getDependencyInfoSerializer() {
-        return new ClassDependencyInfoSerializer(new File(getProject().getBuildDir(), "class-info.bin"));
-    }
-
-    private boolean maybeCompileIncrementally(IncrementalTaskInputs inputs) {
-        if (!compileOptions.isIncremental()) {
-            return false;
-        }
-        //hack
-        List<File> sourceDirs = getSourceDirs();
-        if (sourceDirs.isEmpty()) {
-            LOG.lifecycle("{} cannot run incrementally because Gradle cannot infer the source directories.", getPath());
-            return false;
-        }
-        if (!inputs.isIncremental()) {
-            LOG.lifecycle("{} is not incremental (e.g. outputs have changed, no previous execution, etc). Using regular compile.", getPath());
-            return false;
-        }
-        ClassDependencyInfoSerializer dependencyInfoSerializer = getDependencyInfoSerializer();
-        if (!dependencyInfoSerializer.isInfoAvailable()) {
-            //TODO SF let's unit test a scenario when after regular compilation incremental compilation is scheduled
-            LOG.lifecycle("{} is not incremental because there is no class dependency data left from previous incremental build.", getPath());
-            return false;
-        }
-
-        SingleMessageLogger.incubatingFeatureUsed("Incremental java compilation");
-
-        SelectiveJavaCompiler compiler = new SelectiveJavaCompiler(javaCompiler, getProject().fileTree(getDestinationDir()));
-        SelectiveCompilation selectiveCompilation = new SelectiveCompilation(inputs, getSource(), getClasspath(), getDestinationDir(),
-                dependencyInfoSerializer, getJarSnapshotCache(), compiler, sourceDirs, (FileOperations) getProject());
-
-        if (!selectiveCompilation.getCompilationNeeded()) {
-            LOG.lifecycle("{} does not require recompilation. Skipping the compiler.", getPath());
-            return true;
-        }
-
-        Clock clock = new Clock();
-        performCompilation(selectiveCompilation.getSource(), selectiveCompilation.getClasspath(), selectiveCompilation.getFullRebuildRequired()? cleaningCompiler : compiler);
-        LOG.lifecycle("{} - incremental compilation took {}", getPath(), clock.getTime());
-
-        return true;
-    }
-
-    private List<File> getSourceDirs() {
-        List<File> sourceDirs = new LinkedList<File>();
-        for (Object s : source) {
-            if (s instanceof SourceDirectorySet) {
-                sourceDirs.addAll(((SourceDirectorySet) s).getSrcDirs());
-            } else {
-                return emptyList();
-            }
-        }
-        return sourceDirs;
-    }
-
-    protected void compile() {
-        FileTree source = getSource();
-        FileCollection classpath = getClasspath();
-
-        performCompilation(source, classpath, cleaningCompiler);
-    }
-
-    private void performCompilation(FileCollection source, FileCollection classpath, Compiler<JavaCompileSpec> compiler) {
-        DefaultJavaCompileSpec spec = new DefaultJavaCompileSpec();
-        spec.setSource(source);
-        spec.setDestinationDir(getDestinationDir());
-        spec.setClasspath(classpath);
-        spec.setDependencyCacheDir(getDependencyCacheDir());
-        spec.setSourceCompatibility(getSourceCompatibility());
-        spec.setTargetCompatibility(getTargetCompatibility());
-        spec.setCompileOptions(compileOptions);
-        WorkResult result = compiler.execute(spec);
-        setDidWork(result.getDidWork());
-        compileClasspath = classpath;
-    }
-
-    private JarSnapshotCache getJarSnapshotCache() {
-        //hack, needs fixing
-        return new JarSnapshotCache(new File(getProject().getRootProject().getProjectDir(), ".gradle/jar-snapshot-cache.bin"));
-    }
-
-    @OutputDirectory
-    public File getDependencyCacheDir() {
-        return dependencyCacheDir;
-    }
-
-    public void setDependencyCacheDir(File dependencyCacheDir) {
-        this.dependencyCacheDir = dependencyCacheDir;
-    }
-
-    /**
-     * Returns the compilation options.
-     *
-     * @return The compilation options.
-     */
-    @Nested
-    public CompileOptions getOptions() {
-        return compileOptions;
-    }
-
-    /**
-     * This method was never intended to be used by the users.
-     *
-     * @return the compiler
-     */
-    @Deprecated
-    public Compiler<JavaCompileSpec> getJavaCompiler() {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("Compile.getJavaCompiler()");
-        return cleaningCompiler;
-    }
-
-    /**
-     * This method was never intended to be used by the users.
-     *
-     * @param javaCompiler to set
-     */
-    @Deprecated
-    public void setJavaCompiler(Compiler<JavaCompileSpec> javaCompiler) {
-        DeprecationLogger.nagUserOfDiscontinuedMethod("Compile.setJavaCompiler(Compiler<JavaCompileSpec>)");
-        this.cleaningCompiler = javaCompiler;
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/CompileOptions.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/CompileOptions.java
index b5844d5fb315..bebc9a01b6ac 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/CompileOptions.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/CompileOptions.java
@@ -22,7 +22,6 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.Optional;
-import org.gradle.util.DeprecationLogger;
 import org.gradle.util.SingleMessageLogger;
 
 import java.util.List;
@@ -35,7 +34,7 @@ public class CompileOptions extends AbstractOptions {
     private static final long serialVersionUID = 0;
 
     private static final ImmutableSet<String> EXCLUDE_FROM_ANT_PROPERTIES =
-            ImmutableSet.of("debugOptions", "forkOptions", "compilerArgs", "dependOptions", "useDepend", "useAnt", "incremental");
+            ImmutableSet.of("debugOptions", "forkOptions", "compilerArgs", "dependOptions", "useDepend", "incremental");
 
     private boolean failOnError = true;
 
@@ -49,8 +48,6 @@ public class CompileOptions extends AbstractOptions {
 
     private String encoding;
 
-    private boolean optimize;
-
     private boolean debug = true;
 
     private DebugOptions debugOptions = new DebugOptions();
@@ -63,17 +60,12 @@ public class CompileOptions extends AbstractOptions {
 
     private DependOptions dependOptions = new DependOptions();
 
-    private String compiler;
-
-    private boolean includeJavaRuntime;
-
     private String bootClasspath;
 
     private String extensionDirs;
 
     private List<String> compilerArgs = Lists.newArrayList();
 
-    private boolean useAnt;
     private boolean incremental;
 
     /**
@@ -84,17 +76,6 @@ public boolean isFailOnError() {
         return failOnError;
     }
 
-    /**
-     * Deprecated.
-     *
-     * @deprecated use {@link #isFailOnError()}
-     */
-    @Deprecated
-    public boolean getFailOnError() {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("CompileOptions.getFailOnError()", "CompileOptions.isFailOnError()");
-        return failOnError;
-    }
-
     /**
      * Sets whether to fail the build when compilation fails. Defaults to {@code true}.
      */
@@ -176,41 +157,6 @@ public void setEncoding(String encoding) {
         this.encoding = encoding;
     }
 
-    /**
-     * Tells whether to produce optimized byte code. Only takes effect if {@code useAnt} is {@code true}.
-     * Note that this flag is ignored by Sun's javac starting with JDK 1.3.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public boolean isOptimize() {
-        return optimize;
-    }
-
-    /**
-     * Tells whether to produce optimized byte code. Only takes effect if {@code useAnt} is {@code true}.
-     * Note that this flag is ignored by Sun's javac starting with JDK 1.3.
-     *
-     * @deprecated No replacement
-     */
-    @Input
-    @Deprecated
-    public boolean getOptimize() {
-        return optimize;
-    }
-
-    /**
-     * Sets whether to produce optimized byte code. Only takes effect if {@code useAnt} is {@code true}.
-     * Note that this flag is ignored by Sun's javac starting with JDK 1.3.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public void setOptimize(boolean optimize) {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("CompileOptions.optimize", "There is no replacement for this property.");
-        this.optimize = optimize;
-    }
-
     /**
      * Tells whether to include debugging information in the generated class files. Defaults
      * to {@code true}. See {@link DebugOptions#getDebugLevel()} for which debugging information will be generated.
@@ -220,17 +166,6 @@ public boolean isDebug() {
         return debug;
     }
 
-    /**
-     * Deprecated.
-     *
-     * @deprecated use {@link #isDebug()}
-     */
-    @Deprecated
-    public boolean getDebug() {
-        DeprecationLogger.nagUserOfReplacedMethod("CompileOptions.getDebug()", "CompileOptions.isDebug()");
-        return debug;
-    }
-
     /**
      * Sets whether to include debugging information in the generated class files. Defaults
      * to {@code true}. See {@link DebugOptions#getDebugLevel()} for which debugging information will be generated.
@@ -319,64 +254,6 @@ public void setDependOptions(DependOptions dependOptions) {
         this.dependOptions = dependOptions;
     }
 
-    /**
-     * Returns the compiler to be used. Only takes effect if {@code useAnt} is {@code true}.
-     *
-     * @deprecated use {@code CompileOptions.forkOptions.executable} instead
-     */
-    @Deprecated
-    @Input @Optional
-    public String getCompiler() {
-        return compiler;
-    }
-
-    /**
-     * Sets the compiler to be used. Only takes effect if {@code useAnt} is {@code true}.
-     *
-     * @deprecated use {@code CompileOptions.forkOptions.executable instead}
-     */
-    @Deprecated
-    public void setCompiler(String compiler) {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("CompileOptions.compiler", "To use an alternative compiler, "
-                + "set 'CompileOptions.fork' to 'true', and 'CompileOptions.forkOptions.executable' to the path of the compiler executable.");
-        this.compiler = compiler;
-    }
-
-    /**
-     * Tells whether the Java runtime should be put on the compile class path. Only takes effect if
-     * {@code useAnt} is {@code true}. Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public boolean isIncludeJavaRuntime() {
-        return includeJavaRuntime;
-    }
-
-    /**
-     * Tells whether the Java runtime should be put on the compile class path. Only takes effect if
-     * {@code useAnt} is {@code true}. Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Input
-    @Deprecated
-    public boolean getIncludeJavaRuntime() {
-        return includeJavaRuntime;
-    }
-
-    /**
-     * Sets whether the Java runtime should be put on the compile class path. Only takes effect if
-     * {@code useAnt} is {@code true}. Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public void setIncludeJavaRuntime(boolean includeJavaRuntime) {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("CompileOptions.includeJavaRuntime", "There is no replacement for this property.");
-        this.includeJavaRuntime = includeJavaRuntime;
-    }
-
     /**
      * Returns the bootstrap classpath to be used for the compiler process.
      * Only takes effect if {@code fork} is {@code true}. Defaults to {@code null}.
@@ -430,29 +307,6 @@ public void setCompilerArgs(List<String> compilerArgs) {
         this.compilerArgs = compilerArgs;
     }
 
-    /**
-     * Tells whether to use the Ant javac task over Gradle's own Java compiler integration.
-     * Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public boolean isUseAnt() {
-        return useAnt;
-    }
-
-    /**
-     * Sets whether to use the Ant javac task over Gradle's own Java compiler integration.
-     * Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public void setUseAnt(boolean useAnt) {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("CompileOptions.useAnt", "There is no replacement for this property.");
-        this.useAnt = useAnt;
-    }
-
     /**
      * Convenience method to set {@link ForkOptions} with named parameter syntax.
      * Calling this method will set {@code fork} to {@code true}.
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompile.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompile.java
index 1bfffb86c073..8bcce868480b 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompile.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompile.java
@@ -16,22 +16,18 @@
 
 package org.gradle.api.tasks.compile;
 
-import org.gradle.api.AntBuilder;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.file.FileCollection;
-import org.gradle.api.internal.ClassPathRegistry;
 import org.gradle.api.internal.file.TemporaryFileProvider;
-import org.gradle.api.internal.project.IsolatedAntBuilder;
 import org.gradle.api.internal.project.ProjectInternal;
-import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.internal.tasks.compile.*;
+import org.gradle.api.internal.tasks.compile.Compiler;
 import org.gradle.api.internal.tasks.compile.daemon.CompilerDaemonManager;
 import org.gradle.api.internal.tasks.compile.daemon.InProcessCompilerDaemonFactory;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.WorkResult;
-import org.gradle.internal.Factory;
 import org.gradle.util.GFileUtils;
 
 import java.io.File;
@@ -44,22 +40,6 @@ public class GroovyCompile extends AbstractCompile {
     private FileCollection groovyClasspath;
     private final CompileOptions compileOptions = new CompileOptions();
     private final GroovyCompileOptions groovyCompileOptions = new GroovyCompileOptions();
-    private final TemporaryFileProvider tempFileProvider;
-
-    public GroovyCompile() {
-        ProjectInternal projectInternal = (ProjectInternal) getProject();
-        IsolatedAntBuilder antBuilder = getServices().get(IsolatedAntBuilder.class);
-        ClassPathRegistry classPathRegistry = getServices().get(ClassPathRegistry.class);
-        Factory<AntBuilder> antBuilderFactory = getServices().getFactory(AntBuilder.class);
-        JavaCompilerFactory inProcessCompilerFactory = new InProcessJavaCompilerFactory();
-        tempFileProvider = projectInternal.getServices().get(TemporaryFileProvider.class);
-        CompilerDaemonManager compilerDaemonManager = getServices().get(CompilerDaemonManager.class);
-        InProcessCompilerDaemonFactory inProcessCompilerDaemonFactory = getServices().get(InProcessCompilerDaemonFactory.class);
-        DefaultJavaCompilerFactory javaCompilerFactory = new DefaultJavaCompilerFactory(projectInternal, antBuilderFactory, inProcessCompilerFactory, compilerDaemonManager);
-        GroovyCompilerFactory groovyCompilerFactory = new GroovyCompilerFactory(projectInternal, antBuilder, classPathRegistry, javaCompilerFactory, compilerDaemonManager, inProcessCompilerDaemonFactory);
-        Compiler<GroovyJavaJointCompileSpec> delegatingCompiler = new DelegatingGroovyCompiler(groovyCompilerFactory);
-        compiler = new CleaningGroovyCompiler(delegatingCompiler, getOutputs());
-    }
 
     @TaskAction
     protected void compile() {
@@ -74,11 +54,12 @@ protected void compile() {
         spec.setCompileOptions(compileOptions);
         spec.setGroovyCompileOptions(groovyCompileOptions);
         if (spec.getGroovyCompileOptions().getStubDir() == null) {
+            TemporaryFileProvider tempFileProvider = getServices().get(TemporaryFileProvider.class);
             File dir = tempFileProvider.newTemporaryFile("groovy-java-stubs");
             GFileUtils.mkdirs(dir);
             spec.getGroovyCompileOptions().setStubDir(dir);
         }
-        WorkResult result = compiler.execute(spec);
+        WorkResult result = getCompiler().execute(spec);
         setDidWork(result.getDidWork());
     }
 
@@ -130,6 +111,16 @@ public void setGroovyClasspath(FileCollection groovyClasspath) {
     }
 
     public Compiler<GroovyJavaJointCompileSpec> getCompiler() {
+        if (compiler == null) {
+            ProjectInternal projectInternal = (ProjectInternal) getProject();
+            JavaCompilerFactory inProcessCompilerFactory = new InProcessJavaCompilerFactory();
+            CompilerDaemonManager compilerDaemonManager = getServices().get(CompilerDaemonManager.class);
+            InProcessCompilerDaemonFactory inProcessCompilerDaemonFactory = getServices().get(InProcessCompilerDaemonFactory.class);
+            DefaultJavaCompilerFactory javaCompilerFactory = new DefaultJavaCompilerFactory(projectInternal, inProcessCompilerFactory, compilerDaemonManager);
+            GroovyCompilerFactory groovyCompilerFactory = new GroovyCompilerFactory(projectInternal, javaCompilerFactory, compilerDaemonManager, inProcessCompilerDaemonFactory);
+            Compiler<GroovyJavaJointCompileSpec> delegatingCompiler = new DelegatingGroovyCompiler(groovyCompilerFactory);
+            compiler = new CleaningGroovyCompiler(delegatingCompiler, getOutputs());
+        }
         return compiler;
     }
 
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompileOptions.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompileOptions.java
index 4bb05ec06e5f..695eb844512b 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompileOptions.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/GroovyCompileOptions.java
@@ -20,7 +20,6 @@
 import com.google.common.collect.Maps;
 import org.gradle.api.Incubating;
 import org.gradle.api.tasks.Input;
-import org.gradle.util.DeprecationLogger;
 
 import java.io.File;
 import java.util.List;
@@ -32,7 +31,7 @@
 public class GroovyCompileOptions extends AbstractOptions {
     private static final long serialVersionUID = 0;
     private static final ImmutableSet<String> EXCLUDE_FROM_ANT_PROPERTIES =
-            ImmutableSet.of("forkOptions", "optimizationOptions", "useAnt", "stubDir", "keepStubs", "fileExtensions");
+            ImmutableSet.of("forkOptions", "optimizationOptions", "stubDir", "keepStubs", "fileExtensions");
 
     private boolean failOnError = true;
 
@@ -52,12 +51,6 @@ public class GroovyCompileOptions extends AbstractOptions {
 
     private Map<String, Boolean> optimizationOptions = Maps.newHashMap();
 
-    private boolean stacktrace;
-
-    private boolean useAnt;
-
-    private boolean includeJavaRuntime;
-
     private File stubDir;
 
     /**
@@ -174,80 +167,6 @@ public void setOptimizationOptions(Map<String, Boolean> optimizationOptions) {
         this.optimizationOptions = optimizationOptions;
     }
 
-    /**
-     * Tells whether to print a stack trace when the compiler hits a problem (like a compile error).
-     * Defaults to {@code false}. Only used when {@link #isUseAnt()} is {@code true}.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public boolean isStacktrace() {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("GroovyCompileOptions.stacktrace", "There is no replacement for this property.");
-        return stacktrace;
-    }
-
-    /**
-     * Sets whether to print a stack trace when the compiler hits a problem (like a compile error).
-     * Defaults to {@code false}. Only used when {@link #isUseAnt()} is {@code true}.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public void setStacktrace(boolean stacktrace) {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("GroovyCompileOptions.stacktrace", "This property has no replacement.");
-        this.stacktrace = stacktrace;
-    }
-
-    /**
-     * Tells whether the groovyc Ant task should be used over Gradle's own Groovy compiler integration.
-     * Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Input
-    @Deprecated
-    public boolean isUseAnt() {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("GroovyCompileOptions.useAnt", "There is no replacement for this property.");
-        return useAnt;
-    }
-
-    /**
-     * Sets whether the groovyc Ant task should be used over Gradle's own Groovy compiler integration.
-     * Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public void setUseAnt(boolean useAnt) {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("GroovyCompileOptions.useAnt", "There is no replacement for this property.");
-        this.useAnt = useAnt;
-    }
-
-    /**
-     * Tells whether the Java runtime should be put on the compile class path. Only takes effect if
-     * {@code useAnt} is {@code true}. Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Input
-    @Deprecated
-    public boolean isIncludeJavaRuntime() {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("GroovyCompileOptions.includeJavaRuntime", "There is no replacement for this property.");
-        return includeJavaRuntime;
-    }
-
-    /**
-     * Sets whether the Java runtime should be put on the compile class path. Only takes effect if
-     * {@code useAnt} is {@code true}. Defaults to {@code false}.
-     *
-     * @deprecated No replacement
-     */
-    @Deprecated
-    public void setIncludeJavaRuntime(boolean includeJavaRuntime) {
-        DeprecationLogger.nagUserOfDiscontinuedProperty("GroovyCompileOptions.includeJavaRuntime", "There is no replacement for this property.");
-        this.includeJavaRuntime = includeJavaRuntime;
-    }
-
     /**
      * Returns the directory where Java stubs for Groovy classes will be stored during Java/Groovy joint
      * compilation. Defaults to {@code null}, in which case a temporary directory will be used.
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/JavaCompile.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/JavaCompile.java
index e9884f918f6b..458668129f12 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/JavaCompile.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/compile/JavaCompile.java
@@ -16,6 +16,22 @@
 
 package org.gradle.api.tasks.compile;
 
+import org.gradle.api.AntBuilder;
+import org.gradle.api.internal.project.ProjectInternal;
+import org.gradle.api.internal.tasks.compile.*;
+import org.gradle.api.internal.tasks.compile.Compiler;
+import org.gradle.api.internal.tasks.compile.daemon.CompilerDaemonManager;
+import org.gradle.api.internal.tasks.compile.incremental.IncrementalJavaCompilerFactory;
+import org.gradle.api.tasks.Nested;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.TaskAction;
+import org.gradle.api.tasks.WorkResult;
+import org.gradle.api.tasks.incremental.IncrementalTaskInputs;
+import org.gradle.internal.Factory;
+import org.gradle.util.SingleMessageLogger;
+
+import java.io.File;
+
 /**
  * Compiles Java source files.
  *
@@ -27,5 +43,67 @@
  *     }
  * </pre>
  */
-public class JavaCompile extends Compile {
+public class JavaCompile extends AbstractCompile {
+    private File dependencyCacheDir;
+    private final CompileOptions compileOptions = new CompileOptions();
+
+    @TaskAction
+    protected void compile(IncrementalTaskInputs inputs) {
+        if (!compileOptions.isIncremental()) {
+            compile();
+            return;
+        }
+
+        SingleMessageLogger.incubatingFeatureUsed("Incremental java compilation");
+
+        IncrementalJavaCompilerFactory factory = new IncrementalJavaCompilerFactory(getProject(), getPath(), createCompiler(), source);
+        Compiler<JavaCompileSpec> compiler = factory.createCompiler(inputs);
+        performCompilation(compiler);
+    }
+
+    protected void compile() {
+        performCompilation(createCompiler());
+    }
+
+    private CleaningJavaCompiler createCompiler() {
+        Factory<AntBuilder> antBuilderFactory = getServices().getFactory(AntBuilder.class);
+        JavaCompilerFactory inProcessCompilerFactory = new InProcessJavaCompilerFactory();
+        ProjectInternal projectInternal = (ProjectInternal) getProject();
+        CompilerDaemonManager compilerDaemonManager = getServices().get(CompilerDaemonManager.class);
+        JavaCompilerFactory defaultCompilerFactory = new DefaultJavaCompilerFactory(projectInternal, inProcessCompilerFactory, compilerDaemonManager);
+        DelegatingJavaCompiler javaCompiler = new DelegatingJavaCompiler(defaultCompilerFactory);
+        return new CleaningJavaCompiler(javaCompiler, antBuilderFactory, getOutputs());
+    }
+
+    private void performCompilation(Compiler<JavaCompileSpec> compiler) {
+        DefaultJavaCompileSpec spec = new DefaultJavaCompileSpec();
+        spec.setSource(getSource());
+        spec.setDestinationDir(getDestinationDir());
+        spec.setClasspath(getClasspath());
+        spec.setDependencyCacheDir(getDependencyCacheDir());
+        spec.setSourceCompatibility(getSourceCompatibility());
+        spec.setTargetCompatibility(getTargetCompatibility());
+        spec.setCompileOptions(compileOptions);
+        WorkResult result = compiler.execute(spec);
+        setDidWork(result.getDidWork());
+    }
+
+    @OutputDirectory
+    public File getDependencyCacheDir() {
+        return dependencyCacheDir;
+    }
+
+    public void setDependencyCacheDir(File dependencyCacheDir) {
+        this.dependencyCacheDir = dependencyCacheDir;
+    }
+
+    /**
+     * Returns the compilation options.
+     *
+     * @return The compilation options.
+     */
+    @Nested
+    public CompileOptions getOptions() {
+        return compileOptions;
+    }
 }
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/AntJavadoc.groovy b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/AntJavadoc.groovy
deleted file mode 100644
index 9446beb1cf54..000000000000
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/AntJavadoc.groovy
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.tasks.javadoc
-
-/**
- * @deprecated No replacement
- */
-@Deprecated
-class AntJavadoc {
-    void execute(List<File> sourceDirs, File destDir, Set<File> classpathFiles, String windowTitle, String maxMemory,
-                 List<String> includes, List<String> excludes, boolean verbose, AntBuilder ant) {
-        Map otherArgs = [:]
-        if (maxMemory) {otherArgs.maxmemory = maxMemory}
-        if (windowTitle) {
-            otherArgs.windowtitle = windowTitle
-            otherArgs.doctitle = "<p>$windowTitle</p>"
-        }
-        ant.javadoc([destdir: destDir, failonerror: true, verbose: verbose] + otherArgs) {
-            sourceDirs.each {
-                fileset(dir: it) {
-                    includes.each {
-                        include(name: it)
-                    }
-                    excludes.each {
-                        exclude(name: it)
-                    }
-                    // This looks wrong. However, javadoc fails when package.html files are included explicitly. Javadoc
-                    // will include them in the documentation even if they are not included. So, exclude them.
-                    exclude(name: '**/package.html')
-                }
-            }
-            classpathFiles.each {
-                classpath(location: it)
-            }
-        }
-    }
-}
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
index 19011e9ecc1a..4296cb3914db 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
@@ -21,7 +21,12 @@
 import org.gradle.api.internal.ClassPathRegistry;
 import org.gradle.api.internal.project.IsolatedAntBuilder;
 import org.gradle.api.logging.LogLevel;
-import org.gradle.api.tasks.*;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Optional;
+import org.gradle.api.tasks.OutputDirectory;
+import org.gradle.api.tasks.SourceTask;
+import org.gradle.api.tasks.TaskAction;
 
 import java.io.File;
 import java.io.Serializable;
@@ -62,15 +67,12 @@ public class Groovydoc extends SourceTask {
 
     public Groovydoc() {
         getLogging().captureStandardOutput(LogLevel.INFO);
-        IsolatedAntBuilder antBuilder = getServices().get(IsolatedAntBuilder.class);
-        ClassPathRegistry classPathRegistry = getServices().get(ClassPathRegistry.class);
-        antGroovydoc = new AntGroovydoc(antBuilder, classPathRegistry);
     }
 
     @TaskAction
     protected void generate() {
         checkGroovyClasspathNonEmpty(getGroovyClasspath().getFiles());
-        antGroovydoc.execute(getSource(), getDestinationDir(), isUse(), getWindowTitle(), getDocTitle(), getHeader(),
+        getAntGroovydoc().execute(getSource(), getDestinationDir(), isUse(), getWindowTitle(), getDocTitle(), getHeader(),
                 getFooter(), getOverview(), isIncludePrivate(), getLinks(), getGroovyClasspath(), getClasspath(), getProject());
     }
 
@@ -132,6 +134,11 @@ public void setClasspath(FileCollection classpath) {
     }
 
     public AntGroovydoc getAntGroovydoc() {
+        if (antGroovydoc == null) {
+            IsolatedAntBuilder antBuilder = getServices().get(IsolatedAntBuilder.class);
+            ClassPathRegistry classPathRegistry = getServices().get(ClassPathRegistry.class);
+            antGroovydoc = new AntGroovydoc(antBuilder, classPathRegistry);
+        }
         return antGroovydoc;
     }
 
@@ -157,7 +164,8 @@ public void setUse(boolean use) {
     /**
      * Returns the browser window title for the documentation. Set to {@code null} when there is no window title.
      */
-    @Input @Optional
+    @Input
+    @Optional
     public String getWindowTitle() {
         return windowTitle;
     }
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/Test.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/Test.java
index be295e021303..3d816ee0f6e1 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/Test.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/Test.java
@@ -64,7 +64,6 @@
 import org.gradle.process.internal.DefaultJavaForkOptions;
 import org.gradle.process.internal.WorkerProcessBuilder;
 import org.gradle.util.ConfigureUtil;
-import org.gradle.util.DeprecationLogger;
 
 import javax.inject.Inject;
 import java.io.File;
@@ -120,9 +119,6 @@ public class Test extends ConventionTask implements JavaForkOptions, PatternFilt
 
     private final ListenerBroadcast<TestListener> testListenerBroadcaster;
     private final ListenerBroadcast<TestOutputListener> testOutputListenerBroadcaster;
-    private final StyledTextOutputFactory textOutputFactory;
-    private final Instantiator instantiator;
-    private final ProgressLoggerFactory progressLoggerFactory;
     private final TestLoggingContainer testLogging;
     private final DefaultJavaForkOptions forkOptions;
     private final DefaultTestFilter filter;
@@ -143,20 +139,14 @@ public class Test extends ConventionTask implements JavaForkOptions, PatternFilt
     @Nested
     private final DefaultTestTaskReports reports;
 
-    @Inject
-    public Test(ListenerManager listenerManager, StyledTextOutputFactory textOutputFactory, FileResolver fileResolver,
-                Factory<WorkerProcessBuilder> processBuilderFactory, ActorFactory actorFactory, Instantiator instantiator,
-                ProgressLoggerFactory progressLoggerFactory) {
-        this.progressLoggerFactory = progressLoggerFactory;
-        this.instantiator = instantiator;
+    public Test() {
+        ListenerManager listenerManager = getListenerManager();
         testListenerBroadcaster = listenerManager.createAnonymousBroadcaster(TestListener.class);
         testOutputListenerBroadcaster = listenerManager.createAnonymousBroadcaster(TestOutputListener.class);
-        this.textOutputFactory = textOutputFactory;
-        forkOptions = new DefaultJavaForkOptions(fileResolver);
+        forkOptions = new DefaultJavaForkOptions(getFileResolver());
         forkOptions.setEnableAssertions(true);
-        testExecuter = new DefaultTestExecuter(processBuilderFactory, actorFactory);
+        Instantiator instantiator = getInstantiator();
         testLogging = instantiator.newInstance(DefaultTestLoggingContainer.class, instantiator);
-        testReporter = new DefaultTestReport();
 
         reports = instantiator.newInstance(DefaultTestTaskReports.class, this);
         reports.getJunitXml().setEnabled(true);
@@ -165,6 +155,41 @@ public Test(ListenerManager listenerManager, StyledTextOutputFactory textOutputF
         filter = instantiator.newInstance(DefaultTestFilter.class);
     }
 
+    @Inject
+    protected ProgressLoggerFactory getProgressLoggerFactory() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected ActorFactory getActorFactory() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected Factory<WorkerProcessBuilder> getProcessBuilderFactory() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected FileResolver getFileResolver() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected StyledTextOutputFactory getTextOutputFactory() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Inject
+    protected ListenerManager getListenerManager() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * ATM. for testing only
      */
@@ -444,7 +469,7 @@ public void executeTests() {
         LogLevel currentLevel = getCurrentLogLevel();
         TestLogging levelLogging = testLogging.get(currentLevel);
         TestExceptionFormatter exceptionFormatter = getExceptionFormatter(levelLogging);
-        TestEventLogger eventLogger = new TestEventLogger(textOutputFactory, currentLevel, levelLogging, exceptionFormatter);
+        TestEventLogger eventLogger = new TestEventLogger(getTextOutputFactory(), currentLevel, levelLogging, exceptionFormatter);
         addTestListener(eventLogger);
         addTestOutputListener(eventLogger);
         if (!getFilter().getIncludePatterns().isEmpty()) {
@@ -464,15 +489,20 @@ public void executeTests() {
         addTestListener(testReportDataCollector);
         addTestOutputListener(testReportDataCollector);
 
-        TestCountLogger testCountLogger = new TestCountLogger(progressLoggerFactory);
+        TestCountLogger testCountLogger = new TestCountLogger(getProgressLoggerFactory());
         addTestListener(testCountLogger);
 
         TestResultProcessor resultProcessor = new TestListenerAdapter(
                 getTestListenerBroadcaster().getSource(), testOutputListenerBroadcaster.getSource());
 
+        if (testExecuter == null) {
+            testExecuter = new DefaultTestExecuter(getProcessBuilderFactory(), getActorFactory());
+        }
+
         try {
             testExecuter.execute(this, resultProcessor);
         } finally {
+            testExecuter = null;
             testListenerBroadcaster.removeAll();
             testOutputListenerBroadcaster.removeAll();
             outputWriter.close();
@@ -483,6 +513,10 @@ public void executeTests() {
         TestResultsProvider testResultsProvider = new InMemoryTestResultsProvider(results.values(), testOutputStore.reader());
 
         try {
+            if (testReporter == null) {
+                testReporter = new DefaultTestReport();
+            }
+
             JUnitXmlReport junitXml = reports.getJunitXml();
             if (junitXml.isEnabled()) {
                 TestOutputAssociation outputAssociation = junitXml.isOutputPerTestCase()
@@ -500,16 +534,15 @@ public void executeTests() {
             }
         } finally {
             CompositeStoppable.stoppable(testResultsProvider).stop();
+            testReporter = null;
+            testFramework = null;
         }
 
-        testFramework = null;
-
         if (testCountLogger.hadFailures()) {
             handleTestFailures();
         }
     }
 
-
     /**
      * Returns the {@link org.gradle.api.tasks.testing.TestListener} broadcaster.  This broadcaster will send messages to all listeners that have been registered with the ListenerManager.
      */
@@ -716,30 +749,6 @@ public void setTestClassesDir(File testClassesDir) {
         this.testClassesDir = testClassesDir;
     }
 
-    /**
-     * Returns the root folder for the test results in XML format.
-     *
-     * @return the test result directory, containing the test results in XML format.
-     * @deprecated Replaced by {@code getReports().getJunitXml().getDestination()}
-     */
-    @Deprecated
-    public File getTestResultsDir() {
-        DeprecationLogger.nagUserOfReplacedProperty("Test.testResultsDir", "Test.getReports().getJunitXml().getDestination()");
-        return reports.getJunitXml().getDestination();
-    }
-
-    /**
-     * Sets the root folder for the test results.
-     *
-     * @param testResultsDir The root folder
-     * @deprecated Replaced by {@code getReports().getJunitXml().setDestination()}
-     */
-    @Deprecated
-    public void setTestResultsDir(File testResultsDir) {
-        DeprecationLogger.nagUserOfReplacedProperty("Test.testResultsDir", "Test.getReports().getJunitXml().setDestination()");
-        reports.getJunitXml().setDestination(testResultsDir);
-    }
-
     /**
      * Returns the root folder for the test results in internal binary format.
      *
@@ -761,30 +770,6 @@ public void setBinResultsDir(File binResultsDir) {
         this.binResultsDir = binResultsDir;
     }
 
-    /**
-     * Returns the root folder for the test reports.
-     *
-     * @return the test report directory, containing the test report mostly in HTML form.
-     * @deprecated Replaced by {@code getReports().getHtml().getDestination()}
-     */
-    @Deprecated
-    public File getTestReportDir() {
-        DeprecationLogger.nagUserOfReplacedProperty("Test.testReportDir", "Test.getReports().getHtml().getDestination()");
-        return reports.getHtml().getDestination();
-    }
-
-    /**
-     * Sets the root folder for the test reports.
-     *
-     * @param testReportDir The root folder
-     * @deprecated Replaced by {@code getReports().getHtml().setDestination()}
-     */
-    @Deprecated
-    public void setTestReportDir(File testReportDir) {
-        DeprecationLogger.nagUserOfReplacedProperty("Test.testReportDir", "Test.getReports().getHtml().getDestination()");
-        reports.getHtml().setDestination(testReportDir);
-    }
-
     /**
      * Returns the include patterns for test execution.
      *
@@ -922,7 +907,7 @@ public void useTestNG() {
      * @param testFrameworkConfigure A closure used to configure the TestNG options.
      */
     public void useTestNG(Closure testFrameworkConfigure) {
-        useTestFramework(new TestNGTestFramework(this, this.filter, instantiator), testFrameworkConfigure);
+        useTestFramework(new TestNGTestFramework(this, this.filter, getInstantiator()), testFrameworkConfigure);
     }
 
     /**
@@ -937,52 +922,6 @@ public void setClasspath(FileCollection classpath) {
         this.classpath = classpath;
     }
 
-    /**
-     * Specifies whether the test HTML report should be generated.
-     *
-     * @deprecated Replaced by {@code getReports().getHtml().isEnabled()}
-     */
-    @Deprecated
-    public boolean isTestReport() {
-        DeprecationLogger.nagUserOfReplacedProperty("Test.testReport", "Test.getReports().getHtml().isEnabled()");
-        return reports.getHtml().isEnabled();
-    }
-
-    /**
-     * Sets whether the test HTML report should be generated.
-     *
-     * @deprecated Replaced by {@code getReports().getHtml().setEnabled()}
-     */
-    @Deprecated
-    public void setTestReport(boolean testReport) {
-        DeprecationLogger.nagUserOfReplacedProperty("Test.testReport", "Test.getReports().getHtml().setEnabled()");
-        reports.getHtml().setEnabled(testReport);
-    }
-
-    /**
-     * Enables the HTML test report.
-     *
-     * @deprecated Replaced by {@code getReports().getHtml().setEnabled()}
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    @Deprecated
-    public void enableTestReport() {
-        DeprecationLogger.nagUserOfReplacedProperty("Test.testReport", "Test.getReports().getHtml().setEnabled()");
-        reports.getHtml().setEnabled(true);
-    }
-
-    /**
-     * Disables the HTML test report.
-     *
-     * @deprecated Replaced by {@code getReports().getHtml().setEnabled()}
-     */
-    @SuppressWarnings("UnusedDeclaration")
-    @Deprecated
-    public void disableTestReport() {
-        DeprecationLogger.nagUserOfReplacedProperty("Test.testReport", "Test.getReports().getHtml().setEnabled()");
-        reports.getHtml().setEnabled(false);
-    }
-
     /**
      * Returns the directories containing the test source.
      */
diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/logging/TestLoggingContainer.java b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/logging/TestLoggingContainer.java
index ca2fed26d55d..74dc615e0dd1 100644
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/logging/TestLoggingContainer.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/testing/logging/TestLoggingContainer.java
@@ -32,11 +32,16 @@
  *         // set options for log level LIFECYCLE
  *         events "failed"
  *         exceptionFormat "short"
+ *
  *         // set options for log level DEBUG
  *         debug {
  *             events "started", "skipped", "failed"
  *             exceptionFormat "full"
  *         }
+ *
+ *         // remove standard output/error logging from --info builds
+ *         // by assigning only 'failed' and 'skipped' events
+ *         info.events = ["failed", "skipped"]
  *     }
  * }
  * </pre>
diff --git a/subprojects/plugins/src/main/resources/META-INF/gradle-plugins/jvm-component.properties b/subprojects/plugins/src/main/resources/META-INF/gradle-plugins/jvm-component.properties
new file mode 100644
index 000000000000..54973940016e
--- /dev/null
+++ b/subprojects/plugins/src/main/resources/META-INF/gradle-plugins/jvm-component.properties
@@ -0,0 +1,17 @@
+#
+# Copyright 2014 the original author or authors.
+#
+# 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.
+#
+
+implementation-class=org.gradle.runtime.jvm.plugins.JvmComponentPlugin
diff --git a/subprojects/plugins/src/main/resources/META-INF/gradle-plugins/jvm-lang.properties b/subprojects/plugins/src/main/resources/META-INF/gradle-plugins/jvm-lang.properties
index 6a307657e815..ca08f4cb4554 100644
--- a/subprojects/plugins/src/main/resources/META-INF/gradle-plugins/jvm-lang.properties
+++ b/subprojects/plugins/src/main/resources/META-INF/gradle-plugins/jvm-lang.properties
@@ -1 +1 @@
-implementation-class=org.gradle.language.jvm.plugins.JvmLanguagePlugin
+implementation-class=org.gradle.api.plugins.JvmLanguagePlugin
diff --git a/subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingSchemeTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryNamingSchemeTest.groovy
similarity index 97%
rename from subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingSchemeTest.groovy
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryNamingSchemeTest.groovy
index c00313edec1e..452d20b0d20b 100644
--- a/subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/ClassDirectoryBinaryNamingSchemeTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/jvm/ClassDirectoryBinaryNamingSchemeTest.groovy
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-
-
-package org.gradle.language.jvm.internal
+package org.gradle.api.internal.jvm
 
 import spock.lang.Specification
 
diff --git a/subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinaryTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/jvm/DefaultClassDirectoryBinaryTest.groovy
similarity index 97%
rename from subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinaryTest.groovy
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/jvm/DefaultClassDirectoryBinaryTest.groovy
index 19fcb12b2d36..f6aaddebdfd4 100644
--- a/subprojects/language-jvm/src/test/groovy/org/gradle/language/jvm/internal/DefaultClassDirectoryBinaryTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/jvm/DefaultClassDirectoryBinaryTest.groovy
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.language.jvm.internal;
+package org.gradle.api.internal.jvm
 
-import spock.lang.Specification;
+import spock.lang.Specification
 
 public class DefaultClassDirectoryBinaryTest extends Specification {
     def "uses short task names for binary with name 'mainClasses'"() {
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/plugins/GroovyJarFileTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/plugins/GroovyJarFileTest.groovy
index 8ebe2c44ca07..28252a59d906 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/plugins/GroovyJarFileTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/plugins/GroovyJarFileTest.groovy
@@ -15,6 +15,7 @@
  */
 package org.gradle.api.internal.plugins
 
+import org.gradle.util.VersionNumber
 import spock.lang.Specification
 
 class GroovyJarFileTest extends Specification {
@@ -31,7 +32,7 @@ class GroovyJarFileTest extends Specification {
         jar != null
         jar.file == new File("/lib/groovy-2.0.5.jar")
         jar.baseName == "groovy"
-        jar.version.toString() == "2.0.5"
+        jar.version == VersionNumber.parse("2.0.5")
         !jar.groovyAll
         !jar.indy
         jar.dependencyNotation == "org.codehaus.groovy:groovy:2.0.5"
@@ -44,7 +45,7 @@ class GroovyJarFileTest extends Specification {
         jar != null
         jar.file == new File("/lib/groovy-all-2.0.5.jar")
         jar.baseName == "groovy-all"
-        jar.version.toString() == "2.0.5"
+        jar.version == VersionNumber.parse("2.0.5")
         jar.groovyAll
         !jar.indy
         jar.dependencyNotation == "org.codehaus.groovy:groovy-all:2.0.5"
@@ -58,7 +59,7 @@ class GroovyJarFileTest extends Specification {
         jar != null
         jar.file == new File("/lib/groovy-2.0.5-indy.jar")
         jar.baseName == "groovy"
-        jar.version.toString() == "2.0.5"
+        jar.version == VersionNumber.parse("2.0.5")
         !jar.groovyAll
         jar.indy
         jar.dependencyNotation == "org.codehaus.groovy:groovy:2.0.5:indy"
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactoryTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactoryTest.groovy
index 51393bd7d3f9..8c847dd5dfd5 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactoryTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/DefaultJavaCompilerFactoryTest.groovy
@@ -26,33 +26,14 @@ import spock.lang.Specification
 class DefaultJavaCompilerFactoryTest extends Specification {
     def inProcessCompiler = Mock(Compiler)
     def inProcessCompilerFactory = Mock(JavaCompilerFactory)
-    def factory = new DefaultJavaCompilerFactory(Mock(ProjectInternal), Mock(Factory), inProcessCompilerFactory, Mock(CompilerDaemonManager))
+    def factory = new DefaultJavaCompilerFactory(Mock(ProjectInternal), inProcessCompilerFactory, Mock(CompilerDaemonManager))
     def options = new CompileOptions()
     
     def setup() {
         inProcessCompilerFactory.create(_) >> inProcessCompiler
     }
 
-    def "creates Ant compiler when useAnt=true"() {
-        options.useAnt = true
-        options.fork = fork
-        
-        expect:
-        factory.create(options) instanceof AntJavaCompiler
-        
-        where: fork << [false, true]
-    }
-
-    def "falls back to Ant compiler when options.compiler is set"() {
-        options.useAnt = false
-        options.compiler = "jikes"
-
-        expect:
-        factory.create(options) instanceof AntJavaCompiler
-    }
-    
     def "creates in-process compiler when fork=false"() {
-        options.useAnt = false
         options.fork = false
 
         expect:
@@ -62,7 +43,6 @@ class DefaultJavaCompilerFactoryTest extends Specification {
     }
 
     def "creates command line compiler when fork=true and forkOptions.executable is set"() {
-        options.useAnt = false
         options.fork = true
         options.forkOptions.executable = "/path/to/javac"
 
@@ -73,7 +53,6 @@ class DefaultJavaCompilerFactoryTest extends Specification {
     }
 
     def "creates daemon compiler when fork=true"() {
-        options.useAnt = false
         options.fork = true
 
         expect:
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfoTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfoTest.groovy
deleted file mode 100644
index b7aa720aceb3..000000000000
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/AllFromJarRebuildInfoTest.groovy
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental
-
-import org.gradle.api.internal.file.collections.DirectoryFileTree
-import org.gradle.api.internal.file.collections.FileTreeAdapter
-import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
-import org.junit.Rule
-import spock.lang.Specification
-
-class AllFromJarRebuildInfoTest extends Specification {
-
-    @Rule TestNameTestDirectoryProvider temp = new TestNameTestDirectoryProvider()
-
-    def "empty jar"() {
-        def classes = new FileTreeAdapter(new DirectoryFileTree(new File("missing")))
-
-        expect:
-        new AllFromJarRebuildInfo(new JarArchive(new File("j"), classes)).changedClassesInJar.isEmpty()
-    }
-
-    def "contains all classes"() {
-        temp.createFile("root/com/foo/Foo.class")
-        temp.createFile("root/com/Bar.class")
-        def classes = new FileTreeAdapter(new DirectoryFileTree(temp.file("root")))
-
-        expect:
-        new AllFromJarRebuildInfo(new JarArchive(new File("j"), classes)).changedClassesInJar == ["com.foo.Foo", "com.Bar"] as Set
-    }
-}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependencyInfoUpdaterTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependencyInfoUpdaterTest.groovy
new file mode 100644
index 000000000000..4822a1251e2f
--- /dev/null
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassDependencyInfoUpdaterTest.groovy
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental
+
+import org.gradle.api.file.ConfigurableFileTree
+import org.gradle.api.internal.file.FileOperations
+import org.gradle.api.internal.tasks.compile.JavaCompileSpec
+import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassDependenciesAnalyzer
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfoWriter
+import org.gradle.api.internal.tasks.compile.incremental.recomp.RecompilationNotNecessary
+import org.gradle.api.tasks.WorkResult
+import spock.lang.Specification
+import spock.lang.Subject
+
+class ClassDependencyInfoUpdaterTest extends Specification {
+
+    def writer = Mock(ClassDependencyInfoWriter)
+    def operations = Mock(FileOperations)
+    def analyzer = Mock(ClassDependenciesAnalyzer)
+
+    @Subject updater = new ClassDependencyInfoUpdater(writer, operations, analyzer)
+
+    def "does not update info when recompilation was not necessary"() {
+        def result = Stub(RecompilationNotNecessary)
+
+        when: updater.updateInfo(Mock(JavaCompileSpec), result)
+
+        then: 0 * _
+    }
+
+    def "updates info"() {
+        when: updater.updateInfo(Stub(JavaCompileSpec), Mock(WorkResult))
+
+        then:
+        1 * operations.fileTree(_) >> Mock(ConfigurableFileTree)
+        1 * writer.writeInfo(_)
+    }
+}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationInitializerTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationInitializerTest.groovy
new file mode 100644
index 000000000000..5aa0612c152a
--- /dev/null
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationInitializerTest.groovy
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+
+
+package org.gradle.api.internal.tasks.compile.incremental
+
+import org.gradle.api.internal.file.FileOperations
+import org.gradle.api.internal.tasks.compile.JavaCompileSpec
+import org.gradle.api.tasks.util.PatternSet
+import spock.lang.Specification
+import spock.lang.Subject
+
+class IncrementalCompilationInitializerTest extends Specification {
+
+    def fileOperations = Mock(FileOperations)
+    @Subject initializer = new IncrementalCompilationInitializer(fileOperations)
+
+    def "prepares patterns"() {
+        PatternSet classesToDelete = Mock(PatternSet)
+        PatternSet sourceToCompile = Mock(PatternSet)
+
+        when:
+        initializer.preparePatterns(["com.Foo", "Bar"], classesToDelete, sourceToCompile)
+
+        then:
+        1 * classesToDelete.include('com/Foo.class')
+        1 * classesToDelete.include('com/Foo$*.class')
+        1 * classesToDelete.include('Bar.class')
+        1 * classesToDelete.include('Bar$*.class')
+
+        1 * sourceToCompile.include('Bar.java')
+        1 * sourceToCompile.include('com/Foo.java')
+
+        0 * _
+    }
+
+    def "does not prepare patterns when stale classes empty"() {
+        when: initializer.preparePatterns([], Mock(PatternSet), Mock(PatternSet))
+        then: thrown(AssertionError)
+    }
+
+    def "configures empty source when stale classes empty"() {
+        def compileSpec = Mock(JavaCompileSpec)
+        when: initializer.initializeCompilation(compileSpec, [])
+        then:
+        1 * compileSpec.setSource { it.files.empty }
+        0 * _
+    }
+}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupportTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupportTest.groovy
deleted file mode 100644
index f77f7ab0fbd0..000000000000
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/IncrementalCompilationSupportTest.groovy
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental
-
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfo
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfoExtractor
-import org.gradle.api.internal.tasks.compile.incremental.graph.ClassDependencyInfoSerializer
-import org.gradle.api.tasks.compile.CompileOptions
-import spock.lang.Specification
-import spock.lang.Subject
-
-class IncrementalCompilationSupportTest extends Specification {
-
-    def options = Mock(CompileOptions)
-    def extractor = Mock(ClassDependencyInfoExtractor)
-    def serializer = Mock(ClassDependencyInfoSerializer)
-    def feeder = Mock(JarSnapshotFeeder)
-
-    @Subject support = new IncrementalCompilationSupport(feeder)
-
-    def "analyzes class dependencies when incremental"() {
-        options.incremental >> true
-        def jars = [Mock(JarArchive)]
-
-        when: support.compilationComplete(options, extractor, serializer, jars)
-        then:
-        1 * extractor.extractInfo("") >> Stub(ClassDependencyInfo)
-        1 * serializer.writeInfo(_ as ClassDependencyInfo)
-//        1 * feeder.storeJarSnapshots(jars)
-    }
-
-    def "does nothing when not incremental"() {
-        options.incremental >> false
-
-        when: support.compilationComplete(options, extractor, serializer, [])
-        then: 0 * extractor._
-    }
-}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapperTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapperTest.groovy
deleted file mode 100644
index c3d835414217..000000000000
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/InputOutputMapperTest.groovy
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental
-
-import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
-import org.junit.Rule
-import spock.lang.Specification
-import spock.lang.Subject
-
-class InputOutputMapperTest extends Specification {
-
-    @Rule TestNameTestDirectoryProvider temp = new TestNameTestDirectoryProvider()
-    @Subject mapper = new InputOutputMapper([temp.file("src/main/java"), temp.file("src/main/java2")], temp.file("out"))
-
-    def "knows java source class relative path"() {
-        expect:
-        mapper.toJavaSourceClass(temp.file("src/main/java/Foo.java")).relativePath == "Foo.java"
-        mapper.toJavaSourceClass(temp.file("src/main/java/org/bar/Bar.java")).relativePath == "org/bar/Bar.java"
-        mapper.toJavaSourceClass(temp.file("src/main/java2/com/Com.java")).relativePath == "com/Com.java"
-
-        when: mapper.toJavaSourceClass(temp.file("src/main/unknown/Xxx.java"))
-        then: thrown(IllegalArgumentException)
-    }
-
-    def "infers java source class from name"() {
-        temp.createFile("src/main/java/Foo.java")
-        temp.createFile("src/main/java/org/bar/Bar.java")
-        temp.createFile("src/main/java2/com/Com.java")
-        temp.createFile("src/main/unknown/Xxx.java")
-
-        expect:
-        mapper.toJavaSourceClass("Foo").relativePath == "Foo.java"
-        mapper.toJavaSourceClass("org.bar.Bar").relativePath == "org/bar/Bar.java"
-        mapper.toJavaSourceClass("com.Com").relativePath == "com/Com.java"
-
-        when: mapper.toJavaSourceClass(temp.file("unknown.Xxx"))
-        then: thrown(IllegalArgumentException)
-    }
-}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeederTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeederTest.groovy
deleted file mode 100644
index 4e7d13974829..000000000000
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotFeederTest.groovy
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental
-
-import org.gradle.api.file.FileTree
-import spock.lang.Specification
-import spock.lang.Subject
-
-class JarSnapshotFeederTest extends Specification {
-
-    def cache = Mock(JarSnapshotCache)
-    def snapshotter = Mock(JarSnapshotter)
-
-    @Subject feeder = new JarSnapshotFeeder(cache, snapshotter)
-
-    def "stores jar snapshot"() {
-        def jar1 = new JarArchive(new File("jar1.jar"), Mock(FileTree))
-        def snapshot = Mock(JarSnapshot)
-
-        when:
-        feeder.storeJarSnapshots([jar1])
-
-        then:
-        1 * cache.getSnapshot(jar1.file)
-        1 * snapshotter.createSnapshot(jar1.contents) >> snapshot
-        1 * cache.putSnapshots([(jar1.file): snapshot])
-        0 * _
-    }
-
-    def "stores multiple snapshots"() {
-        def jar1 = new JarArchive(new File("jar1.jar"), Mock(FileTree))
-        def jar2 = new JarArchive(new File("jar2.jar"), Mock(FileTree))
-
-        when:
-        feeder.storeJarSnapshots([jar1, jar2])
-
-        then:
-        1 * snapshotter.createSnapshot(jar1.contents) >> Mock(JarSnapshot)
-        1 * snapshotter.createSnapshot(jar2.contents) >> Mock(JarSnapshot)
-        1 * cache.putSnapshots({ it.size() == 2})
-    }
-
-    def "avoids storing unchanged jar snapshots"() {
-        def jar1 = new JarArchive(new File("jar1.jar"), Mock(FileTree))
-        def jar2 = new JarArchive(new File("jar2.jar"), Mock(FileTree))
-
-        when:
-        feeder.changedJar(jar2.file)
-        feeder.storeJarSnapshots([jar1, jar2])
-
-        then:
-        1 * cache.getSnapshot(jar1.file) >> Mock(JarSnapshot)
-        1 * cache.getSnapshot(jar2.file) >> Mock(JarSnapshot)
-        1 * snapshotter.createSnapshot(jar2.contents) >> Mock(JarSnapshot)
-        1 * cache.putSnapshots({ it[jar2.file] })
-        0 * _
-    }
-}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotTest.groovy
deleted file mode 100644
index 136cbc736cc7..000000000000
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotTest.groovy
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental
-
-import spock.lang.Specification
-
-class JarSnapshotTest extends Specification {
-
-    def "knows when snapshots are the same"() {
-        JarSnapshot s1 = new JarSnapshot(["com.Foo": "f".bytes, "Bar": "b".bytes])
-        JarSnapshot s2 = new JarSnapshot(["com.Foo": "f".bytes, "Bar": "b".bytes])
-
-        expect:
-        s1.compareToSnapshot(s2).changedClasses.isEmpty()
-        s2.compareToSnapshot(s1).changedClasses.isEmpty()
-    }
-
-    def "knows when other snapshots have extra/missing classes"() {
-        JarSnapshot s1 = new JarSnapshot(["com.Foo": "f".bytes, "Bar": "b".bytes, "Car": "c".bytes])
-        JarSnapshot s2 = new JarSnapshot(["com.Foo": "f".bytes])
-
-        expect:
-        s1.compareToSnapshot(s2).changedClasses == ["Bar", "Car"]
-        s2.compareToSnapshot(s1).changedClasses == [] //ignore class additions
-    }
-
-    def "knows when other snapshots have class with different hash"() {
-        JarSnapshot s1 = new JarSnapshot(["com.Foo": "f".bytes, "Bar": "b".bytes, "Car": "c".bytes])
-        JarSnapshot s2 = new JarSnapshot(["Car": "xxx".bytes, "com.Foo": "f".bytes])
-
-        expect:
-        s1.compareToSnapshot(s2).changedClasses == ["Bar", "Car"]
-        s2.compareToSnapshot(s1).changedClasses == ["Car"]
-    }
-}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClassTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/SourceToNameConverterTest.groovy
similarity index 56%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClassTest.groovy
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/SourceToNameConverterTest.groovy
index 70e44d199ab8..7b21b5c7fa84 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JavaSourceClassTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/SourceToNameConverterTest.groovy
@@ -14,25 +14,30 @@
  * limitations under the License.
  */
 
+
+
 package org.gradle.api.internal.tasks.compile.incremental
 
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
+import spock.lang.Subject
 
-class JavaSourceClassTest extends Specification {
+class SourceToNameConverterTest extends Specification {
 
     @Rule TestNameTestDirectoryProvider temp = new TestNameTestDirectoryProvider()
-
-    def "knows output file"() {
-        expect:
-        new JavaSourceClass("com/Foo.java", temp.file("dir")).outputFile == temp.file("dir/com/Foo.class")
-        new JavaSourceClass("Foo.java", temp.file("dir")).outputFile == temp.file("dir/Foo.class")
+    def srcDirs = Stub(CompilationSourceDirs) {
+        getSourceDirs() >> [temp.file("src/main/java"), temp.file("src/main/java2")]
     }
+    @Subject converter = new SourceToNameConverter(srcDirs)
 
-    def "knows class name"() {
+    def "knows java source class relative path"() {
         expect:
-        new JavaSourceClass("com/Foo.java", temp.file("dir")).className == "com.Foo"
-        new JavaSourceClass("Foo.java", temp.file("dir")).className == "Foo"
+        converter.getClassName(temp.file("src/main/java/Foo.java")) == "Foo"
+        converter.getClassName(temp.file("src/main/java/org/bar/Bar.java")) == "org.bar.Bar"
+        converter.getClassName(temp.file("src/main/java2/com/Com.java")) == "com.Com"
+
+        when: converter.getClassName(temp.file("src/main/unknown/Xxx.java"))
+        then: thrown(IllegalArgumentException)
     }
 }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzerTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzerTest.groovy
index 81abaaa984c2..2bfe82de34ea 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzerTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/ClassDependenciesAnalyzerTest.groovy
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+
+
 package org.gradle.api.internal.tasks.compile.incremental.analyzer
 
 import org.gradle.api.internal.tasks.compile.incremental.analyzer.annotations.*
+import org.gradle.api.internal.tasks.compile.incremental.test.*
 import spock.lang.Specification
 import spock.lang.Subject
 
@@ -44,28 +47,28 @@ class ClassDependenciesAnalyzerTest extends Specification {
     def "knows if a class have non-private constants"() {
         expect:
         analyze(HasNonPrivateConstants).classDependencies == [UsedByNonPrivateConstantsClass.name]
-        analyze(HasNonPrivateConstants).dependentToAll
+        analyze(HasNonPrivateConstants).dependencyToAll
 
         analyze(HasPublicConstants).classDependencies == []
-        analyze(HasPublicConstants).dependentToAll
+        analyze(HasPublicConstants).dependencyToAll
 
         analyze(HasPrivateConstants).classDependencies == [HasNonPrivateConstants.name]
-        !analyze(HasPrivateConstants).dependentToAll
+        !analyze(HasPrivateConstants).dependencyToAll
     }
 
     def "knows if a class uses annotations"() {
         expect:
         analyze(UsesRuntimeAnnotation).classDependencies == []
         analyze(SomeRuntimeAnnotation).classDependencies == []
-        analyze(SomeRuntimeAnnotation).dependentToAll
+        analyze(SomeRuntimeAnnotation).dependencyToAll
 
         analyze(UsesClassAnnotation).classDependencies == []
         analyze(SomeClassAnnotation).classDependencies == []
-        analyze(SomeClassAnnotation).dependentToAll
+        analyze(SomeClassAnnotation).dependencyToAll
 
         analyze(UsesSourceAnnotation).classDependencies == [] //source annotations are wiped from the bytecode
         analyze(SomeSourceAnnotation).classDependencies == []
-        analyze(SomeSourceAnnotation).dependentToAll
+        analyze(SomeSourceAnnotation).dependencyToAll
     }
 
     InputStream classStream(Class aClass) {
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoExtractorTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoExtractorTest.groovy
new file mode 100644
index 000000000000..f19ba3e128ed
--- /dev/null
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoExtractorTest.groovy
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+
+
+package org.gradle.api.internal.tasks.compile.incremental.deps
+
+import org.gradle.api.internal.file.collections.DirectoryFileTree
+import org.gradle.api.internal.file.collections.FileTreeAdapter
+import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassDependenciesAnalyzer
+import org.gradle.api.internal.tasks.compile.incremental.test.*
+import org.gradle.internal.classloader.ClasspathUtil
+import spock.lang.Specification
+import spock.lang.Subject
+
+class ClassDependencyInfoExtractorTest extends Specification {
+
+    @Subject extractor = new ClassDependencyInfoExtractor(new ClassDependenciesAnalyzer(), "org.gradle.api.internal.tasks.compile.incremental.test")
+
+    def "knows relevant dependents"() {
+        def classesDir = ClasspathUtil.getClasspathForClass(ClassDependencyInfoExtractorTest)
+        def tree = new FileTreeAdapter(new DirectoryFileTree(classesDir))
+
+        when:
+        tree.visit(extractor)
+        def info = extractor.dependencyInfo
+
+        then:
+        info.getRelevantDependents(SomeClass.name).dependentClasses == [SomeOtherClass.name] as Set
+        info.getRelevantDependents(SomeOtherClass.name).dependentClasses == [] as Set
+        info.getRelevantDependents(YetAnotherClass.name).dependentClasses == [SomeOtherClass.name] as Set
+        info.getRelevantDependents(AccessedFromPrivateClass.name).dependentClasses == [SomeClass.name, SomeOtherClass.name] as Set
+        info.getRelevantDependents(HasPrivateConstants.name).dependentClasses == [] as Set
+        info.getRelevantDependents(UsedByNonPrivateConstantsClass.name).dependentClasses == [HasNonPrivateConstants.name, HasPrivateConstants.name] as Set
+        info.getRelevantDependents(HasNonPrivateConstants.name).dependencyToAll
+    }
+
+    //TODO SF tighten and refactor the coverage, use mocks
+}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializerTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoSerializerTest.groovy
similarity index 73%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializerTest.groovy
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoSerializerTest.groovy
index d1a6e8adc949..a20a2bdbd3d7 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoSerializerTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoSerializerTest.groovy
@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.graph
 
-import org.gradle.api.internal.tasks.compile.incremental.ClassDependents
+
+package org.gradle.api.internal.tasks.compile.incremental.deps
+
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
@@ -29,10 +30,13 @@ class ClassDependencyInfoSerializerTest extends Specification {
         def s = new ClassDependencyInfoSerializer(temp.file("foo.bin"))
 
         when:
-        s.writeInfo(new ClassDependencyInfo(["foo.Foo": new ClassDependents().addClass("bar.Bar")]))
-        def info = s.readInfo()
+        s.writeInfo(new ClassDependencyInfo([
+                "foo.Foo": new DefaultDependentsSet(["bar.Bar"]),
+                "bar.Bar": new DefaultDependentsSet([])
+        ]))
+        def info = s.provideInfo()
 
         then:
-        info.getActualDependents("foo.Foo") == ["bar.Bar"] as Set
+        info.getRelevantDependents("foo.Foo").dependentClasses == ["bar.Bar"] as Set
     }
 }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoTest.groovy
new file mode 100644
index 000000000000..64125dd6cb88
--- /dev/null
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependencyInfoTest.groovy
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps
+
+import spock.lang.Specification
+
+import static org.gradle.api.internal.tasks.compile.incremental.deps.DefaultDependentsSet.dependents
+
+class ClassDependencyInfoTest extends Specification {
+
+    def "returns empty info"() {
+        def info = new ClassDependencyInfo([:])
+        expect: info.getRelevantDependents("Foo").dependentClasses.isEmpty()
+    }
+
+    def "does not recurse if root class is a dependency to all"() {
+        def info = new ClassDependencyInfo(["Foo": new DefaultDependentsSet(true, ["Bar"])])
+        def deps = info.getRelevantDependents("Foo")
+
+        expect:
+        deps.dependencyToAll
+
+        when: deps.getDependentClasses()
+        then: thrown(UnsupportedOperationException)
+    }
+
+    def "marks as dependency to all only if root class is a dependency to all"() {
+        def info = new ClassDependencyInfo([
+                "a":   new DefaultDependentsSet(false, ['b']),
+                'b': new DefaultDependentsSet(true, ['c']),
+                "c": new DefaultDependentsSet(true, [])
+        ])
+        def deps = info.getRelevantDependents("a")
+
+        expect:
+        deps.dependentClasses == ['b', 'c'] as Set
+        !deps.dependencyToAll
+    }
+
+    def "recurses nested dependencies"() {
+        def info = new ClassDependencyInfo([
+                "Foo": dependents("Bar"),
+                "Bar": dependents("Baz"),
+                "Baz": dependents(),
+        ])
+        def deps = info.getRelevantDependents("Foo")
+
+        expect:
+        deps.dependentClasses == ["Bar", "Baz"] as Set
+        info.getRelevantDependents("Bar").dependentClasses == ["Baz"] as Set
+        info.getRelevantDependents("Baz").dependentClasses == [] as Set
+    }
+
+    def "recurses multiple dependencies"() {
+        def info = new ClassDependencyInfo([
+                "a": dependents("b", "c"),
+                "b": dependents("d"),
+                "c": dependents("e"),
+                "d": dependents(),
+                "e": dependents()
+        ])
+        def deps = info.getRelevantDependents("a")
+
+        expect:
+        deps.dependentClasses == ["b", "c", "d", "e"] as Set
+    }
+
+    def "removes self from dependents"() {
+        def info = new ClassDependencyInfo([
+                "Foo": dependents("Foo")
+        ])
+        def deps = info.getRelevantDependents("Foo")
+
+        expect:
+        deps.dependentClasses == [] as Set
+    }
+
+    def "handles dependency cycles"() {
+        def info = new ClassDependencyInfo([
+                "Foo": dependents("Bar"),
+                "Bar": dependents("Baz"),
+                "Baz": dependents("Foo"),
+        ])
+        def deps = info.getRelevantDependents("Foo")
+
+        expect:
+        deps.dependentClasses == ["Bar", "Baz"] as Set
+    }
+
+    def "recurses but filters out inner classes"() {
+        def info = new ClassDependencyInfo([
+                "a":   dependents('a$b', 'c'),
+                'a$b': dependents('d'),
+                "c": dependents(),
+                "d": dependents(),
+        ])
+        def deps = info.getRelevantDependents("a")
+
+        expect:
+        deps.dependentClasses == ["c", "d"] as Set
+    }
+
+    def "handles cycles with inner classes"() {
+        def info = new ClassDependencyInfo([
+                "a":   dependents('a$b'),
+                'a$b': dependents('a$b', 'c'),
+                "c": dependents()
+        ])
+        def deps = info.getRelevantDependents("a")
+
+        expect:
+        deps.dependentClasses == ["c"] as Set
+    }
+
+    def "provides dependents of all input classes"() {
+        def info = new ClassDependencyInfo([
+                "A": dependents("B"), "B": dependents(),
+                "C": dependents("D"), "D": dependents(),
+                "E": dependents("D"), "F": dependents(),
+        ])
+        def deps = info.getRelevantDependents(["A", "E"])
+
+        expect:
+        deps.dependentClasses == ["D", "B"] as Set
+    }
+
+    def "provides recursive dependents of all input classes"() {
+        def info = new ClassDependencyInfo([
+                "A": dependents("B"), "B": dependents("C"), "C": dependents(),
+                "D": dependents("E"), "E": dependents(),
+                "F": dependents("G"), "G": dependents(),
+        ])
+        def deps = info.getRelevantDependents(["A", "D"])
+
+        expect:
+        deps.dependentClasses == ["E", "B", "C"] as Set
+    }
+
+    def "knows when any of the input classes is a dependency to all"() {
+        def info = new ClassDependencyInfo([
+                "A": dependents("B"), "B": dependents(),
+                "C": new DefaultDependentsSet(true, []),
+                "D": dependents("E"), "E": dependents(),
+        ])
+        def deps = info.getRelevantDependents(["A", "C", "will not be reached"])
+
+        expect:
+        deps.dependencyToAll
+    }
+}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependentsAccumulatorTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependentsAccumulatorTest.groovy
new file mode 100644
index 000000000000..3ae2c7eb1fd5
--- /dev/null
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/ClassDependentsAccumulatorTest.groovy
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.api.internal.tasks.compile.incremental.deps
+
+import spock.lang.Specification
+
+class ClassDependentsAccumulatorTest extends Specification {
+
+    def accumulator = new ClassDependentsAccumulator("")
+
+    def "dependents map is empty by default"() {
+        expect:
+        accumulator.dependentsMap == [:]
+    }
+
+    def "remembers if class is dependency to all"() {
+        // a -> b -> c
+        accumulator.addClass("a", false, ["b"])
+        accumulator.addClass("b", true,  ["c"])
+        accumulator.addClass("c", false, [])
+
+        expect:
+        !accumulator.dependentsMap.a.dependencyToAll
+        accumulator.dependentsMap.b.dependencyToAll
+        !accumulator.dependentsMap.c.dependencyToAll
+    }
+
+    def "accumulates dependents"() {
+        accumulator.addClass("d", true, ['x'])
+        accumulator.addClass("a", false, ["b", "c"])
+        accumulator.addClass("b", true,  ["c", "a"])
+        accumulator.addClass("c", false, [])
+
+        expect:
+        accumulator.dependentsMap.a.dependentClasses == ['b'] as Set
+        accumulator.dependentsMap.b.dependentClasses == ['a'] as Set
+        accumulator.dependentsMap.c.dependentClasses == ['b', 'a'] as Set
+        accumulator.dependentsMap.d.dependentClasses == [] as Set
+        accumulator.dependentsMap.x.dependentClasses == ['d'] as Set
+    }
+
+    def "creates keys for all encountered classes"() {
+        accumulator.addClass("a", false, ["x"])
+        accumulator.addClass("b", true,  ["a", "b"])
+        accumulator.addClass("c", true,  [])
+
+        expect:
+        accumulator.dependentsMap.keySet() == ["a", "b", "c", "x"] as Set
+    }
+
+    def "knows when class is dependent to all if that class is added first"() {
+        accumulator.addClass("b", true,  [])
+        accumulator.addClass("a", false, ["b"])
+
+        expect:
+        accumulator.dependentsMap.b.dependencyToAll
+    }
+
+    def "knows when class is dependent to all even if that class is added last"() {
+        accumulator.addClass("a", false, ["b"])
+        accumulator.addClass("b", true,  [])
+
+        expect:
+        accumulator.dependentsMap.b.dependencyToAll
+    }
+
+    def "uses package prefix filter for classes"() {
+        accumulator = new ClassDependentsAccumulator("org.gradle")
+        accumulator.addClass("gradle.Foo", true, ["org.gradle.Foo"])
+
+        expect:
+        accumulator.dependentsMap["gradle.Foo"] == null
+        accumulator.dependentsMap["org.gradle.Foo"].dependentClasses.isEmpty()
+    }
+
+    def "uses package prefix filter for dependencies"() {
+        accumulator = new ClassDependentsAccumulator("org.gradle")
+        accumulator.addClass("org.gradle.Foo", false, ["gradle.Bar"])
+
+        expect:
+        accumulator.dependentsMap["gradle.Bar"] == null
+        accumulator.dependentsMap["org.gradle.Foo"].dependentClasses.isEmpty()
+    }
+
+    def "filters out self dependencies"() {
+        accumulator.addClass("a", false, ["a", "b"])
+
+        expect:
+        accumulator.dependentsMap["b"].dependentClasses == ["a"] as Set
+        accumulator.dependentsMap["a"].dependentClasses.isEmpty()
+    }
+}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProviderTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/OutputToNameConverterTest.groovy
similarity index 67%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProviderTest.groovy
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/OutputToNameConverterTest.groovy
index 1ad12abe2092..14aea7686c27 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/ClassNameProviderTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/deps/OutputToNameConverterTest.groovy
@@ -14,28 +14,30 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental
+
+
+package org.gradle.api.internal.tasks.compile.incremental.deps
 
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
 import spock.lang.Subject
 
-class ClassNameProviderTest extends Specification {
+class OutputToNameConverterTest extends Specification {
 
     @Rule TestNameTestDirectoryProvider temp = new TestNameTestDirectoryProvider()
-    @Subject provider = new ClassNameProvider(temp.createDir("root/dir"))
+    @Subject provider = new OutputToNameConverter(temp.createDir("root/dir"))
 
     def "provides class name"() {
         expect:
-        "foo.bar.Foo" == provider.provideName(temp.file("root/dir/foo/bar/Foo.class"))
-        "Foo" == provider.provideName(temp.file("root/dir/Foo.class"))
-        'Foo$Bar' == provider.provideName(temp.file('root/dir/Foo$Bar.class'))
+        "foo.bar.Foo" == provider.getClassName(temp.file("root/dir/foo/bar/Foo.class"))
+        "Foo" == provider.getClassName(temp.file("root/dir/Foo.class"))
+        'Foo$Bar' == provider.getClassName(temp.file('root/dir/Foo$Bar.class'))
     }
 
     def "fails when class is outside of root"() {
         when:
-        provider.provideName(temp.file("foo/Foo.class"))
+        provider.getClassName(temp.file("foo/Foo.class"))
         then:
         thrown(IllegalArgumentException)
     }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractorTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractorTest.groovy
deleted file mode 100644
index 089b1515a981..000000000000
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/graph/ClassDependencyInfoExtractorTest.groovy
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.internal.tasks.compile.incremental.graph
-
-import org.gradle.api.internal.tasks.compile.incremental.analyzer.*
-import spock.lang.Specification
-
-class ClassDependencyInfoExtractorTest extends Specification {
-
-    def "knows recursive dependency tree"() {
-        def info = new ClassDependencyInfoExtractor(new File(ClassDependencyInfoExtractorTest.classLoader.getResource("").toURI())).extractInfo("org.gradle.api.internal.tasks.compile.incremental")
-        expect:
-        info.getActualDependents(SomeClass.name) == [SomeOtherClass.name] as Set
-        info.getActualDependents(SomeOtherClass.name) == [] as Set
-        info.getActualDependents(YetAnotherClass.name) == [SomeOtherClass.name] as Set
-        info.getActualDependents(AccessedFromPrivateClass.name) == [SomeClass.name, SomeOtherClass.name] as Set
-        info.getActualDependents(HasPrivateConstants.name) == [] as Set
-        info.getActualDependents(HasNonPrivateConstants.name) == null
-        info.getActualDependents(UsedByNonPrivateConstantsClass.name) == [HasNonPrivateConstants.name, HasPrivateConstants.name] as Set
-    }
-
-    //TODO SF tighten and refactor the coverage
-}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotTest.groovy
new file mode 100644
index 000000000000..38b57fb2df2a
--- /dev/null
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotTest.groovy
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+
+
+package org.gradle.api.internal.tasks.compile.incremental.jar
+
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo
+import org.gradle.api.internal.tasks.compile.incremental.deps.DependencyToAll
+import org.gradle.api.internal.tasks.compile.incremental.deps.DependentsSet
+import spock.lang.Specification
+
+import static org.gradle.api.internal.tasks.compile.incremental.deps.DefaultDependentsSet.dependents
+
+class JarSnapshotTest extends Specification {
+
+    def info = Stub(ClassDependencyInfo)
+
+    def setup() {
+        info.getRelevantDependents(_ as String) >> Stub(DependentsSet)
+    }
+
+    def "knows when there are no affected classes since some other snapshot"() {
+        JarSnapshot s1 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes], info)
+        JarSnapshot s2 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes], info)
+
+        expect:
+        s1.getAffectedClassesSince(s2).dependentClasses.isEmpty()
+    }
+
+    def "knows when there are extra/missing classes since some other snapshot"() {
+        JarSnapshot s1 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes, "C": "C".bytes], info)
+        JarSnapshot s2 = new JarSnapshot(["A": "A".bytes], info)
+
+        expect:
+        s1.getAffectedClassesSince(s2).dependentClasses.isEmpty() //ignore class additions
+        s2.getAffectedClassesSince(s1).dependentClasses == ["B", "C"] as Set
+    }
+
+    def "knows when there are changed classes since other snapshot"() {
+        JarSnapshot s1 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes, "C": "C".bytes], info)
+        JarSnapshot s2 = new JarSnapshot(["A": "A".bytes, "B": "BB".bytes], info)
+
+        expect:
+        s1.getAffectedClassesSince(s2).dependentClasses == ["B"] as Set
+        s2.getAffectedClassesSince(s1).dependentClasses == ["B", "C"] as Set
+    }
+
+    def "knows when transitive class is affected transitively via class change"() {
+        def info = Mock(ClassDependencyInfo)
+        JarSnapshot s1 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes, "C": "C".bytes], info)
+        JarSnapshot s2 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes, "C": "CC".bytes], info)
+
+        info.getRelevantDependents("C") >> dependents("B")
+
+        expect:
+        s1.getAffectedClassesSince(s2).dependentClasses == ["B", "C"] as Set
+        s2.getAffectedClassesSince(s1).dependentClasses == ["B", "C"] as Set
+    }
+
+    def "knows when transitive class is affected transitively via class removal"() {
+        def info = Mock(ClassDependencyInfo)
+        JarSnapshot s1 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes, "C": "C".bytes], info)
+        JarSnapshot s2 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes], info)
+
+        info.getRelevantDependents("C") >> dependents("B")
+
+        expect:
+        s1.getAffectedClassesSince(s2).dependentClasses.isEmpty()
+        s2.getAffectedClassesSince(s1).dependentClasses == ["B", "C"] as Set
+    }
+
+    def "knows when class is dependency to all"() {
+        def info = Mock(ClassDependencyInfo)
+        JarSnapshot s1 = new JarSnapshot(["A": "A".bytes, "B": "B".bytes], info)
+        JarSnapshot s2 = new JarSnapshot(["A": "A".bytes, "B": "BB".bytes], info)
+
+        info.getRelevantDependents("B") >> new DependencyToAll()
+
+        expect:
+        s1.getAffectedClassesSince(s2).isDependencyToAll()
+        s2.getAffectedClassesSince(s1).isDependencyToAll()
+    }
+}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotsMakerTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotsMakerTest.groovy
new file mode 100644
index 000000000000..7efb1c3c656a
--- /dev/null
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotsMakerTest.groovy
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * 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.
+ */
+
+
+
+package org.gradle.api.internal.tasks.compile.incremental.jar
+
+import org.gradle.api.file.FileTree
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo
+import spock.lang.Specification
+import spock.lang.Subject
+
+class JarSnapshotsMakerTest extends Specification {
+
+    def cache = Mock(LocalJarSnapshotCache)
+    def info = Mock(ClassDependencyInfo)
+    def snapshotter = Mock(JarSnapshotter)
+    def finder = Mock(ClasspathJarFinder)
+
+    @Subject maker = new JarSnapshotsMaker(cache, snapshotter, finder)
+
+    def "stores jar snapshots"() {
+        def sn1 = Mock(JarSnapshot); def sn2 = Mock(JarSnapshot)
+        def jar1 = new JarArchive(new File("jar1.jar"), Mock(FileTree)); def jar2 = new JarArchive(new File("jar2.jar"), Mock(FileTree))
+
+        def classpath = [new File("foo.zip"), new File("someDir"), new File("some.jar")]
+
+        when:
+        maker.storeJarSnapshots(classpath)
+
+        then:
+        1 * finder.findJarArchives(classpath) >> [jar1, jar2]
+        1 * snapshotter.createSnapshot(jar1) >> sn1
+        1 * snapshotter.createSnapshot(jar2) >> sn2
+        1 * cache.putSnapshots([(jar1.file): sn1, (jar2.file): sn2])
+        0 * _
+    }
+}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotterTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotterTest.groovy
similarity index 56%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotterTest.groovy
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotterTest.groovy
index b6fc15eb10e1..a2027b9ad174 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotterTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/JarSnapshotterTest.groovy
@@ -14,11 +14,16 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental
+
+
+package org.gradle.api.internal.tasks.compile.incremental.jar
 
 import org.gradle.api.internal.file.collections.DirectoryFileTree
 import org.gradle.api.internal.file.collections.FileTreeAdapter
 import org.gradle.api.internal.hash.Hasher
+import org.gradle.api.internal.tasks.compile.incremental.analyzer.ClassDependenciesAnalyzer
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfoExtractor
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
@@ -28,25 +33,34 @@ class JarSnapshotterTest extends Specification {
 
     @Rule TestNameTestDirectoryProvider temp = new TestNameTestDirectoryProvider()
     def hasher = Mock(Hasher)
-    @Subject snapshotter = new JarSnapshotter(hasher);
 
-    def "creates snapshot of an empty jar"() {
+    @Subject snapshotter = new JarSnapshotter(hasher, Mock(ClassDependenciesAnalyzer))
+
+    def "creates snapshot for an empty jar"() {
         expect:
-        def snapshot = snapshotter.createSnapshot(new FileTreeAdapter(new DirectoryFileTree(new File("missing"))))
-        snapshot.classHashes.isEmpty()
+        def snapshot = snapshotter.createSnapshot(new JarArchive(new File("a.jar"), new FileTreeAdapter(new DirectoryFileTree(new File("missing")))))
+        snapshot.hashes.isEmpty()
+        snapshot.info
     }
 
     def "creates snapshot of a jar with classes"() {
         def f1 = temp.createFile("foo/Foo.class")
         def f2 = temp.createFile("foo/com/Foo2.class")
+        def extractor = Mock(ClassDependencyInfoExtractor)
+        def info = Stub(ClassDependencyInfo)
 
         when:
-        def snapshot = snapshotter.createSnapshot(new FileTreeAdapter(new DirectoryFileTree(temp.file("foo"))))
+        def snapshot = snapshotter.createSnapshot(new FileTreeAdapter(new DirectoryFileTree(temp.file("foo"))), extractor)
 
         then:
-        snapshot.classHashes.keySet() == ["Foo", "com.Foo2"] as Set
-        1 * hasher.hash(f1);
-        1 * hasher.hash(f2);
+        2 * extractor.visitFile(_)
+        1 * hasher.hash(f1)
+        1 * hasher.hash(f2)
+        1 * extractor.getDependencyInfo() >> info
         0 * _._
+
+        and:
+        snapshot.hashes.keySet() == ["Foo", "com.Foo2"] as Set
+        snapshot.info == info
     }
 }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCacheTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/LocalJarSnapshotCacheTest.groovy
similarity index 57%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCacheTest.groovy
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/LocalJarSnapshotCacheTest.groovy
index 2811a5c0fda2..aaa33ad3a41a 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/JarSnapshotCacheTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/jar/LocalJarSnapshotCacheTest.groovy
@@ -14,17 +14,22 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental
 
+
+package org.gradle.api.internal.tasks.compile.incremental.jar
+
+import org.gradle.api.internal.tasks.compile.incremental.deps.ClassDependencyInfo
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
 import spock.lang.Specification
 import spock.lang.Subject
 
-class JarSnapshotCacheTest extends Specification {
+import static org.gradle.api.internal.tasks.compile.incremental.deps.DefaultDependentsSet.dependents
+
+class LocalJarSnapshotCacheTest extends Specification {
 
     @Rule TestNameTestDirectoryProvider temp = new TestNameTestDirectoryProvider()
-    @Subject cache = new JarSnapshotCache(temp.file("cache.bin"))
+    @Subject cache = new LocalJarSnapshotCache(temp.file("cache.bin"))
 
     def "empty cache"() {
         expect:
@@ -32,19 +37,16 @@ class JarSnapshotCacheTest extends Specification {
     }
 
     def "caches snapshots"() {
-        when:
-        cache.putSnapshots([(new File("foo.jar")): new JarSnapshot(["Foo": "f".bytes])])
-
-        then:
-        cache.getSnapshot(new File("foo.jar")).classHashes == ["Foo": "f".bytes]
-    }
+        def info = new ClassDependencyInfo(["Foo": dependents("Bar"), "Bar": dependents()])
+        cache.putSnapshots([(new File("foo.jar")): new JarSnapshot(["Foo": "f".bytes], info)])
 
-    def "caches snapshots in file"() {
         when:
-        cache.putSnapshots([(new File("foo.jar")): new JarSnapshot(["Foo": "f".bytes])])
+        def cache2 = new LocalJarSnapshotCache(temp.file("cache.bin"))
+        def sn = cache2.getSnapshot(new File("foo.jar"))
 
         then:
-        def cache2 = new JarSnapshotCache(temp.file("cache.bin"))
-        cache2.getSnapshot(new File("foo.jar")).classHashes == ["Foo": "f".bytes]
+        sn == cache2.getSnapshot(new File("foo.jar"))
+        sn.hashes == ["Foo": "f".bytes]
+        sn.info.getRelevantDependents("Foo").dependentClasses == ["Bar"] as Set
     }
 }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/AccessedFromPrivateClass.java b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/AccessedFromPrivateClass.java
similarity index 91%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/AccessedFromPrivateClass.java
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/AccessedFromPrivateClass.java
index a4660dc2af72..6e2a18c55ede 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/AccessedFromPrivateClass.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/AccessedFromPrivateClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.analyzer;
+package org.gradle.api.internal.tasks.compile.incremental.test;
 
 public class AccessedFromPrivateClass {
 
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasNonPrivateConstants.java b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasNonPrivateConstants.java
similarity index 91%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasNonPrivateConstants.java
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasNonPrivateConstants.java
index 99a9ec5006b1..bc79e666ed84 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasNonPrivateConstants.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasNonPrivateConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.analyzer;
+package org.gradle.api.internal.tasks.compile.incremental.test;
 
 public class HasNonPrivateConstants extends UsedByNonPrivateConstantsClass {
     final static int X = 1;
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPrivateConstants.java b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasPrivateConstants.java
similarity index 91%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPrivateConstants.java
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasPrivateConstants.java
index a66629710a0b..3327311a5eef 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPrivateConstants.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasPrivateConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.analyzer;
+package org.gradle.api.internal.tasks.compile.incremental.test;
 
 public class HasPrivateConstants {
     private final static int X = 1;
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPublicConstants.java b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasPublicConstants.java
similarity index 91%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPublicConstants.java
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasPublicConstants.java
index a625094d215c..ec6e05913314 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/HasPublicConstants.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/HasPublicConstants.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.analyzer;
+package org.gradle.api.internal.tasks.compile.incremental.test;
 
 public class HasPublicConstants {
     public final static int X = 1;
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeClass.java b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/SomeClass.java
similarity index 93%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeClass.java
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/SomeClass.java
index aa446c8d9106..ff9c88ca7683 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeClass.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/SomeClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.analyzer;
+package org.gradle.api.internal.tasks.compile.incremental.test;
 
 import java.util.*;
 
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeOtherClass.java b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/SomeOtherClass.java
similarity index 91%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeOtherClass.java
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/SomeOtherClass.java
index 0d71da33af96..dce29d8a5a15 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/SomeOtherClass.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/SomeOtherClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.analyzer;
+package org.gradle.api.internal.tasks.compile.incremental.test;
 
 public class SomeOtherClass extends SomeClass {
 
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/UsedByNonPrivateConstantsClass.java b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/UsedByNonPrivateConstantsClass.java
similarity index 90%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/UsedByNonPrivateConstantsClass.java
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/UsedByNonPrivateConstantsClass.java
index 3a8711aeed46..c22f4c0ab3bd 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/UsedByNonPrivateConstantsClass.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/UsedByNonPrivateConstantsClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.analyzer;
+package org.gradle.api.internal.tasks.compile.incremental.test;
 
 public class UsedByNonPrivateConstantsClass {
 }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/YetAnotherClass.java b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/YetAnotherClass.java
similarity index 90%
rename from subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/YetAnotherClass.java
rename to subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/YetAnotherClass.java
index 0b9b1a6171dd..2612052bc9e9 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/analyzer/YetAnotherClass.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/compile/incremental/test/YetAnotherClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.tasks.compile.incremental.analyzer;
+package org.gradle.api.internal.tasks.compile.incremental.test;
 
 public class YetAnotherClass {
 }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/report/CompositeTestResultsTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/report/CompositeTestResultsTest.groovy
index af8036cc819f..a1fc20e3b7f6 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/report/CompositeTestResultsTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/report/CompositeTestResultsTest.groovy
@@ -69,6 +69,26 @@ class CompositeTestResultsTest extends Specification {
         results.formattedSuccessRate == '50%'
     }
 
+    def formatsSuccessRateWhenAllTestsFail() {
+        def failed = results.addTest(test())
+        results.failed(failed)
+
+        expect:
+        results.successRate == 0
+        results.formattedSuccessRate == '0%'
+    }
+
+    def formatsSuccessRateWhenAllTestsAreIgnored() {
+        results.addTest(test())
+        results.addTest(test())
+        results.ignored(test());
+        results.ignored(test());
+
+        expect:
+        results.successRate == null
+        results.formattedSuccessRate == '-'
+    }
+
     def formatsDurationWhenNoTests() {
         expect:
         results.formattedDuration == '-'
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReportTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReportTest.groovy
index 7d621fe12f22..2ed2ea7cc348 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReportTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReportTest.groovy
@@ -49,67 +49,6 @@ class DefaultTestReportTest extends Specification {
         index.assertHasNoNavLinks()
     }
 
-    TestResultsProvider buildResults(Closure closure) {
-        ConfigureUtil.configure(closure, new BuildableTestResultsProvider())
-    }
-
-    TestResultsProvider passingBuildResults() {
-        buildResults {
-            testClassResult("org.gradle.passing.Passed") {
-                testcase("passed") {
-                    duration = 1000;
-                }
-            }
-            testClassResult("org.gradle.passing.subpackage.AlsoPassed") {
-                testcase("passedToo") {
-                    duration = 1000;
-                    stdout "this is\nstandard output"
-                    stderr "this is\nstandard error"
-                }
-            }
-        }
-    }
-
-    TestResultsProvider failingBuildResults() {
-        buildResults {
-            testClassResult("org.gradle.passing.Passed") {
-                testcase("passed") {
-                    duration = 1000;
-                }
-            }
-            testClassResult("org.gradle.passing.AlsoPassed") {
-                testcase("passedToo") {
-                    duration = 1000;
-                    stdout "this is\nstandard output"
-                    stderr "this is\nstandard error"
-                }
-            }
-            testClassResult("org.gradle.ignoring.SomeIgnoredSomePassed") {
-                testcase("passed") {
-                    duration = 1000;
-                }
-                testcase("ignored") {
-                    duration = 1000;
-                    ignore()
-                }
-            }
-            testClassResult("org.gradle.failing.SomeIgnoredSomePassedSomeFailed") {
-                testcase("passed") {
-                    duration = 1000;
-                }
-                testcase("ignored") {
-                    duration = 1000;
-                    ignore()
-                }
-                testcase("failed") {
-                    duration = 1000;
-                    failure("something failed", "this is the failure\nat someClass")
-                }
-            }
-        }
-    }
-
-
     def generatesReportWithAggregatedIndexPageForBuildWithNoFailures() {
         given:
         def testTestResults = passingBuildResults()
@@ -163,10 +102,8 @@ class DefaultTestReportTest extends Specification {
         alsoPassedClassDetails.assertSuccessRate("100%");
         alsoPassedClassDetails.assertPassed()
         alsoPassedClassDetails.assertLinksTo("classes/org.gradle.passing.subpackage.AlsoPassed.html");
-
     }
 
-
     def generatesReportWithAggregatedIndexPageForFailingBuild() {
         given:
         def testTestResults = failingBuildResults()
@@ -252,7 +189,6 @@ class DefaultTestReportTest extends Specification {
         someFailedClassDetails.assertLinksTo("classes/org.gradle.failing.SomeIgnoredSomePassedSomeFailed.html");
     }
 
-
     def generatesReportWithAggregatedPackagePages() {
         given:
         def testTestResults = failingBuildResults()
@@ -327,7 +263,6 @@ class DefaultTestReportTest extends Specification {
         someFailedClassDetails.assertLinksTo("classes/org.gradle.failing.SomeIgnoredSomePassedSomeFailed.html");
     }
 
-
     def generatesReportWithClassPages() {
         given:
         def testTestResults = failingBuildResults()
@@ -405,41 +340,6 @@ class DefaultTestReportTest extends Specification {
         failingClassFile.assertHasFailure('failed', 'something failed\n\nthis is the failure\nat someClass\n')
     }
 
-    TestResultsProvider aggregatedBuildResultsRun1() {
-        buildResults {
-            testClassResult("org.gradle.aggregation.FooTest") {
-                testcase("first") {
-                    duration = 1000;
-                }
-            }
-            testClassResult("org.gradle.aggregation.BarTest") {
-                testcase("second") {
-                    duration = 1000;
-                    stdout "this is\nstandard output"
-                    stderr "this is\nstandard error"
-                }
-            }
-        }
-    }
-
-    TestResultsProvider aggregatedBuildResultsRun2(methodNameSuffix = "") {
-        buildResults {
-            testClassResult("org.gradle.aggregation.FooTest") {
-                testcase("first" + methodNameSuffix) {
-                    duration = 1000;
-                }
-            }
-            testClassResult("org.gradle.aggregation.BarTest") {
-                testcase("second" + methodNameSuffix) {
-                    duration = 1100;
-                    stdout "failed on second run\nstandard output"
-                    stderr "failed on second run\nstandard error"
-                    failure("something failed", "this is the failure\nat someClass")
-                }
-            }
-        }
-    }
-
     def aggregateSameTestsRunWithDifferentResults() {
         given:
         def firstTestResults = aggregatedBuildResultsRun1()
@@ -577,6 +477,101 @@ class DefaultTestReportTest extends Specification {
         testClassFile.assertHasStandardError('err:\u0102')
     }
 
+    TestResultsProvider buildResults(Closure closure) {
+        ConfigureUtil.configure(closure, new BuildableTestResultsProvider())
+    }
+
+    TestResultsProvider passingBuildResults() {
+        buildResults {
+            testClassResult("org.gradle.passing.Passed") {
+                testcase("passed") {
+                    duration = 1000;
+                }
+            }
+            testClassResult("org.gradle.passing.subpackage.AlsoPassed") {
+                testcase("passedToo") {
+                    duration = 1000;
+                    stdout "this is\nstandard output"
+                    stderr "this is\nstandard error"
+                }
+            }
+        }
+    }
+
+    TestResultsProvider failingBuildResults() {
+        buildResults {
+            testClassResult("org.gradle.passing.Passed") {
+                testcase("passed") {
+                    duration = 1000;
+                }
+            }
+            testClassResult("org.gradle.passing.AlsoPassed") {
+                testcase("passedToo") {
+                    duration = 1000;
+                    stdout "this is\nstandard output"
+                    stderr "this is\nstandard error"
+                }
+            }
+            testClassResult("org.gradle.ignoring.SomeIgnoredSomePassed") {
+                testcase("passed") {
+                    duration = 1000;
+                }
+                testcase("ignored") {
+                    duration = 1000;
+                    ignore()
+                }
+            }
+            testClassResult("org.gradle.failing.SomeIgnoredSomePassedSomeFailed") {
+                testcase("passed") {
+                    duration = 1000;
+                }
+                testcase("ignored") {
+                    duration = 1000;
+                    ignore()
+                }
+                testcase("failed") {
+                    duration = 1000;
+                    failure("something failed", "this is the failure\nat someClass")
+                }
+            }
+        }
+    }
+
+    TestResultsProvider aggregatedBuildResultsRun1() {
+        buildResults {
+            testClassResult("org.gradle.aggregation.FooTest") {
+                testcase("first") {
+                    duration = 1000;
+                }
+            }
+            testClassResult("org.gradle.aggregation.BarTest") {
+                testcase("second") {
+                    duration = 1000;
+                    stdout "this is\nstandard output"
+                    stderr "this is\nstandard error"
+                }
+            }
+        }
+    }
+
+    TestResultsProvider aggregatedBuildResultsRun2(methodNameSuffix = "") {
+        buildResults {
+            testClassResult("org.gradle.aggregation.FooTest") {
+                testcase("first" + methodNameSuffix) {
+                    duration = 1000;
+                }
+            }
+            testClassResult("org.gradle.aggregation.BarTest") {
+                testcase("second" + methodNameSuffix) {
+                    duration = 1100;
+                    stdout "failed on second run\nstandard output"
+                    stderr "failed on second run\nstandard error"
+                    failure("something failed", "this is the failure\nat someClass")
+                }
+            }
+        }
+    }
+
     def results(TestFile file) {
         return new HtmlTestResultsFixture(file)
     }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/testng/TestNGTestClassProcessorTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/testng/TestNGTestClassProcessorTest.groovy
index 8a72df6653f1..ac0b8f51175d 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/testng/TestNGTestClassProcessorTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/internal/tasks/testing/testng/TestNGTestClassProcessorTest.groovy
@@ -27,6 +27,9 @@ import org.gradle.internal.id.LongIdGenerator
 import org.gradle.logging.StandardOutputRedirector
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.junit.Rule
+import org.testng.ITestContext
+import org.testng.ITestListener
+import org.testng.ITestResult
 import org.testng.annotations.*
 import spock.lang.Ignore
 import spock.lang.Specification
@@ -213,6 +216,33 @@ class TestNGTestClassProcessorTest extends Specification {
         then: 1 * processor.completed(1, _)
         0 * processor._
     }
+
+    void "custom test listeners can change test status"() {
+        options.listeners << FailSkippedTestsListener.class.name
+
+        when: process(ATestNGClassWithSkippedTest)
+
+        then: 1 * processor.completed(_, { it.resultType == ResultType.FAILURE})
+    }
+}
+
+public class FailSkippedTestsListener implements ITestListener {
+    void onTestStart(ITestResult result) {}
+    void onTestSuccess(ITestResult result) {
+        result.setStatus(ITestResult.FAILURE)
+    }
+    void onTestFailure(ITestResult result) {}
+    void onTestSkipped(ITestResult result) {
+
+    }
+    void onTestFailedButWithinSuccessPercentage(ITestResult result) {}
+    void onStart(ITestContext context) {}
+    void onFinish(ITestContext context) {}
+}
+
+public class ATestNGClassWithSkippedTest {
+    @org.testng.annotations.Test
+    public void skipMe() {}
 }
 
 public class ATestNGClass {
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaBasePluginTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaBasePluginTest.groovy
index 07767f2b1793..86bbf1db28a8 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaBasePluginTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaBasePluginTest.groovy
@@ -14,8 +14,10 @@
  * limitations under the License.
  */
 package org.gradle.api.plugins
+
 import org.gradle.api.DefaultTask
 import org.gradle.api.Project
+import org.gradle.api.jvm.ClassDirectoryBinary
 import org.gradle.api.reporting.ReportingExtension
 import org.gradle.api.tasks.Copy
 import org.gradle.api.tasks.SourceSet
@@ -24,8 +26,6 @@ import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.api.tasks.testing.Test
-import org.gradle.internal.reflect.Instantiator
-import org.gradle.language.jvm.ClassDirectoryBinary
 import org.gradle.util.SetSystemProperties
 import org.gradle.util.TestUtil
 import org.junit.Rule
@@ -38,11 +38,10 @@ class JavaBasePluginTest extends Specification {
     @Rule
     public SetSystemProperties sysProperties = new SetSystemProperties()
     private final Project project = TestUtil.createRootProject()
-    private final JavaBasePlugin javaBasePlugin = new JavaBasePlugin(project.services.get(Instantiator))
 
     void appliesBasePluginsAndAddsConventionObject() {
         when:
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
 
         then:
         project.plugins.hasPlugin(ReportingBasePlugin)
@@ -53,7 +52,7 @@ class JavaBasePluginTest extends Specification {
 
     void createsTasksAndAppliesMappingsForNewSourceSet() {
         when:
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
         project.sourceSets.create('custom')
         
         then:
@@ -89,7 +88,7 @@ class JavaBasePluginTest extends Specification {
 
     void "wires generated resources task into classes task for sourceset"() {
         when:
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
         project.sourceSets.create('custom')
 
         and:
@@ -106,7 +105,7 @@ class JavaBasePluginTest extends Specification {
         def resourcesDir = project.file('target/resources')
 
         when:
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
         project.sourceSets.create('custom')
         project.sourceSets.custom.output.classesDir = classesDir
         project.sourceSets.custom.output.resourcesDir = resourcesDir
@@ -121,7 +120,7 @@ class JavaBasePluginTest extends Specification {
 
     void createsConfigurationsForNewSourceSet() {
         when:
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
         def sourceSet = project.sourceSets.create('custom')
 
         then:
@@ -147,7 +146,7 @@ class JavaBasePluginTest extends Specification {
 
     void appliesMappingsToTasksDefinedByBuildScript() {
         when:
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
 
         then:
         def compile = project.task('customCompile', type: JavaCompile)
@@ -155,37 +154,19 @@ class JavaBasePluginTest extends Specification {
 
         def test = project.task('customTest', type: Test.class)
         test.workingDir == project.projectDir
-        test.testResultsDir == project.testResultsDir
-        test.testReportDir == project.testReportDir
-        test.testReport //by default (JUnit), the report is 'on'
+        test.reports.junitXml.destination == project.testResultsDir
+        test.reports.html.destination == project.testReportDir
+        test.reports.junitXml.enabled
+        test.reports.html.enabled
 
         def javadoc = project.task('customJavadoc', type: Javadoc)
         javadoc.destinationDir == project.file("$project.docsDir/javadoc")
         javadoc.title == project.extensions.getByType(ReportingExtension).apiDocTitle
     }
 
-    void "configures test task for testNG"() {
-        given:
-        javaBasePlugin.apply(project)
-        def test = project.task('customTest', type: Test.class)
-
-        when:
-        test.useTestNG()
-
-        then:
-        assert test.testReport
-
-        when:
-        test.testReport = false
-        test.useTestNG()
-
-        then:
-        assert !test.testReport
-    }
-
     void appliesMappingsToCustomJarTasks() {
         when:
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
         def task = project.task('customJar', type: Jar)
 
         then:
@@ -195,7 +176,7 @@ class JavaBasePluginTest extends Specification {
 
     void createsLifecycleBuildTasks() {
         when:
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
 
         then:
         def build = project.tasks[JavaBasePlugin.BUILD_TASK_NAME]
@@ -209,7 +190,7 @@ class JavaBasePluginTest extends Specification {
     }
 
     def configuresTestTaskWhenDebugSystemPropertyIsSet() {
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
         def task = project.tasks.create('test', Test.class)
 
         when:
@@ -221,7 +202,7 @@ class JavaBasePluginTest extends Specification {
     }
 
     def "configures test task when test.single is used"() {
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
         def task = project.tasks.create('test', Test.class)
         task.include 'ignoreme'
 
@@ -235,7 +216,7 @@ class JavaBasePluginTest extends Specification {
     }
 
     def "adds functional and language source sets for each source set added to the 'sourceSets' container"() {
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
 
         when:
         project.sourceSets {
@@ -267,7 +248,7 @@ class JavaBasePluginTest extends Specification {
     }
 
     def "adds a class directory binary for each source set added to the 'sourceSets' container"() {
-        javaBasePlugin.apply(project)
+        project.plugins.apply(JavaBasePlugin)
 
         when:
         project.sourceSets {
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaLanguagePluginTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaLanguagePluginTest.groovy
index 990bbec0a382..38c72a091375 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaLanguagePluginTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaLanguagePluginTest.groovy
@@ -18,8 +18,7 @@ package org.gradle.api.plugins
 import org.gradle.api.Project
 import org.gradle.language.java.JavaSourceSet
 import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.language.jvm.ClassDirectoryBinary
-import org.gradle.language.jvm.plugins.JvmLanguagePlugin
+import org.gradle.api.jvm.ClassDirectoryBinary
 import org.gradle.util.TestUtil
 
 import spock.lang.Specification
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaPluginTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaPluginTest.groovy
index 2a6f333ecc23..245faa1243c2 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaPluginTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JavaPluginTest.groovy
@@ -243,8 +243,8 @@ class JavaPluginTest {
         assertThat(task.classpath, equalTo(project.sourceSets.test.runtimeClasspath))
         assertThat(task.testClassesDir, equalTo(project.sourceSets.test.output.classesDir))
         assertThat(task.workingDir, equalTo(project.projectDir))
-        assertThat(task.testResultsDir, equalTo(project.testResultsDir))
-        assertThat(task.testReportDir, equalTo(project.testReportDir))
+        assertThat(task.reports.junitXml.destination, equalTo(project.testResultsDir))
+        assertThat(task.reports.html.destination, equalTo(project.testReportDir))
     }
 
     @Test public void buildOtherProjects() {
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JvmLanguagePluginTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JvmLanguagePluginTest.groovy
index f495ede3957c..f40057688937 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JvmLanguagePluginTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/JvmLanguagePluginTest.groovy
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 package org.gradle.api.plugins
-import org.gradle.language.jvm.ClassDirectoryBinary
+
+import org.gradle.api.internal.jvm.DefaultClassDirectoryBinary
+import org.gradle.api.jvm.ClassDirectoryBinary
 import org.gradle.language.jvm.ResourceSet
-import org.gradle.language.jvm.internal.DefaultClassDirectoryBinary
-import org.gradle.language.jvm.plugins.JvmLanguagePlugin
 import org.gradle.language.jvm.tasks.ProcessResources
 import org.gradle.util.TestUtil
 import spock.lang.Specification
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/LanguageBasePluginTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/LanguageBasePluginTest.groovy
index e227cf55c899..bb0397b0485d 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/LanguageBasePluginTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/plugins/LanguageBasePluginTest.groovy
@@ -15,10 +15,10 @@
  */
 package org.gradle.api.plugins
 import org.gradle.api.Project
-import org.gradle.language.base.BinaryContainer
+import org.gradle.runtime.base.BinaryContainer
 import org.gradle.language.base.ProjectSourceSet
-import org.gradle.language.base.internal.BinaryInternal
-import org.gradle.language.base.internal.BinaryNamingScheme
+import org.gradle.runtime.base.internal.BinaryInternal
+import org.gradle.runtime.base.internal.BinaryNamingScheme
 import org.gradle.language.base.plugins.LanguageBasePlugin
 import org.gradle.util.TestUtil
 import spock.lang.Specification
@@ -51,6 +51,6 @@ class LanguageBasePluginTest extends Specification {
         _ * binary.name >> "binaryName"
         1 * binary.namingScheme >> namingScheme
         1 * namingScheme.lifecycleTaskName >> "lifecycle"
-        1 * binary.setLifecycleTask({it == project.tasks.findByName("lifecycle")})
+        1 * binary.setBuildTask({it == project.tasks.findByName("lifecycle")})
     }
 }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/GroovyRuntimeTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/GroovyRuntimeTest.groovy
index 27cebddc72a0..791e11468ea2 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/GroovyRuntimeTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/GroovyRuntimeTest.groovy
@@ -57,9 +57,8 @@ class GroovyRuntimeTest extends Specification {
         with(classpath.delegate) {
             it instanceof Configuration
             state == Configuration.State.UNRESOLVED
-            dependencies.size() == 2
+            dependencies.size() == 1
             dependencies.any { it.group == "org.codehaus.groovy" && it.name == "groovy" && it.version == "2.1.2" } // not sure how to check classifier
-            dependencies.any { it.group == "org.codehaus.groovy" && it.name == "groovy-ant" && it.version == "2.1.2" } // not sure how to check classifier
         }
 
         where:
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/CompileOptionsTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/CompileOptionsTest.groovy
index 8eee899b35a3..bb40f3a135c6 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/CompileOptionsTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/CompileOptionsTest.groovy
@@ -40,16 +40,13 @@ class CompileOptionsTest {
         assertTrue(compileOptions.failOnError)
         assertTrue(compileOptions.warnings)
 
-        assertFalse(compileOptions.includeJavaRuntime)
         assertFalse(compileOptions.deprecation)
         assertFalse(compileOptions.listFiles)
         assertFalse(compileOptions.verbose)
         assertFalse(compileOptions.fork)
-        assertFalse(compileOptions.useAnt)
 
         assertThat(compileOptions.compilerArgs, isEmpty())
         assertNull(compileOptions.encoding)
-        assertNull(compileOptions.compiler)
         assertNull(compileOptions.bootClasspath)
         assertNull(compileOptions.extensionDirs)
 
@@ -67,7 +64,6 @@ class CompileOptionsTest {
         Map optionMap = compileOptions.optionMap()
         Map nullables = [
                 encoding: 'encoding',
-                compiler: 'compiler',
                 bootClasspath: 'bootClasspath',
                 extensionDirs: 'extdirs'
         ]
@@ -89,8 +85,7 @@ class CompileOptionsTest {
                 listFiles: 'listFiles',
                 deprecation: 'deprecation',
                 warnings: 'nowarn',
-                debug: 'debug',
-                includeJavaRuntime: 'includeJavaRuntime'
+                debug: 'debug'
         ]
         booleans.keySet().each {compileOptions."$it" = true}
         Map optionMap = compileOptions.optionMap()
@@ -158,13 +153,11 @@ class CompileOptionsTest {
 
     @Test public void testDefine() {
         compileOptions.debug = false
-        compileOptions.compiler = null
         compileOptions.bootClasspath = 'xxxx'
         compileOptions.fork = false
         compileOptions.useDepend = false
-        compileOptions.define(debug: true, compiler: 'compiler', bootClasspath: null)
+        compileOptions.define(debug: true, bootClasspath: null)
         assertTrue(compileOptions.debug)
-        assertEquals('compiler', compileOptions.compiler)
         assertNull(compileOptions.bootClasspath)
         assertFalse(compileOptions.fork)
         assertFalse(compileOptions.useDepend)
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/GroovyCompileOptionsTest.groovy b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/GroovyCompileOptionsTest.groovy
index c64fb7e494b9..b007a01a3c93 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/GroovyCompileOptionsTest.groovy
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/GroovyCompileOptionsTest.groovy
@@ -33,8 +33,6 @@ class GroovyCompileOptionsTest {
 
     @Test public void testCompileOptions() {
         assertTrue(compileOptions.failOnError)
-        assertFalse(compileOptions.includeJavaRuntime)
-        assertFalse(compileOptions.stacktrace)
         assertFalse(compileOptions.listFiles)
         assertFalse(compileOptions.verbose)
         assertTrue(compileOptions.fork)
@@ -53,8 +51,7 @@ class GroovyCompileOptionsTest {
                 failOnError: 'failOnError',
                 verbose: 'verbose',
                 listFiles: 'listFiles',
-                fork: 'fork',
-                includeJavaRuntime: 'includeJavaRuntime'
+                fork: 'fork'
         ]
         booleans.keySet().each {compileOptions."$it" = true}
         Map optionMap = compileOptions.optionMap()
@@ -89,12 +86,10 @@ class GroovyCompileOptionsTest {
     }
 
     @Test public void testDefine() {
-        compileOptions.stacktrace = false
         compileOptions.verbose = false
         compileOptions.encoding = 'xxxx'
         compileOptions.fork = false
-        compileOptions.define(stacktrace: true, encoding: 'encoding')
-        assertTrue(compileOptions.stacktrace)
+        compileOptions.define( encoding: 'encoding')
         assertEquals('encoding', compileOptions.encoding)
         assertFalse(compileOptions.verbose)
     }
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/JavaCompileTest.java b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/JavaCompileTest.java
deleted file mode 100644
index 1be1abadf582..000000000000
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/compile/JavaCompileTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2007 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.api.tasks.compile;
-
-import org.gradle.api.internal.ConventionTask;
-import org.gradle.api.internal.tasks.compile.Compiler;
-import org.gradle.api.internal.tasks.compile.JavaCompileSpec;
-import org.gradle.api.tasks.WorkResult;
-import org.gradle.util.GFileUtils;
-import org.gradle.util.JUnit4GroovyMockery;
-import org.hamcrest.Matchers;
-import org.jmock.Expectations;
-import org.jmock.Mockery;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.io.File;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-@RunWith(org.jmock.integration.junit4.JMock.class)
-public class JavaCompileTest extends AbstractCompileTest {
-    private JavaCompile compile;
-
-    private Compiler<JavaCompileSpec> compilerMock;
-
-    private Mockery context = new JUnit4GroovyMockery();
-
-    @Before
-    public void setUp()  {
-        compile = createTask(JavaCompile.class);
-        compilerMock = context.mock(Compiler.class);
-        compile.setJavaCompiler(compilerMock);
-
-        GFileUtils.touch(new File(srcDir, "incl/file.java"));
-    }
-           
-    public ConventionTask getTask() {
-        return compile;
-    }
-
-    public void testExecute(final int numFilesCompiled) {
-        setUpMocksAndAttributes(compile);
-        context.checking(new Expectations() {{
-            WorkResult result = context.mock(WorkResult.class);
-
-            one(compilerMock).execute((JavaCompileSpec) with(Matchers.notNullValue()));
-            will(returnValue(result));
-            allowing(result).getDidWork();
-            will(returnValue(numFilesCompiled > 0));
-        }});
-        compile.compile();
-    }
-
-    @Test
-    public void testExecuteDoingWork() {
-        testExecute(7);
-        assertTrue(compile.getDidWork());
-    }
-
-    @Test
-    public void testExecuteNotDoingWork() {
-        testExecute(0);
-        assertFalse(compile.getDidWork());
-    }
-
-    public JavaCompile getCompile() {
-        return compile;
-    }
-}
diff --git a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/testing/TestTest.java b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/testing/TestTest.java
index 37dd054c9493..e9ccad03f1a3 100644
--- a/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/testing/TestTest.java
+++ b/subprojects/plugins/src/test/groovy/org/gradle/api/tasks/testing/TestTest.java
@@ -109,8 +109,8 @@ public void testInit() {
         assertThat(test.getTestFramework(), instanceOf(JUnitTestFramework.class));
         assertNull(test.getTestClassesDir());
         assertNull(test.getClasspath());
-        assertNull(test.getTestResultsDir());
-        assertNull(test.getTestReportDir());
+        assertNull(test.getReports().getJunitXml().getDestination());
+        assertNull(test.getReports().getHtml().getDestination());
         assertThat(test.getIncludes(), isEmpty());
         assertThat(test.getExcludes(), isEmpty());
         assertFalse(test.getIgnoreFailures());
@@ -359,9 +359,9 @@ private void configureTask() {
         test.setTestExecuter(testExecuterMock);
 
         test.setTestClassesDir(classesDir);
-        test.setTestResultsDir(resultsDir);
+        test.getReports().getJunitXml().setDestination(resultsDir);
         test.setBinResultsDir(binResultsDir);
-        test.setTestReportDir(reportDir);
+        test.getReports().getHtml().setDestination(reportDir);
         test.setClasspath(classpathMock);
         test.setTestSrcDirs(Collections.<File>emptyList());
     }
diff --git a/subprojects/reporting/src/main/groovy/org/gradle/api/reporting/GenerateBuildDashboard.java b/subprojects/reporting/src/main/groovy/org/gradle/api/reporting/GenerateBuildDashboard.java
index 083e372f95af..64ca1cd55e80 100644
--- a/subprojects/reporting/src/main/groovy/org/gradle/api/reporting/GenerateBuildDashboard.java
+++ b/subprojects/reporting/src/main/groovy/org/gradle/api/reporting/GenerateBuildDashboard.java
@@ -47,12 +47,16 @@ public class GenerateBuildDashboard extends DefaultTask implements Reporting<Bui
     @Nested
     private final DefaultBuildDashboardReports reports;
 
-    @Inject
-    public GenerateBuildDashboard(Instantiator instantiator) {
-        reports = instantiator.newInstance(DefaultBuildDashboardReports.class, this);
+    public GenerateBuildDashboard() {
+        reports = getInstantiator().newInstance(DefaultBuildDashboardReports.class, this);
         reports.getHtml().setEnabled(true);
     }
 
+    @Inject
+    protected Instantiator getInstantiator() {
+        throw new UnsupportedOperationException();
+    }
+
     @Input
     public Set<ReportState> getInputReports() {
         Set<ReportState> inputs = new HashSet<ReportState>();
diff --git a/subprojects/resources-http/resources-http.gradle b/subprojects/resources-http/resources-http.gradle
new file mode 100644
index 000000000000..8f2b8d6e8b56
--- /dev/null
+++ b/subprojects/resources-http/resources-http.gradle
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+dependencies {
+    compile project(':resources')
+    compile project(':baseServices')
+    compile libraries.commons_httpclient
+    compile libraries.commons_lang
+    compile libraries.nekohtml
+
+    testCompile libraries.groovy
+}
+
+useTestFixtures()
+useClassycle()
diff --git a/subprojects/resources-http/src/main/java/org/gradle/internal/resource/PasswordCredentials.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/PasswordCredentials.java
new file mode 100644
index 000000000000..e36190aae5e0
--- /dev/null
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/PasswordCredentials.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource;
+
+public class PasswordCredentials {
+
+    private final String username;
+    private final String password;
+
+    public PasswordCredentials() {
+        this(null, null);
+    }
+
+    public PasswordCredentials(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ApacheDirectoryListingParser.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ApacheDirectoryListingParser.java
similarity index 79%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ApacheDirectoryListingParser.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ApacheDirectoryListingParser.java
index 437d14e8e828..e87ba80aa952 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ApacheDirectoryListingParser.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ApacheDirectoryListingParser.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.cyberneko.html.parsers.SAXParser;
-import org.gradle.api.internal.resource.ResourceException;
+import org.gradle.internal.resource.UriResource;
+import org.gradle.internal.resource.ResourceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.Attributes;
@@ -25,7 +26,10 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.helpers.DefaultHandler;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -36,15 +40,12 @@ public class ApacheDirectoryListingParser {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ApacheDirectoryListingParser.class);
 
-    public ApacheDirectoryListingParser() {
-    }
-
-    public List<URI> parse(URI baseURI, InputStream content, String contentType) throws Exception {
+    public List<String> parse(URI baseURI, InputStream content, String contentType) throws Exception {
         baseURI = addTrailingSlashes(baseURI);
         if (contentType == null || !contentType.startsWith("text/html")) {
             throw new ResourceException(String.format("Unsupported ContentType %s for DirectoryListing", contentType));
         }
-        String contentEncoding = contentType.contains("charset=") ? contentType.substring(contentType.indexOf('=') + 1) : "utf-8";
+        String contentEncoding = UriResource.extractCharacterEncoding(contentType, "utf-8");
         final Reader htmlText = new InputStreamReader(content, contentEncoding);
         final InputSource inputSource = new InputSource(htmlText);
         final SAXParser htmlParser = new SAXParser();
@@ -67,12 +68,12 @@ private URI addTrailingSlashes(URI uri) throws IOException, URISyntaxException {
         return uri;
     }
 
-    private List<URI> filterNonDirectChilds(URI baseURI, List<URI> inputURIs) throws MalformedURLException {
+    private List<String> filterNonDirectChilds(URI baseURI, List<URI> inputURIs) throws MalformedURLException {
         final int baseURIPort = baseURI.getPort();
         final String baseURIHost = baseURI.getHost();
         final String baseURIScheme = baseURI.getScheme();
 
-        List<URI> uris = new ArrayList<URI>();
+        List<String> uris = new ArrayList<String>();
         final String prefixPath = baseURI.getPath();
         for (URI parsedURI : inputURIs) {
             if (parsedURI.getHost() != null && !parsedURI.getHost().equals(baseURIHost)) {
@@ -95,7 +96,20 @@ private List<URI> filterNonDirectChilds(URI baseURI, List<URI> inputURIs) throws
                 continue;
             }
 
-            uris.add(parsedURI);
+            String path = parsedURI.getPath();
+            int pos = path.lastIndexOf('/');
+            if (pos < 0) {
+                uris.add(path);
+            } else if (pos == path.length() - 1) {
+                int start = path.lastIndexOf('/', pos - 1);
+                if (start < 0) {
+                    uris.add(path.substring(0, pos));
+                } else {
+                    uris.add(path.substring(start + 1, pos));
+                }
+            } else {
+                uris.add(path.substring(pos + 1));
+            }
         }
         return uris;
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/DefaultHttpSettings.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/DefaultHttpSettings.java
similarity index 89%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/DefaultHttpSettings.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/DefaultHttpSettings.java
index 1ab34581fc6b..1fd13a98dc6f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/DefaultHttpSettings.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/DefaultHttpSettings.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
-import org.gradle.api.artifacts.repositories.PasswordCredentials;
+
+import org.gradle.internal.resource.PasswordCredentials;
 
 public class DefaultHttpSettings implements HttpSettings {
     private final PasswordCredentials passwordCredentials;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientConfigurer.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpClientConfigurer.java
similarity index 92%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientConfigurer.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpClientConfigurer.java
index 5acf28d4d267..72bdc21cfe0d 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientConfigurer.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpClientConfigurer.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
@@ -31,11 +31,10 @@
 import org.apache.http.params.HttpProtocolParams;
 import org.apache.http.protocol.ExecutionContext;
 import org.apache.http.protocol.HttpContext;
-import org.gradle.api.artifacts.repositories.PasswordCredentials;
-import org.gradle.api.internal.externalresource.transport.http.ntlm.NTLMCredentials;
-import org.gradle.api.internal.externalresource.transport.http.ntlm.NTLMSchemeFactory;
-import org.gradle.api.internal.resource.UriResource;
-import org.gradle.util.GUtil;
+import org.gradle.internal.resource.PasswordCredentials;
+import org.gradle.internal.resource.transport.http.ntlm.NTLMCredentials;
+import org.gradle.internal.resource.transport.http.ntlm.NTLMSchemeFactory;
+import org.gradle.internal.resource.UriResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -59,7 +58,8 @@ public void configure(DefaultHttpClient httpClient) {
     }
 
     private void configureCredentials(DefaultHttpClient httpClient, PasswordCredentials credentials) {
-        if (GUtil.isTrue(credentials.getUsername())) {
+        String username = credentials.getUsername();
+        if (username != null && username.length() > 0) {
             useCredentials(httpClient, credentials, AuthScope.ANY_HOST, AuthScope.ANY_PORT);
 
             // Use preemptive authorisation if no other authorisation has been established
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientHelper.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpClientHelper.java
similarity index 97%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientHelper.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpClientHelper.java
index b482f771432f..8412a76b588e 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientHelper.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpClientHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
@@ -117,7 +117,7 @@ private HttpResponse processResponse(String source, String method, HttpResponse
             return null;
         }
         if (!wasSuccessful(response)) {
-            LOGGER.info("Failed to get resource: {}. [HTTP {}: {}]", new Object[]{method, response.getStatusLine(), source});
+            LOGGER.info("Failed to get resource: {}. [HTTP {}: {}]", method, response.getStatusLine(), source);
             throw new UncheckedIOException(String.format("Could not %s '%s'. Received status code %s from server: %s",
                     method, source, response.getStatusLine().getStatusCode(), response.getStatusLine().getReasonPhrase()));
         }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpProxySettings.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpProxySettings.java
similarity index 79%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpProxySettings.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpProxySettings.java
index 25b6aaf6b87c..fbb8b9125c10 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpProxySettings.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpProxySettings.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
-import org.gradle.api.artifacts.repositories.PasswordCredentials;
-import org.gradle.api.internal.artifacts.repositories.DefaultPasswordCredentials;
+
+import org.gradle.internal.resource.PasswordCredentials;
 
 public interface HttpProxySettings {
-    
+
     HttpProxy getProxy();
-    
+
     HttpProxy getProxy(String host);
 
     public class HttpProxy {
@@ -35,7 +35,7 @@ public HttpProxy(String host, int port, String username, String password) {
             if (username == null || username.length() == 0) {
                 credentials = null;
             } else {
-                credentials = new DefaultPasswordCredentials(username, password);
+                credentials = new PasswordCredentials(username, password);
             }
         }
     }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpRequestException.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpRequestException.java
similarity index 94%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpRequestException.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpRequestException.java
index 78c25812af7d..971b8fb15a9d 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpRequestException.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpRequestException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.gradle.api.UncheckedIOException;
 import org.gradle.internal.exceptions.Contextual;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceAccessor.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceAccessor.java
similarity index 60%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceAccessor.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceAccessor.java
index 87cce8a2ba88..99243b4b2a2e 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceAccessor.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceAccessor.java
@@ -14,18 +14,22 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.util.EntityUtils;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceAccessor;
+import org.gradle.api.Nullable;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.transfer.ExternalResourceAccessor;
 import org.gradle.internal.hash.HashValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,30 +44,48 @@ public HttpResourceAccessor(HttpClientHelper http) {
         this.http = http;
     }
 
-    public HttpResponseResource getResource(String location) throws IOException {
+    @Nullable
+    public HttpResponseResource getResource(final URI uri) throws IOException {
         abortOpenResources();
+        String location = uri.toString();
         LOGGER.debug("Constructing external resource: {}", location);
+
         HttpResponse response = http.performGet(location);
         if (response != null) {
-            HttpResponseResource resource = new HttpResponseResource("GET", location, response) {
-                @Override
-                public void close() throws IOException {
-                    super.close();
-                    HttpResourceAccessor.this.openResources.remove(this);
-                }
-            };
-
+            HttpResponseResource resource = wrapResponse(uri, response);
             return recordOpenGetResource(resource);
-        } else {
-            return null;
         }
+
+        return null;
     }
 
-    public ExternalResourceMetaData getMetaData(String location) {
+    /**
+     * Same as #getResource except that it always gives access to the response body,
+     * irrespective of the returned HTTP status code. Never returns {@code null}.
+     */
+    public HttpResponseResource getRawResource(final URI uri) throws IOException {
         abortOpenResources();
+        String location = uri.toString();
+        LOGGER.debug("Constructing external resource: {}", location);
+
+        HttpRequestBase request = new HttpGet(uri);
+        HttpResponse response;
+        try {
+            response = http.performHttpRequest(request);
+        } catch (IOException e) {
+            throw new HttpRequestException(String.format("Could not %s '%s'.", request.getMethod(), request.getURI()), e);
+        }
+
+        HttpResponseResource resource = wrapResponse(uri, response);
+        return recordOpenGetResource(resource);
+    }
+
+    public ExternalResourceMetaData getMetaData(URI uri) {
+        abortOpenResources();
+        String location = uri.toString();
         LOGGER.debug("Constructing external resource metadata: {}", location);
         HttpResponse response = http.performHead(location);
-        return response == null ? null : new HttpResponseResource("HEAD", location, response).getMetaData();
+        return response == null ? null : new HttpResponseResource("HEAD", uri, response).getMetaData();
     }
 
     private HttpResponseResource recordOpenGetResource(HttpResponseResource httpResource) {
@@ -83,7 +105,7 @@ private void abortOpenResources() {
         openResources.clear();
     }
 
-    public HashValue getResourceSha1(String location) {
+    public HashValue getResourceSha1(URI location) {
         String checksumUrl = location + ".sha1";
         return downloadSha1(checksumUrl);
     }
@@ -105,4 +127,14 @@ private HashValue downloadSha1(String checksumUrl) {
         }
     }
 
+    private HttpResponseResource wrapResponse(URI uri, HttpResponse response) {
+        return new HttpResponseResource("GET", uri, response) {
+            @Override
+            public void close() throws IOException {
+                super.close();
+                HttpResourceAccessor.this.openResources.remove(this);
+            }
+        };
+    }
+
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceLister.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceLister.java
similarity index 62%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceLister.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceLister.java
index ad5179d3223a..5efa14336e44 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceLister.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceLister.java
@@ -14,17 +14,15 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.gradle.api.Transformer;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceLister;
-import org.gradle.api.internal.resource.ResourceException;
+import org.gradle.internal.resource.transfer.ExternalResourceLister;
+import org.gradle.internal.resource.ResourceException;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
 import java.util.List;
 
 public class HttpResourceLister implements ExternalResourceLister {
@@ -34,14 +32,8 @@ public HttpResourceLister(HttpResourceAccessor accessor) {
         this.accessor = accessor;
     }
 
-    public List<String> list(String parent) throws IOException {
-        final URI baseURI;
-        try {
-            baseURI = new URI(parent);
-        } catch (URISyntaxException ex) {
-            throw new ResourceException(String.format("Unable to create URI from string '%s' ", parent), ex);
-        }
-        final HttpResponseResource resource = accessor.getResource(baseURI.toString());
+    public List<String> list(final URI parent) throws IOException {
+        final HttpResponseResource resource = accessor.getResource(parent);
         if (resource == null) {
             return null;
         }
@@ -51,10 +43,9 @@ public List<String> transform(InputStream inputStream) {
                     String contentType = resource.getContentType();
                     ApacheDirectoryListingParser directoryListingParser = new ApacheDirectoryListingParser();
                     try {
-                        List<URI> uris = directoryListingParser.parse(baseURI, inputStream, contentType);
-                        return convertToStringList(uris);
+                        return directoryListingParser.parse(parent, inputStream, contentType);
                     } catch (Exception e) {
-                        throw new ResourceException("Unable to parse Http directory listing", e);
+                        throw new ResourceException("Unable to parse HTTP directory listing.", e);
                     }
                 }
             });
@@ -62,12 +53,4 @@ public List<String> transform(InputStream inputStream) {
             resource.close();
         }
     }
-
-    private List<String> convertToStringList(List<URI> uris) {
-        List<String> ret = new ArrayList<String>(uris.size());
-        for (URI url : uris) {
-            ret.add(url.toString());
-        }
-        return ret;
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceUploader.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceUploader.java
similarity index 90%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceUploader.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceUploader.java
index 60ce022fe986..214d96b1eaaa 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceUploader.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResourceUploader.java
@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ContentType;
 import org.apache.http.util.EntityUtils;
-import org.gradle.api.internal.externalresource.transfer.ExternalResourceUploader;
+import org.gradle.internal.resource.transfer.ExternalResourceUploader;
 import org.gradle.internal.Factory;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 public class HttpResourceUploader implements ExternalResourceUploader {
 
@@ -34,7 +35,7 @@ public HttpResourceUploader(HttpClientHelper http) {
         this.http = http;
     }
 
-    public void upload(Factory<InputStream> source, Long contentLength, String destination) throws IOException {
+    public void upload(Factory<InputStream> source, Long contentLength, URI destination) throws IOException {
         HttpPut method = new HttpPut(destination);
         final RepeatableInputStreamEntity entity = new RepeatableInputStreamEntity(source, contentLength, ContentType.APPLICATION_OCTET_STREAM);
         method.setEntity(entity);
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResponseResource.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResponseResource.java
similarity index 87%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResponseResource.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResponseResource.java
index 342016c6e2c8..b1ed346e74d5 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResponseResource.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpResponseResource.java
@@ -13,33 +13,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.apache.http.Header;
 import org.apache.http.HttpHeaders;
 import org.apache.http.HttpResponse;
 import org.apache.http.impl.cookie.DateUtils;
 import org.apache.http.util.EntityUtils;
-import org.gradle.api.internal.externalresource.AbstractExternalResource;
-import org.gradle.api.internal.externalresource.metadata.DefaultExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.AbstractExternalResource;
+import org.gradle.internal.resource.metadata.DefaultExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 import org.gradle.internal.hash.HashValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
-class HttpResponseResource extends AbstractExternalResource {
+public class HttpResponseResource extends AbstractExternalResource {
     private static final Logger LOGGER = LoggerFactory.getLogger(HttpResponseResource.class);
 
     private final String method;
-    private final String source;
+    private final URI source;
     private final HttpResponse response;
     private final ExternalResourceMetaData metaData;
     private boolean wasOpened;
 
-    public HttpResponseResource(String method, String source, HttpResponse response) {
+    public HttpResponseResource(String method, URI source, HttpResponse response) {
         this.method = method;
         this.source = source;
         this.response = response;
@@ -48,7 +49,7 @@ public HttpResponseResource(String method, String source, HttpResponse response)
         this.metaData = new DefaultExternalResourceMetaData(source, getLastModified(), getContentLength(), etag, getSha1(response, etag));
     }
 
-    public String getName() {
+    public URI getURI() {
         return source;
     }
 
@@ -61,6 +62,10 @@ public ExternalResourceMetaData getMetaData() {
         return metaData;
     }
 
+    public int getStatusCode() {
+        return response.getStatusLine().getStatusCode();
+    }
+
     public long getLastModified() {
         Header responseHeader = response.getFirstHeader("last-modified");
         if (responseHeader == null) {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpSettings.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpSettings.java
similarity index 85%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpSettings.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpSettings.java
index a51dbdf002c8..e206386af449 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/HttpSettings.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/HttpSettings.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
-import org.gradle.api.artifacts.repositories.PasswordCredentials;
+
+import org.gradle.internal.resource.PasswordCredentials;
 
 public interface HttpSettings {
     PasswordCredentials getCredentials();
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/JavaSystemPropertiesHttpProxySettings.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/JavaSystemPropertiesHttpProxySettings.java
similarity index 98%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/JavaSystemPropertiesHttpProxySettings.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/JavaSystemPropertiesHttpProxySettings.java
index 038f6ffc3043..453566e2e750 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/JavaSystemPropertiesHttpProxySettings.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/JavaSystemPropertiesHttpProxySettings.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/RepeatableInputStreamEntity.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/RepeatableInputStreamEntity.java
similarity index 93%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/RepeatableInputStreamEntity.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/RepeatableInputStreamEntity.java
index f416f7526490..23ad750fa048 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/RepeatableInputStreamEntity.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/RepeatableInputStreamEntity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.http.entity.AbstractHttpEntity;
@@ -51,7 +51,7 @@ public InputStream getContent() throws IOException, IllegalStateException {
     }
 
     public void writeTo(OutputStream outstream) throws IOException {
-        IOUtils.copy(getContent(), outstream);
+        IOUtils.copyLarge(getContent(), outstream);
     }
 
     public boolean isStreaming() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMCredentials.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ntlm/NTLMCredentials.java
similarity index 95%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMCredentials.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ntlm/NTLMCredentials.java
index 7adaacc00e8c..ec41db6668e4 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMCredentials.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ntlm/NTLMCredentials.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http.ntlm;
+package org.gradle.internal.resource.transport.http.ntlm;
 
-import org.gradle.api.artifacts.repositories.PasswordCredentials;
+
+import org.gradle.internal.resource.PasswordCredentials;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMSchemeFactory.java b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ntlm/NTLMSchemeFactory.java
similarity index 97%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMSchemeFactory.java
rename to subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ntlm/NTLMSchemeFactory.java
index 29f6739f6344..cfb3c2d2357c 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMSchemeFactory.java
+++ b/subprojects/resources-http/src/main/java/org/gradle/internal/resource/transport/http/ntlm/NTLMSchemeFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http.ntlm;
+package org.gradle.internal.resource.transport.http.ntlm;
 
 import jcifs.ntlmssp.Type1Message;
 import jcifs.ntlmssp.Type2Message;
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/ApacheDirectoryListingParserTest.groovy b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/ApacheDirectoryListingParserTest.groovy
similarity index 78%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/ApacheDirectoryListingParserTest.groovy
rename to subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/ApacheDirectoryListingParserTest.groovy
index 62ef6402b6f9..f33e1dbf9d95 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/ApacheDirectoryListingParserTest.groovy
+++ b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/ApacheDirectoryListingParserTest.groovy
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http
+package org.gradle.internal.resource.transport.http
 
-import org.gradle.api.internal.resource.ResourceException;
+import org.gradle.internal.resource.ResourceException
 import org.gradle.util.Resources
 import org.junit.Rule
 import spock.lang.Specification
@@ -25,7 +25,8 @@ import spock.lang.Unroll
 import static org.junit.Assert.assertNotNull
 
 class ApacheDirectoryListingParserTest extends Specification {
-    @Rule public final Resources resources = new Resources();
+    @Rule
+    public final Resources resources = new Resources();
 
     private static final CONTENT_TYPE = "text/html;charset=utf-8";
     private URI baseUrl = URI.create("http://testrepo/")
@@ -57,7 +58,7 @@ class ApacheDirectoryListingParserTest extends Specification {
         expect:
         def uris = parser.parse(baseUrl, new ByteArrayInputStream(html.bytes), CONTENT_TYPE)
         assertNotNull(uris)
-        uris.collect {it.toString()} == ["http://testrepo/directory1", "http://testrepo/directory2", "http://testrepo/directory3", "http://testrepo/directory4"]
+        uris.collect { it.toString() } == ["directory1", "directory2", "directory3", "directory4"]
     }
 
     def "only text/html content type is supported"() {
@@ -81,7 +82,7 @@ class ApacheDirectoryListingParserTest extends Specification {
 
         expect:
         def uris = parser.parse(baseUrl, new ByteArrayInputStream(encodedHtml), 'text/html;charset=ISO-8859-1')
-        uris.collect {it.toString()} == ["http://testrepo/\u00c1\u00d2"]
+        uris.collect { it.toString() } == ["\u00c1\u00d2"]
     }
 
     def "defaults to utf-8 when no charset specified"() {
@@ -92,13 +93,14 @@ class ApacheDirectoryListingParserTest extends Specification {
 
         expect:
         def uris = parser.parse(baseUrl, new ByteArrayInputStream(encodedHtml), 'text/html')
-        uris.collect {it.toString()} == ["http://testrepo/\u0321\u0322"]
+        uris.collect { it.toString() } == ["\u0321\u0322"]
     }
 
     @Unroll
     def "parse ignores #descr"() {
         expect:
         parser.parse(baseUrl, new ByteArrayInputStream("<a href=\"${href}\">link</a>".toString().bytes), CONTENT_TYPE).isEmpty()
+
         where:
         href                                                | descr
         "http://anothertestrepo/"                           | "URLs which aren't children of base URL"
@@ -110,19 +112,20 @@ class ApacheDirectoryListingParserTest extends Specification {
         "<a name=\"anchorname\">headline</a>"               | "anchor definitions"
     }
 
-
     @Unroll
     def "parseLink handles #urlDescr"() {
         def listingParser = new ApacheDirectoryListingParser()
         expect:
         def foundURIs = listingParser.parse(URI.create(baseUri), new ByteArrayInputStream("<a href=\"${href}\">link</a>".toString().bytes), CONTENT_TYPE)
         !foundURIs.isEmpty()
-        foundURIs.collect {it.toString()} == ["${baseUri}/directory1"]
+        foundURIs.collect { it.toString() } == ["directory1"]
         where:
         baseUri                | href                         | urlDescr
         "http://testrepo"      | "directory1"                 | "relative URLS"
         "http://testrepo"      | "/directory1"                | "absolute URLS"
         "http://testrepo"      | "./directory1"               | "explicit relative URLS"
+        "http://testrepo"      | "directory1/"                | "trailing slash"
+        "http://testrepo"      | "./directory1/"              | "relative URL with trailing slash"
         "http://testrepo"      | "http://testrepo/directory1" | "complete URLS"
         "http://testrepo"      | "http://testrepo/directory1" | "hrefs with truncated text"
         "http://testrepo"      | "http://testrepo/directory1" | "hrefs with truncated text"
@@ -137,28 +140,28 @@ class ApacheDirectoryListingParserTest extends Specification {
         setup:
         def byte[] content = resources.getResource("${repoType}_dirlisting.html").bytes
         expect:
-        List<URI> urls = new ApacheDirectoryListingParser().parse(new URI(artifactRootURI), new ByteArrayInputStream(content), CONTENT_TYPE)
-        urls.collect {it.toString()} as Set == ["${artifactRootURI}3.7/",
-                "${artifactRootURI}3.8/",
-                "${artifactRootURI}3.8.1/",
-                "${artifactRootURI}3.8.2/",
-                "${artifactRootURI}4.0/",
-                "${artifactRootURI}4.1/",
-                "${artifactRootURI}4.10/",
-                "${artifactRootURI}4.2/",
-                "${artifactRootURI}4.3/",
-                "${artifactRootURI}4.3.1/",
-                "${artifactRootURI}4.4/",
-                "${artifactRootURI}4.5/",
-                "${artifactRootURI}4.6/",
-                "${artifactRootURI}4.7/",
-                "${artifactRootURI}4.8/",
-                "${artifactRootURI}4.8.1/",
-                "${artifactRootURI}4.8.2/",
-                "${artifactRootURI}4.9/",
-                "${artifactRootURI}maven-metadata.xml",
-                "${artifactRootURI}maven-metadata.xml.md5",
-                "${artifactRootURI}maven-metadata.xml.sha1"] as Set
+        List<String> urls = new ApacheDirectoryListingParser().parse(new URI(artifactRootURI), new ByteArrayInputStream(content), CONTENT_TYPE)
+        urls as Set == ["3.7",
+                        "3.8",
+                        "3.8.1",
+                        "3.8.2",
+                        "4.0",
+                        "4.1",
+                        "4.10",
+                        "4.2",
+                        "4.3",
+                        "4.3.1",
+                        "4.4",
+                        "4.5",
+                        "4.6",
+                        "4.7",
+                        "4.8",
+                        "4.8.1",
+                        "4.8.2",
+                        "4.9",
+                        "maven-metadata.xml",
+                        "maven-metadata.xml.md5",
+                        "maven-metadata.xml.sha1"] as Set
         where:
         artifactRootURI                                                         | repoType
         "http://localhost:8081/artifactory/repo1/junit/junit/"                  | "artifactory"
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientConfigurerTest.groovy b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpClientConfigurerTest.groovy
similarity index 95%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientConfigurerTest.groovy
rename to subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpClientConfigurerTest.groovy
index e11c232955f8..346b39256ab1 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientConfigurerTest.groovy
+++ b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpClientConfigurerTest.groovy
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http
+package org.gradle.internal.resource.transport.http
 
 import org.apache.http.auth.AuthScope
 import org.apache.http.impl.client.DefaultHttpClient
 import org.apache.http.params.HttpProtocolParams
-import org.gradle.api.artifacts.repositories.PasswordCredentials
-import org.gradle.api.internal.resource.UriResource
+import org.gradle.internal.resource.PasswordCredentials
+import org.gradle.internal.resource.UriResource
 import spock.lang.Specification
 
 public class HttpClientConfigurerTest extends Specification {
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientHelperTest.groovy b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpClientHelperTest.groovy
similarity index 93%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientHelperTest.groovy
rename to subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpClientHelperTest.groovy
index e4e9fe52e8b1..3902daed9ac1 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpClientHelperTest.groovy
+++ b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpClientHelperTest.groovy
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http
+package org.gradle.internal.resource.transport.http
 import org.apache.http.HttpResponse
 import org.apache.http.client.methods.HttpGet
 import org.apache.http.client.methods.HttpRequestBase
-import org.gradle.api.artifacts.repositories.PasswordCredentials
+import org.gradle.internal.resource.PasswordCredentials
 import org.gradle.util.SetSystemProperties
 import org.junit.Rule
 import spock.lang.Specification
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceListerTest.groovy b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResourceListerTest.groovy
similarity index 81%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceListerTest.groovy
rename to subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResourceListerTest.groovy
index e68c66488aa8..1097661158c7 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResourceListerTest.groovy
+++ b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResourceListerTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http
+package org.gradle.internal.resource.transport.http
 
 import org.gradle.api.Transformer
 import spock.lang.Specification
@@ -27,9 +27,9 @@ class HttpResourceListerTest extends Specification {
 
     def "consumeExternalResource closes resource after reading into stream"() {
         setup:
-        accessorMock.getResource("http://testrepo/") >> externalResource;
+        accessorMock.getResource(new URI("http://testrepo/")) >> externalResource;
         when:
-        lister.list("http://testrepo/")
+        lister.list(new URI("http://testrepo/"))
         then:
         1 * externalResource.withContent(_) >> {Transformer action -> return action.transform(new ByteArrayInputStream("<a href='child'/>".bytes))}
         1 * externalResource.getContentType() >> "text/html"
@@ -38,8 +38,8 @@ class HttpResourceListerTest extends Specification {
 
     def "list returns null if HttpAccessor returns null"(){
         setup:
-        accessorMock.getResource("http://testrepo/")  >> null
+        accessorMock.getResource(new URI("http://testrepo/"))  >> null
         expect:
-        null == lister.list("http://testrepo")
+        null == lister.list(new URI("http://testrepo"))
     }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResponseResourceTest.groovy b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResponseResourceTest.groovy
similarity index 91%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResponseResourceTest.groovy
rename to subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResponseResourceTest.groovy
index d93cfc5ccb1a..4b91c0a1f46c 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/HttpResponseResourceTest.groovy
+++ b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/HttpResponseResourceTest.groovy
@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transport.http
+package org.gradle.internal.resource.transport.http
 
 import org.apache.http.Header
 import org.apache.http.HttpHeaders
 import org.apache.http.HttpResponse
 import org.apache.http.message.BasicHeader
-import org.gradle.api.internal.externalresource.ExternalResource
+import org.gradle.internal.resource.ExternalResource
 import spock.lang.Specification
 import org.apache.http.HttpEntity
 
 class HttpResponseResourceTest extends Specification {
 
-    def sourceUrl = "http://gradle.org"
+    def sourceUrl = new URI("http://gradle.org")
     def method = "GET"
     def response = Mock(HttpResponse)
 
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/JavaSystemPropertiesHttpProxySettingsTest.groovy b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/JavaSystemPropertiesHttpProxySettingsTest.groovy
similarity index 98%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/JavaSystemPropertiesHttpProxySettingsTest.groovy
rename to subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/JavaSystemPropertiesHttpProxySettingsTest.groovy
index 10a3c855b479..493878914d6e 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/JavaSystemPropertiesHttpProxySettingsTest.groovy
+++ b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/JavaSystemPropertiesHttpProxySettingsTest.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http;
+package org.gradle.internal.resource.transport.http;
 
 
 import spock.lang.Specification
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMCredentialsTest.groovy b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/ntlm/NTLMCredentialsTest.groovy
similarity index 95%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMCredentialsTest.groovy
rename to subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/ntlm/NTLMCredentialsTest.groovy
index 626edebc2cdd..3dcc1d3bb642 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/transport/http/ntlm/NTLMCredentialsTest.groovy
+++ b/subprojects/resources-http/src/test/groovy/org/gradle/internal/resource/transport/http/ntlm/NTLMCredentialsTest.groovy
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource.transport.http.ntlm;
+package org.gradle.internal.resource.transport.http.ntlm
 
-import org.gradle.api.artifacts.repositories.PasswordCredentials
+import org.gradle.internal.resource.PasswordCredentials;
 import org.gradle.util.SetSystemProperties
 import org.junit.Rule
 import spock.lang.Specification
diff --git a/subprojects/core-impl/src/test/resources/org/gradle/api/internal/externalresource/transport/http/artifactory_dirlisting.html b/subprojects/resources-http/src/test/resources/org/gradle/internal/resource/transport/http/artifactory_dirlisting.html
similarity index 100%
rename from subprojects/core-impl/src/test/resources/org/gradle/api/internal/externalresource/transport/http/artifactory_dirlisting.html
rename to subprojects/resources-http/src/test/resources/org/gradle/internal/resource/transport/http/artifactory_dirlisting.html
diff --git a/subprojects/core-impl/src/test/resources/org/gradle/api/internal/externalresource/transport/http/mavencentral_dirlisting.html b/subprojects/resources-http/src/test/resources/org/gradle/internal/resource/transport/http/mavencentral_dirlisting.html
similarity index 100%
rename from subprojects/core-impl/src/test/resources/org/gradle/api/internal/externalresource/transport/http/mavencentral_dirlisting.html
rename to subprojects/resources-http/src/test/resources/org/gradle/internal/resource/transport/http/mavencentral_dirlisting.html
diff --git a/subprojects/core-impl/src/test/resources/org/gradle/api/internal/externalresource/transport/http/nexus_dirlisting.html b/subprojects/resources-http/src/test/resources/org/gradle/internal/resource/transport/http/nexus_dirlisting.html
similarity index 100%
rename from subprojects/core-impl/src/test/resources/org/gradle/api/internal/externalresource/transport/http/nexus_dirlisting.html
rename to subprojects/resources-http/src/test/resources/org/gradle/internal/resource/transport/http/nexus_dirlisting.html
diff --git a/subprojects/resources/resources.gradle b/subprojects/resources/resources.gradle
index 6474d5354ba2..b93971fc6ba6 100644
--- a/subprojects/resources/resources.gradle
+++ b/subprojects/resources/resources.gradle
@@ -1,9 +1,13 @@
 /*
  * A set of general-purpose resource abstractions.
  */
+apply plugin: "groovy"
+
 dependencies {
     compile libraries.slf4j_api
     compile project(':baseServices')
+    compile project(':messaging')
+    compile libraries.commons_io
     testCompile libraries.groovy
 }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/AbstractExternalResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/AbstractExternalResource.java
similarity index 92%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/AbstractExternalResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/AbstractExternalResource.java
index 1142f22a0bc7..7de687340f16 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/AbstractExternalResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/AbstractExternalResource.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource;
+package org.gradle.internal.resource;
 
 import org.apache.commons.io.IOUtils;
 import org.gradle.api.Action;
@@ -27,6 +27,10 @@ public abstract class AbstractExternalResource implements ExternalResource {
      */
     protected abstract InputStream openStream() throws IOException;
 
+    public String getName() {
+        return getURI().toString();
+    }
+
     public void writeTo(File destination) throws IOException {
         FileOutputStream output = new FileOutputStream(destination);
         try {
@@ -39,7 +43,7 @@ public void writeTo(File destination) throws IOException {
     public void writeTo(OutputStream output) throws IOException {
         InputStream input = openStream();
         try {
-            IOUtils.copy(input, output);
+            IOUtils.copyLarge(input, output);
         } finally {
             input.close();
         }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/CachingResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/CachingResource.java
similarity index 96%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/resource/CachingResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/CachingResource.java
index 6098db0196c6..58a3ffeed066 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/CachingResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/CachingResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.resource;
+package org.gradle.internal.resource;
 
 public class CachingResource extends DelegatingResource {
     private String content;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/DefaultLocallyAvailableExternalResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/DefaultLocallyAvailableExternalResource.java
similarity index 71%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/DefaultLocallyAvailableExternalResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/DefaultLocallyAvailableExternalResource.java
index 7cb2d2b283b5..3ca800e9accf 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/DefaultLocallyAvailableExternalResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/DefaultLocallyAvailableExternalResource.java
@@ -14,20 +14,21 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource;
+package org.gradle.internal.resource;
 
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 import org.gradle.internal.resource.local.LocallyAvailableResource;
-import org.gradle.internal.hash.HashValue;
+
+import java.net.URI;
 
 public class DefaultLocallyAvailableExternalResource extends LocalFileStandInExternalResource implements LocallyAvailableExternalResource {
     private final LocallyAvailableResource locallyAvailableResource;
 
-    public DefaultLocallyAvailableExternalResource(String source, LocallyAvailableResource locallyAvailableResource) {
+    public DefaultLocallyAvailableExternalResource(URI source, LocallyAvailableResource locallyAvailableResource) {
         this(source, locallyAvailableResource, null);
     }
 
-    public DefaultLocallyAvailableExternalResource(String source, LocallyAvailableResource locallyAvailableResource, ExternalResourceMetaData metaData) {
+    public DefaultLocallyAvailableExternalResource(URI source, LocallyAvailableResource locallyAvailableResource, ExternalResourceMetaData metaData) {
         super(source, locallyAvailableResource.getFile(), metaData);
         this.locallyAvailableResource = locallyAvailableResource;
     }
@@ -46,8 +47,4 @@ public long getContentLength() {
         return locallyAvailableResource.getContentLength();
     }
 
-    @Override
-    protected HashValue getLocalFileSha1() {
-        return locallyAvailableResource.getSha1();
-    }
 }
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/DelegatingResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/DelegatingResource.java
similarity index 96%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/resource/DelegatingResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/DelegatingResource.java
index 8a2be29a1987..3ebbbbb9faf6 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/DelegatingResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/DelegatingResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.resource;
+package org.gradle.internal.resource;
 
 import java.io.File;
 import java.net.URI;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ExternalResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/ExternalResource.java
similarity index 76%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ExternalResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/ExternalResource.java
index 1e2ce4acc223..f1dbe57c9e6d 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/ExternalResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/ExternalResource.java
@@ -13,31 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.api.internal.externalresource;
+package org.gradle.internal.resource;
 
 import org.gradle.api.Action;
 import org.gradle.api.Transformer;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.net.URI;
 
-public interface ExternalResource {
+/**
+ * This will be merged with {@link Resource}.
+ */
+public interface ExternalResource extends Closeable {
     /**
-     * Get the name of the resource.
+     * Get the URI of the resource.
      */
-    public String getName();
+    public URI getURI();
 
     /**
-     * Get the date the resource was last modified
-     *
-     * @return A <code>long</code> value representing the time the file was last modified,
-     *         measured in milliseconds since the epoch (00:00:00 GMT, January 1, 1970), or
-     *         <code>0L</code> if the file does not exist or if an I/O error occurs.
+     * Get the name of the resource. Use {@link #getURI()} instead.
      */
-    public long getLastModified();
+    public String getName();
 
     /**
      * Get the resource size
@@ -84,5 +81,8 @@ public interface ExternalResource {
 
     void close() throws IOException;
 
+    /**
+     * Returns the meta-data for this resource.
+     */
     ExternalResourceMetaData getMetaData();
 }
diff --git a/subprojects/resources/src/main/java/org/gradle/internal/resource/ExternalResourceName.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/ExternalResourceName.java
new file mode 100644
index 000000000000..b6fbbfa1c30f
--- /dev/null
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/ExternalResourceName.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource;
+
+import com.google.common.base.Objects;
+import org.gradle.internal.UncheckedException;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * An immutable resource name. Resources are arranged in a hierarchy. Names may be relative, or absolute with some opaque root resource.
+ */
+public class ExternalResourceName {
+    private final String encodedRoot;
+    private final String path;
+
+    public ExternalResourceName(URI uri) {
+        if (uri.getPath() == null) {
+            throw new IllegalArgumentException(String.format("Cannot create resource name from non-hierarchical URI '%s'.", uri.toString()));
+        }
+        this.encodedRoot = encodeRoot(uri);
+        this.path = uri.getPath();
+    }
+
+    public ExternalResourceName(String path) {
+        encodedRoot = null;
+        this.path = path;
+    }
+
+    private ExternalResourceName(String encodedRoot, String path) {
+        this.encodedRoot = encodedRoot;
+        this.path = path;
+    }
+
+    public ExternalResourceName(URI parent, String path) {
+        if (parent.getPath() == null) {
+            throw new IllegalArgumentException(String.format("Cannot create resource name from non-hierarchical URI '%s'.", parent.toString()));
+        }
+        String newPath;
+        if (path.startsWith("/")) {
+            path = path.substring(1);
+        }
+        if (path.length() == 0) {
+            newPath = parent.getPath();
+        } else if (parent.getPath().endsWith("/")) {
+            newPath = parent.getPath() + path;
+        } else {
+            newPath = parent.getPath() + "/" + path;
+        }
+        this.encodedRoot = encodeRoot(parent);
+        this.path = newPath;
+    }
+
+    private String encodeRoot(URI uri) {
+        StringBuilder builder = new StringBuilder();
+        if (uri.getScheme() != null) {
+            builder.append(uri.getScheme());
+            builder.append(":");
+        }
+        if (uri.getHost() != null) {
+            builder.append("//");
+            builder.append(uri.getHost());
+        }
+        if (uri.getPort() > 0) {
+            builder.append(":");
+            builder.append(uri.getPort());
+        }
+        return builder.toString();
+    }
+
+    public String getDisplayName() {
+        return getDecoded();
+    }
+
+    @Override
+    public String toString() {
+        return getDisplayName();
+    }
+
+    /**
+     * Returns a URI that represents this resource.
+     */
+    public URI getUri() {
+        try {
+            if (encodedRoot == null) {
+                return new URI(encode(path, false));
+            }
+            return new URI(encodedRoot + encode(path, true));
+        } catch (URISyntaxException e) {
+            throw UncheckedException.throwAsUncheckedException(e);
+        }
+    }
+
+    private String encode(String path, boolean isPathSeg) {
+        StringBuilder builder = new StringBuilder();
+        for (int i = 0; i < path.length(); i++) {
+            char ch = path.charAt(i);
+            if (ch >= 'a' && ch <= 'z' || ch >= 'A' && ch <= 'Z' || ch >= '0' && ch <= '9') {
+                builder.append(ch);
+            } else if (ch == '/' || ch == '@' || isPathSeg && ch == ':' || ch == '.' || ch == '-' || ch == '_' || ch == '~'
+                    || ch == '!' || ch == '$' || ch == '&' || ch == '\'' || ch == '(' || ch == ')' || ch == '*' || ch == '+'
+                    || ch == ',' || ch == ';' || ch == '=') {
+                builder.append(ch);
+            } else {
+                if (ch <= 0x7F) {
+                    escapeByte(ch, builder);
+                } else if (ch <= 0x7FF) {
+                    escapeByte(0xC0 | (ch >> 6) & 0x1F, builder);
+                    escapeByte(0x80 | ch & 0x3F, builder);
+                } else {
+                    escapeByte(0xE0 | (ch >> 12) & 0x1F, builder);
+                    escapeByte(0x80 | (ch >> 6) & 0x3F, builder);
+                    escapeByte(0x80 | ch & 0x3F, builder);
+                }
+            }
+        }
+        return builder.toString();
+    }
+
+    private void escapeByte(int ch, StringBuilder builder) {
+        builder.append('%');
+        builder.append(Character.toUpperCase(Character.forDigit(ch >> 4 & 0xFF, 16)));
+        builder.append(Character.toUpperCase(Character.forDigit(ch & 0xF, 16)));
+    }
+
+    /**
+     * Returns the 'decoded' name, which is the opaque root + the path of the name.
+     */
+    public String getDecoded() {
+        if (encodedRoot == null) {
+            return path;
+        }
+        return encodedRoot + path;
+    }
+
+    /**
+     * Returns the root name for this name.
+     */
+    public ExternalResourceName getRoot() {
+        return new ExternalResourceName(encodedRoot, path.startsWith("/") ? "/" : "");
+    }
+
+    /**
+     * Returns the path for this resource. The '/' character is used to separate the elements of the path.
+     */
+    public String getPath() {
+        return path;
+    }
+
+    /**
+     * Resolves the given path relative to this name. The path can be a relative path or an absolute path. The '/' character is used to separate the elements of the path.
+     */
+    public ExternalResourceName resolve(String path) {
+        String newPath;
+        if (path.startsWith("/")) {
+            newPath = path;
+        } else if (this.path.endsWith("/") || this.path.length() == 0) {
+            newPath = this.path + path;
+        } else {
+            newPath = this.path + "/" + path;
+        }
+        return new ExternalResourceName(encodedRoot, newPath);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        }
+        if (obj == null || !obj.getClass().equals(getClass())) {
+            return false;
+        }
+        ExternalResourceName other = (ExternalResourceName) obj;
+        return Objects.equal(encodedRoot, other.encodedRoot) && path.equals(other.path);
+    }
+
+    @Override
+    public int hashCode() {
+        return (encodedRoot == null ? 0 : encodedRoot.hashCode()) ^ path.hashCode();
+    }
+}
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/LocalFileStandInExternalResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/LocalFileStandInExternalResource.java
similarity index 71%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/LocalFileStandInExternalResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/LocalFileStandInExternalResource.java
index 26f60f677474..5202ed4fbcf1 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/LocalFileStandInExternalResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/LocalFileStandInExternalResource.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource;
+package org.gradle.internal.resource;
 
-import org.gradle.api.internal.externalresource.metadata.DefaultExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.DefaultExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 import org.gradle.internal.hash.HashUtil;
 import org.gradle.internal.hash.HashValue;
 
@@ -25,6 +25,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 /**
  * Used when we find a file locally that matches the checksum of some external resource.
@@ -32,24 +33,22 @@
  * It saves us downloading the file, but we don't get any metadata for it.
  */
 public class LocalFileStandInExternalResource extends AbstractExternalResource {
-
     private final File localFile;
-    private final String source;
-    private HashValue sha1;
+    private final URI source;
     private ExternalResourceMetaData metaData;
 
-    public LocalFileStandInExternalResource(String source, File localFile, ExternalResourceMetaData metaData) {
+    public LocalFileStandInExternalResource(URI source, File localFile, ExternalResourceMetaData metaData) {
         this.source = source;
         this.localFile = localFile;
         this.metaData = metaData;
     }
 
-    public String getName() {
+    public URI getURI() {
         return source;
     }
 
-    public long getLastModified() {
-        return -1;
+    public long getLastModifiedTime() {
+        return localFile.lastModified();
     }
 
     public long getContentLength() {
@@ -70,23 +69,12 @@ public InputStream openStream() throws IOException {
 
     public ExternalResourceMetaData getMetaData() {
         if (metaData == null) {
-            metaData = new DefaultExternalResourceMetaData(source, getLastModified(), getContentLength(), null, getLocalFileSha1());
+            metaData = new DefaultExternalResourceMetaData(source, getLastModifiedTime(), getContentLength(), null, null);
         }
         return metaData;
     }
 
-    protected File getLocalFile() {
-        return localFile;
-    }
-
     protected HashValue getSha1(File contentFile) {
         return HashUtil.createHash(contentFile, "SHA1");
     }
-
-    protected HashValue getLocalFileSha1() {
-        if (sha1 == null) {
-            sha1 = getSha1(getLocalFile());
-        }
-        return sha1;
-    }
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/LocallyAvailableExternalResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/LocallyAvailableExternalResource.java
similarity index 95%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/LocallyAvailableExternalResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/LocallyAvailableExternalResource.java
index 0d7e582cbd78..89b4b0b91015 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/LocallyAvailableExternalResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/LocallyAvailableExternalResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource;
+package org.gradle.internal.resource;
 
 import org.gradle.internal.resource.local.LocallyAvailableResource;
 
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/Resource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/Resource.java
similarity index 80%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/resource/Resource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/Resource.java
index 567503471bdd..4a4e298526ad 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/Resource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/Resource.java
@@ -14,18 +14,21 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.resource;
+package org.gradle.internal.resource;
+
+import org.gradle.api.Nullable;
 
 import java.io.File;
-import java.io.Serializable;
 import java.net.URI;
 
 /**
  * A {@code Resource} represents some binary artifact.
  *
  * <p>Implementations are not required to be thread-safe.</p>
+ *
+ * <p>This type will be merged with {@link ExternalResource} and friends.</p>
  */
-public interface Resource extends Serializable {
+public interface Resource {
     /**
      * Returns a display name for this resource. This can be used in log and error messages.
      *
@@ -38,6 +41,7 @@ public interface Resource extends Serializable {
      *
      * @return A file representing this resource. Returns null if this resource is not available as a file.
      */
+    @Nullable
     File getFile();
 
     /**
@@ -45,17 +49,18 @@ public interface Resource extends Serializable {
      *
      * @return The URI for this resource. Returns null if this resource does not have a URI.
      */
+    @Nullable
     URI getURI();
 
     /**
-     * Returns true if this resource exists, false if it does not exist.
+     * Returns true if this resource exists, false if it does not exist. Note that this method may be expensive, depending on the implementation.
      *
      * @return true if this resource exists.
      */
     boolean getExists();
 
     /**
-     * Returns the content of this resource, as a String.
+     * Returns the content of this resource, as a String. Note that this method may be expensive, depending on the implementation.
      *
      * @return the content. Never returns null.
      * @throws ResourceNotFoundException When this resource does not exist.
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/ResourceException.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/ResourceException.java
similarity index 95%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/resource/ResourceException.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/ResourceException.java
index 9b21136890c8..1110f58e33e6 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/ResourceException.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/ResourceException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.resource;
+package org.gradle.internal.resource;
 
 import org.gradle.api.GradleException;
 import org.gradle.internal.exceptions.Contextual;
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/ResourceNotFoundException.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/ResourceNotFoundException.java
similarity index 95%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/resource/ResourceNotFoundException.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/ResourceNotFoundException.java
index 923578a7da36..ee6a3baf91f0 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/ResourceNotFoundException.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/ResourceNotFoundException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.resource;
+package org.gradle.internal.resource;
 
 /**
  * An exception thrown when attempting to access the content of a {@link Resource} which does not exist.
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/StringResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/StringResource.java
similarity index 96%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/resource/StringResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/StringResource.java
index af98ef3460b9..921d66bcdb46 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/StringResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/StringResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.resource;
+package org.gradle.internal.resource;
 
 import java.io.File;
 import java.net.URI;
diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/UriResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/UriResource.java
similarity index 50%
rename from subprojects/core/src/main/groovy/org/gradle/api/internal/resource/UriResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/UriResource.java
index cd57b20e9b20..aff2aeb26c25 100644
--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/resource/UriResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/UriResource.java
@@ -14,21 +14,19 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.resource;
+package org.gradle.internal.resource;
 
 import org.apache.commons.io.IOUtils;
 import org.gradle.internal.SystemProperties;
 import org.gradle.util.GradleVersion;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.net.URI;
 import java.net.URLConnection;
 
-import static org.gradle.util.GFileUtils.canonicalise;
-
+/**
+ * A {@link Resource} implementation backed by a URI. Assumes content is encoded using UTF-8.
+ */
 public class UriResource implements Resource {
     private final File sourceFile;
     private final URI sourceUri;
@@ -40,6 +38,14 @@ public UriResource(String description, File sourceFile) {
         this.sourceUri = sourceFile.toURI();
     }
 
+    private File canonicalise(File file) {
+        try {
+            return file.getCanonicalFile();
+        } catch (IOException e) {
+            return file.getAbsoluteFile();
+        }
+    }
+
     public UriResource(String description, URI sourceUri) {
         this.description = description;
         this.sourceFile = sourceUri.getScheme().equals("file") ? canonicalise(new File(sourceUri.getPath())) : null;
@@ -55,11 +61,11 @@ public String getText() {
             throw new ResourceException(String.format("Could not read %s as it is a directory.", getDisplayName()));
         }
         try {
-            InputStream inputStream = getInputStream(sourceUri);
+            Reader reader = getInputStream(sourceUri);
             try {
-                return IOUtils.toString(inputStream);
+                return IOUtils.toString(reader);
             } finally {
-                inputStream.close();
+                reader.close();
             }
         } catch (FileNotFoundException e) {
             throw new ResourceNotFoundException(String.format("Could not read %s as it does not exist.", getDisplayName()));
@@ -70,11 +76,11 @@ public String getText() {
 
     public boolean getExists() {
         try {
-            InputStream inputStream = getInputStream(sourceUri);
+            Reader reader = getInputStream(sourceUri);
             try {
                 return true;
             } finally {
-                inputStream.close();
+                reader.close();
             }
         } catch (FileNotFoundException e) {
             return false;
@@ -83,10 +89,12 @@ public boolean getExists() {
         }
     }
 
-    private InputStream getInputStream(URI url) throws IOException {
+    private Reader getInputStream(URI url) throws IOException {
         final URLConnection urlConnection = url.toURL().openConnection();
         urlConnection.setRequestProperty("User-Agent", getUserAgentString());
-        return urlConnection.getInputStream();
+        urlConnection.connect();
+        String charset = extractCharacterEncoding(urlConnection.getContentType(), "utf-8");
+        return new InputStreamReader(urlConnection.getInputStream(), charset);
     }
 
     public File getFile() {
@@ -97,6 +105,80 @@ public URI getURI() {
         return sourceUri;
     }
 
+    public static String extractCharacterEncoding(String contentType, String defaultEncoding) {
+        if (contentType == null) {
+            return defaultEncoding;
+        }
+        int pos = findFirstParameter(0, contentType);
+        if (pos == -1) {
+            return defaultEncoding;
+        }
+        StringBuilder paramName = new StringBuilder();
+        StringBuilder paramValue = new StringBuilder();
+        pos = findNextParameter(pos, contentType, paramName, paramValue);
+        while (pos != -1) {
+            if (paramName.toString().equals("charset") && paramValue.length() > 0) {
+                return paramValue.toString();
+            }
+            pos = findNextParameter(pos, contentType, paramName, paramValue);
+        }
+        return defaultEncoding;
+    }
+
+    private static int findFirstParameter(int pos, String contentType) {
+        int index = contentType.indexOf(';', pos);
+        if (index < 0) {
+            return -1;
+        }
+        return index + 1;
+    }
+
+    private static int findNextParameter(int pos, String contentType, StringBuilder paramName, StringBuilder paramValue) {
+        if (pos >= contentType.length()) {
+            return -1;
+        }
+        paramName.setLength(0);
+        paramValue.setLength(0);
+        int separator = contentType.indexOf("=", pos);
+        if (separator < 0) {
+            separator = contentType.length();
+        }
+        paramName.append(contentType.substring(pos, separator).trim());
+        if (separator >= contentType.length() - 1) {
+            return contentType.length();
+        }
+
+        int startValue = separator + 1;
+        int endValue;
+        if (contentType.charAt(startValue) == '"') {
+            startValue++;
+            int i = startValue;
+            while (i < contentType.length()) {
+                char ch = contentType.charAt(i);
+                if (ch == '\\' && i < contentType.length() - 1 && contentType.charAt(i + 1) == '"') {
+                    paramValue.append('"');
+                    i += 2;
+                } else if (ch == '"') {
+                    break;
+                } else {
+                    paramValue.append(ch);
+                    i++;
+                }
+            }
+            endValue = i + 1;
+        } else {
+            endValue = contentType.indexOf(';', startValue);
+            if (endValue < 0) {
+                endValue = contentType.length();
+            }
+            paramValue.append(contentType.substring(startValue, endValue));
+        }
+        if (endValue < contentType.length() && contentType.charAt(endValue) == ';') {
+            endValue++;
+        }
+        return endValue;
+    }
+
     public static String getUserAgentString() {
         String osName = System.getProperty("os.name");
         String osVersion = System.getProperty("os.version");
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/UrlExternalResource.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/UrlExternalResource.java
similarity index 66%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/UrlExternalResource.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/UrlExternalResource.java
index f47a3bfd53ed..e4f1f9f4ab20 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/UrlExternalResource.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/UrlExternalResource.java
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource;
+package org.gradle.internal.resource;
 
-import org.gradle.api.internal.externalresource.metadata.DefaultExternalResourceMetaData;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.DefaultExternalResourceMetaData;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.UncheckedException;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 
@@ -32,11 +35,23 @@ public class UrlExternalResource extends AbstractExternalResource {
     public UrlExternalResource(URL url) throws IOException {
         this.url = url;
         connection = url.openConnection();
-        metaData = new DefaultExternalResourceMetaData(url.toString(), connection.getLastModified(), connection.getContentLength(), null, null);
+
+        URI uri;
+        try {
+            uri = url.toURI();
+        } catch (URISyntaxException e) {
+            throw UncheckedException.throwAsUncheckedException(e);
+        }
+
+        metaData = new DefaultExternalResourceMetaData(uri, connection.getLastModified(), connection.getContentLength(), null, null);
     }
 
-    public String getName() {
-        return url.toExternalForm();
+    public URI getURI() {
+        try {
+            return url.toURI();
+        } catch (URISyntaxException e) {
+            throw UncheckedException.throwAsUncheckedException(e);
+        }
     }
 
     public ExternalResourceMetaData getMetaData() {
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/AbstractLocallyAvailableResourceFinder.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/AbstractLocallyAvailableResourceFinder.java
similarity index 95%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/AbstractLocallyAvailableResourceFinder.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/local/AbstractLocallyAvailableResourceFinder.java
index 2d71841a5f1c..8c016319a93f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/AbstractLocallyAvailableResourceFinder.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/AbstractLocallyAvailableResourceFinder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.local;
+package org.gradle.internal.resource.local;
 
 import org.gradle.api.Transformer;
 import org.gradle.internal.Factory;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/CompositeLocallyAvailableResourceFinder.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/CompositeLocallyAvailableResourceFinder.java
similarity index 95%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/CompositeLocallyAvailableResourceFinder.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/local/CompositeLocallyAvailableResourceFinder.java
index 5fcdf966017f..33776933b084 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/CompositeLocallyAvailableResourceFinder.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/CompositeLocallyAvailableResourceFinder.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.local;
+package org.gradle.internal.resource.local;
 
-import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.gradle.internal.hash.HashValue;
 
 import java.util.LinkedList;
diff --git a/subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStore.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileStore.java
similarity index 89%
rename from subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStore.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileStore.java
index 7d12d920af08..bcece54fd1c4 100644
--- a/subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStore.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileStore.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.internal.filestore;
+package org.gradle.internal.resource.local;
 
 import org.gradle.api.Action;
-import org.gradle.internal.resource.local.LocallyAvailableResource;
 
 import java.io.File;
 
diff --git a/subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStoreSearcher.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileStoreSearcher.java
similarity index 87%
rename from subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStoreSearcher.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileStoreSearcher.java
index 44bbfb9c6a2c..7026eb6ecf78 100644
--- a/subprojects/resources/src/main/java/org/gradle/internal/filestore/FileStoreSearcher.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/FileStoreSearcher.java
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.internal.filestore;
-
-import org.gradle.internal.resource.local.LocallyAvailableResource;
+package org.gradle.internal.resource.local;
 
 import java.util.Set;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LazyLocallyAvailableResourceCandidates.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/LazyLocallyAvailableResourceCandidates.java
similarity index 89%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LazyLocallyAvailableResourceCandidates.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/local/LazyLocallyAvailableResourceCandidates.java
index c7cece9f1e9b..b0e098450857 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LazyLocallyAvailableResourceCandidates.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/LazyLocallyAvailableResourceCandidates.java
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.local;
+package org.gradle.internal.resource.local;
 
 import org.gradle.internal.Factory;
-import org.gradle.internal.resource.local.DefaultLocallyAvailableResource;
-import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.gradle.internal.hash.HashUtil;
 import org.gradle.internal.hash.HashValue;
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceCandidates.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceCandidates.java
similarity index 87%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceCandidates.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceCandidates.java
index 3687182083a2..d3b7c06b8091 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceCandidates.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceCandidates.java
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.local;
+package org.gradle.internal.resource.local;
 
-import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.gradle.internal.hash.HashValue;
 
 /**
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceFinder.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceFinder.java
similarity index 95%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceFinder.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceFinder.java
index 5c843378af0d..fc95133dfaaf 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceFinder.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceFinder.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.local;
+package org.gradle.internal.resource.local;
 
 /**
  * Can find a locally available candidates for an external resource, through some means.
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceFinderSearchableFileStoreAdapter.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceFinderSearchableFileStoreAdapter.java
similarity index 91%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceFinderSearchableFileStoreAdapter.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceFinderSearchableFileStoreAdapter.java
index 6047525c772c..708fa82cddb0 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/local/LocallyAvailableResourceFinderSearchableFileStoreAdapter.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/local/LocallyAvailableResourceFinderSearchableFileStoreAdapter.java
@@ -14,12 +14,10 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.local;
+package org.gradle.internal.resource.local;
 
 import org.gradle.api.Transformer;
-import org.gradle.internal.filestore.FileStoreSearcher;
 import org.gradle.internal.Factory;
-import org.gradle.internal.resource.local.LocallyAvailableResource;
 import org.gradle.util.CollectionUtils;
 
 import java.io.File;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/DefaultExternalResourceMetaData.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/DefaultExternalResourceMetaData.java
similarity index 77%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/DefaultExternalResourceMetaData.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/DefaultExternalResourceMetaData.java
index 16505e920232..d74d3c6cba65 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/DefaultExternalResourceMetaData.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/DefaultExternalResourceMetaData.java
@@ -14,31 +14,31 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.metadata;
+package org.gradle.internal.resource.metadata;
 
 import org.gradle.api.Nullable;
 import org.gradle.internal.hash.HashValue;
 
 import java.io.Serializable;
+import java.net.URI;
 import java.util.Date;
 
 public class DefaultExternalResourceMetaData implements ExternalResourceMetaData, Serializable {
-
-    private final String location;
+    private final URI location;
     private final Date lastModified;
     private final long contentLength;
     private final String etag;
     private final String sha1;
 
-    public DefaultExternalResourceMetaData(String location) {
+    public DefaultExternalResourceMetaData(URI location) {
         this(location, -1, -1, null, null);
     }
 
-    public DefaultExternalResourceMetaData(String location, long lastModified, long contentLength, @Nullable String etag, @Nullable HashValue sha1) {
+    public DefaultExternalResourceMetaData(URI location, long lastModified, long contentLength, @Nullable String etag, @Nullable HashValue sha1) {
         this(location, lastModified > 0 ? new Date(lastModified) : null, contentLength, etag, sha1);
     }
     
-    public DefaultExternalResourceMetaData(String location, @Nullable Date lastModified, long contentLength, @Nullable String etag, @Nullable HashValue sha1) {
+    public DefaultExternalResourceMetaData(URI location, @Nullable Date lastModified, long contentLength, @Nullable String etag, @Nullable HashValue sha1) {
         this.location = location;
         this.lastModified = lastModified;
         this.contentLength = contentLength;
@@ -46,7 +46,7 @@ public DefaultExternalResourceMetaData(String location, @Nullable Date lastModif
         this.sha1 = sha1 == null ? null : sha1.asHexString();
     }
 
-    public String getLocation() {
+    public URI getLocation() {
         return location;
     }
 
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaData.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/ExternalResourceMetaData.java
similarity index 90%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaData.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/ExternalResourceMetaData.java
index e49d7fdc9ff3..367218366698 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaData.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/ExternalResourceMetaData.java
@@ -14,20 +14,24 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.metadata;
+package org.gradle.internal.resource.metadata;
 
 import org.gradle.api.Nullable;
 import org.gradle.internal.hash.HashValue;
 
+import java.net.URI;
 import java.util.Date;
 
 public interface ExternalResourceMetaData {
 
-    String getLocation();
+    URI getLocation();
 
     @Nullable
     Date getLastModified();
 
+    /**
+     * Returns -1 when the content length is unknown.
+     */
     long getContentLength();
 
     /**
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaDataCompare.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/ExternalResourceMetaDataCompare.java
similarity index 97%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaDataCompare.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/ExternalResourceMetaDataCompare.java
index 10921a37aa0a..64671ea6b891 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaDataCompare.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/metadata/ExternalResourceMetaDataCompare.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.metadata;
+package org.gradle.internal.resource.metadata;
 
 import org.gradle.api.Nullable;
 import org.gradle.internal.Factory;
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceAccessor.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceAccessor.java
similarity index 87%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceAccessor.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceAccessor.java
index e735e43621e0..480b31befd60 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceAccessor.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceAccessor.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer;
+package org.gradle.internal.resource.transfer;
 
 import org.gradle.api.Nullable;
-import org.gradle.api.internal.externalresource.ExternalResource;
-import org.gradle.api.internal.externalresource.metadata.ExternalResourceMetaData;
+import org.gradle.internal.resource.ExternalResource;
+import org.gradle.internal.resource.metadata.ExternalResourceMetaData;
 import org.gradle.internal.hash.HashValue;
 
 import java.io.IOException;
+import java.net.URI;
 
 public interface ExternalResourceAccessor {
 
@@ -38,7 +39,7 @@ public interface ExternalResourceAccessor {
      * @throws IOException If the resource may exist, but not could be obtained for some reason
      */
     @Nullable
-    ExternalResource getResource(String location) throws IOException;
+    ExternalResource getResource(URI location) throws IOException;
 
     /**
      * Obtain the SHA-1 checksum for the resource at the given location.
@@ -50,7 +51,7 @@ public interface ExternalResourceAccessor {
      * @return The sha-1 if it can be cheaply obtained, otherwise null.
      */
     @Nullable
-    HashValue getResourceSha1(String location);
+    HashValue getResourceSha1(URI location);
 
     /**
      * Obtains only the metadata about the resource.
@@ -70,6 +71,6 @@ public interface ExternalResourceAccessor {
      * @throws IOException If the resource may exist, but not could be obtained for some reason
      */
     @Nullable
-    ExternalResourceMetaData getMetaData(String location) throws IOException;
+    ExternalResourceMetaData getMetaData(URI location) throws IOException;
     
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceLister.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceLister.java
similarity index 80%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceLister.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceLister.java
index 7c177c521e3e..a101de3374d3 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceLister.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceLister.java
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer;
+package org.gradle.internal.resource.transfer;
+
+import org.gradle.api.Nullable;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.List;
 
 public interface ExternalResourceLister {
-
-    public List<String> list(String parent) throws IOException;
+    @Nullable
+    public List<String> list(URI parent) throws IOException;
 
 }
diff --git a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceUploader.java b/subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceUploader.java
similarity index 87%
rename from subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceUploader.java
rename to subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceUploader.java
index e0c9f7deea92..efabc2042a0f 100644
--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/externalresource/transfer/ExternalResourceUploader.java
+++ b/subprojects/resources/src/main/java/org/gradle/internal/resource/transfer/ExternalResourceUploader.java
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.transfer;
+package org.gradle.internal.resource.transfer;
 
 import org.gradle.internal.Factory;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 
 public interface ExternalResourceUploader {
 
-    void upload(Factory<InputStream> sourceFactory, Long contentLength, String destination) throws IOException;
+    void upload(Factory<InputStream> sourceFactory, Long contentLength, URI destination) throws IOException;
 }
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/resource/CachingResourceTest.groovy b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/CachingResourceTest.groovy
similarity index 93%
rename from subprojects/core/src/test/groovy/org/gradle/api/internal/resource/CachingResourceTest.groovy
rename to subprojects/resources/src/test/groovy/org/gradle/internal/resource/CachingResourceTest.groovy
index f8ae03025538..e53af50be3f9 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/resource/CachingResourceTest.groovy
+++ b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/CachingResourceTest.groovy
@@ -15,13 +15,15 @@
  */
 
 
-package org.gradle.api.internal.resource
+package org.gradle.internal.resource
 
 import org.gradle.util.JUnit4GroovyMockery
 import org.jmock.integration.junit4.JMock
 import org.junit.Test
 import org.junit.runner.RunWith
-import static org.hamcrest.Matchers.*
+
+import static org.hamcrest.Matchers.equalTo
+import static org.hamcrest.Matchers.nullValue
 import static org.junit.Assert.*
 
 @RunWith(JMock.class)
diff --git a/subprojects/resources/src/test/groovy/org/gradle/internal/resource/ExternalResourceNameTest.groovy b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/ExternalResourceNameTest.groovy
new file mode 100644
index 000000000000..91b7c8e7b5a3
--- /dev/null
+++ b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/ExternalResourceNameTest.groovy
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.internal.resource
+
+import org.gradle.util.Matchers
+import spock.lang.Shared
+import spock.lang.Specification
+
+class ExternalResourceNameTest extends Specification {
+    @Shared
+    def root = File.listRoots()[0]
+    @Shared
+    def base = new File(root, "base")
+
+    def "can construct a resource name from URI and path"() {
+        expect:
+        def base = URI.create(baseUri)
+        def name = new ExternalResourceName(base, path)
+        name.uri.toASCIIString() == new URI(base.scheme, null, base.host, base.port, expectedPath, null, null).toASCIIString()
+        name.path == expectedPath
+        name.uri.path == expectedPath
+        name.root.uri == URI.create(expectedRoot)
+        name.root == name.root.root
+
+        where:
+        baseUri                      | path                                               | expectedRoot        | expectedPath
+        "http://host/"               | "a/b/c.html"                                       | "http://host/"      | "/a/b/c.html"
+        "http://host/"               | "/a/b/c"                                           | "http://host/"      | "/a/b/c"
+        "http://host:8008"           | "/a/b/c"                                           | "http://host:8008/" | "/a/b/c"
+        "http://host/"               | "/"                                                | "http://host/"      | "/"
+        "http://host/a/b/c"          | ""                                                 | "http://host/"      | "/a/b/c"
+        "http://host/a/b/c"          | "[123]"                                            | "http://host/"      | "/a/b/c/[123]"
+        "http://host"                | "\u007b\u007f\u0080\u03b1\u07ff\u0800\u30b1\ufffe" | "http://host/"      | "/\u007b\u007f\u0080\u03b1\u07ff\u0800\u30b1\ufffe"
+        "http://host"                | ":?#-.~_@"                                         | "http://host/"      | "/:?#-.~_@"
+        this.base.toURI().toString() | "a/b/c"                                            | "file:/"            | this.base.toURI().path + "/a/b/c"
+    }
+
+    def "can construct a resource name from a path"() {
+        expect:
+        def name = new ExternalResourceName(path)
+        name.uri.toASCIIString() == URI.create(expectedUri).toASCIIString()
+        name.path == expectedPath
+        name.root.uri == URI.create(expectedRoot)
+        name.root == name.root.root
+
+        where:
+        path     | expectedUri | expectedRoot | expectedPath
+        "a/b/c"  | "a/b/c"     | ""           | "a/b/c"
+        "/a/b/c" | "/a/b/c"    | "/"          | "/a/b/c"
+        "/"      | "/"         | "/"          | "/"
+        "a:b"    | "a%3Ab"     | ""           | "a:b"
+        "a%:b"   | "a%25%3Ab"  | ""           | "a%:b"
+    }
+
+    def "can construct a resource name from a relative path"() {
+        expect:
+        def name = new ExternalResourceName(path)
+        name.uri == URI.create(expectedUri)
+        name.path == path
+        name.root.uri == new URI(null, null, expectedRoot, null)
+        name.root == name.root.root
+
+        where:
+        path     | expectedUri | expectedRoot
+        "a/b/c"  | "a/b/c"     | ""
+        "/a/b/c" | "/a/b/c"    | "/"
+        "/a/b/c" | "/a/b/c"    | "/"
+        "[123]"  | "%5B123%5D" | ""
+        "/"      | "/"         | "/"
+        ""       | ""          | ""
+    }
+
+    def "decoded name is base uri plus path"() {
+        expect:
+        def name = new ExternalResourceName(URI.create(uri))
+        name.decoded == expectedDecoded
+
+        where:
+        uri                          | expectedDecoded
+        "http://host:80/a/%5B123%5D" | "http://host:80/a/[123]"
+        "http://host/a/b"            | "http://host/a/b"
+        "http://host"                | "http://host"
+        "a/b/c"                      | "a/b/c"
+        "file:/a/b/c"                | "file:/a/b/c"
+    }
+
+    def "has equals and hashcode"() {
+        def name = new ExternalResourceName(URI.create("http://host"), "a/b/c")
+        def same = new ExternalResourceName(URI.create("http://host"), "a/b/c")
+        def samePath = new ExternalResourceName(URI.create("http://host/a/b"), "c")
+        def differentRoot = new ExternalResourceName(URI.create("http://other"), "a/b/c")
+        def differentPath = new ExternalResourceName(URI.create("http://host"), "x/y/z")
+        def relative = new ExternalResourceName("a/b/c")
+        def sameRelative = new ExternalResourceName("a/b/c")
+
+        expect:
+        name Matchers.strictlyEqual(same)
+        name Matchers.strictlyEqual(samePath)
+        relative Matchers.strictlyEqual(sameRelative)
+        name != differentPath
+        name != differentRoot
+        name != relative
+    }
+
+    def "can resolve an absolute path"() {
+        expect:
+        def name = new ExternalResourceName(URI.create(uri)).resolve(path)
+        name.uri == URI.create(expectedUri)
+
+        where:
+        uri                      | path     | expectedUri
+        "http://host/a/b/c"      | "/z"     | "http://host/z"
+        "http://host:8080/a/b/c" | "/path"  | "http://host:8080/path"
+        base.toURI().toString()  | "/z"     | "file:/z"
+        "/a/b/c"                 | "/z"     | "/z"
+        "a/b/c"                  | "/z"     | "/z"
+        "a/b/c"                  | "/"      | "/"
+        "/"                      | "/a/b/c" | "/a/b/c"
+        ""                       | "/a/b/c" | "/a/b/c"
+    }
+
+    def "can resolve an relative path"() {
+        expect:
+        def name = new ExternalResourceName(URI.create(uri)).resolve(path)
+        name.uri == URI.create(expectedUri)
+
+        where:
+        uri                      | path    | expectedUri
+        "http://host/a/b/c"      | "d"     | "http://host/a/b/c/d"
+        "http://host:8080/a/b/c" | "d/e"   | "http://host:8080/a/b/c/d/e"
+        base.toURI().toString()  | "a/b/c" | new File(base, "a/b/c").toURI().toString()
+        "/a/b/c"                 | "z"     | "/a/b/c/z"
+        "a/b/c"                  | "z"     | "a/b/c/z"
+        "/"                      | "z"     | "/z"
+        ""                       | "z"     | "z"
+    }
+}
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/resource/StringResourceTest.groovy b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/StringResourceTest.groovy
similarity index 84%
rename from subprojects/core/src/test/groovy/org/gradle/api/internal/resource/StringResourceTest.groovy
rename to subprojects/resources/src/test/groovy/org/gradle/internal/resource/StringResourceTest.groovy
index 9cd4ba0aa3f4..f6f3bc06ec73 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/resource/StringResourceTest.groovy
+++ b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/StringResourceTest.groovy
@@ -15,13 +15,15 @@
  */
 
 
-package org.gradle.api.internal.resource
-
-import static org.hamcrest.Matchers.*
-import static org.junit.Assert.*
+package org.gradle.internal.resource
 
 import org.junit.Test
 
+import static org.hamcrest.Matchers.equalTo
+import static org.hamcrest.Matchers.nullValue
+import static org.junit.Assert.assertThat
+import static org.junit.Assert.assertTrue
+
 class StringResourceTest {
     private final StringResource resource = new StringResource('displayname', 'text')
 
diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/resource/UriResourceTest.groovy b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/UriResourceTest.groovy
similarity index 79%
rename from subprojects/core/src/test/groovy/org/gradle/api/internal/resource/UriResourceTest.groovy
rename to subprojects/resources/src/test/groovy/org/gradle/internal/resource/UriResourceTest.groovy
index beb81192d2c6..637d1686f903 100644
--- a/subprojects/core/src/test/groovy/org/gradle/api/internal/resource/UriResourceTest.groovy
+++ b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/UriResourceTest.groovy
@@ -15,7 +15,7 @@
  */
 
 
-package org.gradle.api.internal.resource
+package org.gradle.internal.resource
 
 import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
@@ -81,6 +81,15 @@ class UriResourceTest {
         assertThat(resource.text, equalTo('<content>'));
     }
 
+    @Test
+    public void assumesFileIsEncodedUsingUtf8() throws IOException {
+        file.setText('\u03b1', 'utf-8')
+
+        UriResource resource = new UriResource('<display-name>', file);
+        assertTrue(resource.exists)
+        assertThat(resource.text, equalTo('\u03b1'));
+    }
+
     @Test
     public void hasNoContentWhenFileDoesNotExist() {
         UriResource resource = new UriResource('<display-name>', file);
@@ -180,4 +189,19 @@ class UriResourceTest {
         UriResource resource = new UriResource("<file-type>", new URI("http://www.gradle.org/unknown.txt"));
         assertThat(resource.displayName, equalTo('<file-type> \'http://www.gradle.org/unknown.txt\''))
     }
+
+    @Test
+    public void extractsCharacterEncodingFromContentType() {
+        assertThat(UriResource.extractCharacterEncoding('content/unknown', null), nullValue())
+        assertThat(UriResource.extractCharacterEncoding('content/unknown', 'default'), equalTo('default'))
+        assertThat(UriResource.extractCharacterEncoding(null, 'default'), equalTo('default'))
+        assertThat(UriResource.extractCharacterEncoding('text/html', null), nullValue())
+        assertThat(UriResource.extractCharacterEncoding('text/html; charset=UTF-8', null), equalTo('UTF-8'))
+        assertThat(UriResource.extractCharacterEncoding('text/html; other=value; other="value"; charset=US-ASCII', null), equalTo('US-ASCII'))
+        assertThat(UriResource.extractCharacterEncoding('text/plain; other=value;', null), equalTo(null))
+        assertThat(UriResource.extractCharacterEncoding('text/plain; charset="charset"', null), equalTo('charset'))
+        assertThat(UriResource.extractCharacterEncoding('text/plain; charset="\\";\\="', null), equalTo('";\\='))
+        assertThat(UriResource.extractCharacterEncoding('text/plain; charset=', null), equalTo(null))
+        assertThat(UriResource.extractCharacterEncoding('text/plain; charset; charset=;charset="missing-quote', null), equalTo("missing-quote"))
+    }
 }
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/metadata/DefaultExternalResourceMetaDataTest.groovy b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/metadata/DefaultExternalResourceMetaDataTest.groovy
similarity index 85%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/metadata/DefaultExternalResourceMetaDataTest.groovy
rename to subprojects/resources/src/test/groovy/org/gradle/internal/resource/metadata/DefaultExternalResourceMetaDataTest.groovy
index 57b1d0bdc3a8..84cc6b272636 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/metadata/DefaultExternalResourceMetaDataTest.groovy
+++ b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/metadata/DefaultExternalResourceMetaDataTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.metadata
+package org.gradle.internal.resource.metadata
 
 import spock.lang.Specification
 import org.gradle.internal.hash.HashValue
@@ -24,7 +24,7 @@ class DefaultExternalResourceMetaDataTest extends Specification {
     def "hash value is preserved"() {
         given:
         def sha1 = "abc"
-        def md = new DefaultExternalResourceMetaData("somewhere", -1, -1, null, new HashValue(sha1))
+        def md = new DefaultExternalResourceMetaData(new URI("scheme:thing"), -1, -1, null, new HashValue(sha1))
 
         expect:
         md.sha1.equals(new HashValue(sha1))
diff --git a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaDataCompareTest.groovy b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/metadata/ExternalResourceMetaDataCompareTest.groovy
similarity index 98%
rename from subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaDataCompareTest.groovy
rename to subprojects/resources/src/test/groovy/org/gradle/internal/resource/metadata/ExternalResourceMetaDataCompareTest.groovy
index 124b6e222079..17eaf5cd69b5 100644
--- a/subprojects/core-impl/src/test/groovy/org/gradle/api/internal/externalresource/metadata/ExternalResourceMetaDataCompareTest.groovy
+++ b/subprojects/resources/src/test/groovy/org/gradle/internal/resource/metadata/ExternalResourceMetaDataCompareTest.groovy
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.gradle.api.internal.externalresource.metadata
+package org.gradle.internal.resource.metadata
 
 import org.gradle.internal.Factory
 import spock.lang.Shared
diff --git a/subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/BasicScalaCompilerIntegrationTest.groovy b/subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/BasicScalaCompilerIntegrationTest.groovy
index b3ec2405f375..debe420e27af 100644
--- a/subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/BasicScalaCompilerIntegrationTest.groovy
+++ b/subprojects/scala/src/integTest/groovy/org/gradle/scala/compile/BasicScalaCompilerIntegrationTest.groovy
@@ -147,7 +147,6 @@ repositories {
 
 dependencies {
     compile "org.scala-lang:scala-library:$version"
-    compile localGroovy()
 }
 """
     }
@@ -162,12 +161,11 @@ dependencies {
 package compile.test
 
 import scala.collection.JavaConversions._
-import org.codehaus.groovy.runtime.DefaultGroovyMethods
 
 class Person(val name: String, val age: Int) {
     def hello() {
-        val x: java.util.Collection[Int] = List(3, 1, 2)
-        DefaultGroovyMethods.max(x)
+        val x: java.util.List[Int] = List(3, 1, 2)
+        java.util.Collections.reverse(x)
     }
 }
 """
diff --git a/subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaCompile.java b/subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaCompile.java
index 9afcecab7f3a..d85f81e4a412 100644
--- a/subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaCompile.java
+++ b/subprojects/scala/src/main/groovy/org/gradle/api/tasks/scala/ScalaCompile.java
@@ -58,13 +58,6 @@ public class ScalaCompile extends AbstractCompile {
 
     @Inject
     public ScalaCompile() {
-        ProjectInternal projectInternal = (ProjectInternal) getProject();
-        IsolatedAntBuilder antBuilder = getServices().get(IsolatedAntBuilder.class);
-        Factory<AntBuilder> antBuilderFactory = getServices().getFactory(AntBuilder.class);
-        CompilerDaemonManager compilerDaemonManager = getServices().get(CompilerDaemonManager.class);
-        ScalaCompilerFactory scalaCompilerFactory = new ScalaCompilerFactory(projectInternal, antBuilder, antBuilderFactory, compilerDaemonManager);
-        Compiler<ScalaJavaJointCompileSpec> delegatingCompiler = new DelegatingScalaCompiler(scalaCompilerFactory);
-        compiler = new CleaningScalaCompiler(delegatingCompiler, getOutputs());
     }
 
     /**
@@ -115,6 +108,19 @@ void setCompiler(Compiler<ScalaJavaJointCompileSpec> compiler) {
         this.compiler = compiler;
     }
 
+    private Compiler<ScalaJavaJointCompileSpec> getCompiler() {
+        if (compiler == null) {
+            ProjectInternal projectInternal = (ProjectInternal) getProject();
+            IsolatedAntBuilder antBuilder = getServices().get(IsolatedAntBuilder.class);
+            Factory<AntBuilder> antBuilderFactory = getServices().getFactory(AntBuilder.class);
+            CompilerDaemonManager compilerDaemonManager = getServices().get(CompilerDaemonManager.class);
+            ScalaCompilerFactory scalaCompilerFactory = new ScalaCompilerFactory(projectInternal, antBuilder, antBuilderFactory, compilerDaemonManager);
+            Compiler<ScalaJavaJointCompileSpec> delegatingCompiler = new DelegatingScalaCompiler(scalaCompilerFactory);
+            compiler = new CleaningScalaCompiler(delegatingCompiler, getOutputs());
+        }
+        return compiler;
+    }
+
     @TaskAction
     protected void compile() {
         checkScalaClasspathIsNonEmpty();
@@ -132,7 +138,7 @@ protected void compile() {
             configureIncrementalCompilation(spec);
         }
 
-        compiler.execute(spec);
+        getCompiler().execute(spec);
     }
 
     private void checkScalaClasspathIsNonEmpty() {
diff --git a/subprojects/sonar/src/integTest/groovy/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest.groovy b/subprojects/sonar/src/integTest/groovy/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest.groovy
index c0341a520074..5d54bf651492 100644
--- a/subprojects/sonar/src/integTest/groovy/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest.groovy
+++ b/subprojects/sonar/src/integTest/groovy/org/gradle/api/plugins/sonar/SonarSmokeIntegrationTest.groovy
@@ -68,7 +68,7 @@ sonar.embeddedDatabase.port=$databasePort
     def "can run Sonar analysis"() {
         executer.requireIsolatedDaemons()
         // Without forking, we run into problems with Sonar's BootStrapClassLoader, at least when running from IDEA.
-        // Problem is that BootStrapClassLoader, although generally isolated from its parent(s), always
+        // Problem is that BootStrapClassLoader, although generally isolated from its root(s), always
         // delegates to the system class loader. That class loader holds the test class path and therefore
         // also the Sonar dependencies with "provided" scope. Hence, the Sonar dependencies get loaded by
         // the wrong class loader.
diff --git a/subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/build.gradle b/subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/build.gradle
index 2f1848bdfb65..2cda3833041f 100644
--- a/subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/build.gradle
+++ b/subprojects/sonar/src/integTest/resources/org/gradle/api/sonar/runner/SonarRunnerSmokeIntegrationTest/shared/groovyProject/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'groovy'
 description = "Sonar Test Groovy Project"
 
 dependencies {
-    compile 'org.codehaus.groovy:groovy-all:2.0.5'
+    compile 'org.codehaus.groovy:groovy:2.2.2'
 }
 
 sonarRunner {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/TargetGradleVersion.java b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/TargetGradleVersion.java
index 8e623f793285..4bee0b61026c 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/TargetGradleVersion.java
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/TargetGradleVersion.java
@@ -25,7 +25,7 @@
 @Inherited
 public @interface TargetGradleVersion {
     /**
-     * The requested target Gradle version. Can use '>=nnn', '<=nnn', '&lt;nnn', '=nnn', 'current' or '!current' or space-separated list of patterns.
+     * The requested target Gradle version. Can use '>=nnn', '<=nnn', '&lt;nnn', '&gt;nnn', '=nnn', 'current' or '!current' or space-separated list of patterns.
      */
     String value();
 }
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiSpecification.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiSpecification.groovy
index 35cb6712ebcd..f50a2d37925a 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiSpecification.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiSpecification.groovy
@@ -41,6 +41,8 @@ import spock.lang.Specification
  * </ul>
  */
 @RunWith(ToolingApiCompatibilitySuiteRunner)
+@ToolingApiVersion('>=1.2')
+@TargetGradleVersion('>=1.0-milestone-8')
 abstract class ToolingApiSpecification extends Specification {
     static final Logger LOGGER = LoggerFactory.getLogger(ToolingApiSpecification)
     @Rule public final SetSystemProperties sysProperties = new SetSystemProperties()
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiVersion.java b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiVersion.java
index a05b6480d0e9..b4cf0ef3dfef 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiVersion.java
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/fixture/ToolingApiVersion.java
@@ -25,7 +25,7 @@
 @Inherited
 public @interface ToolingApiVersion {
     /**
-     * The requested tooling API version. Can use '>=nnn', '<=nnn', '&lt;nnn', '=nnn', 'current' or '!current' or space-separated list of patterns.
+     * The requested tooling API version. Can use '>=nnn', '<=nnn', '&lt;nnn', '&gt;nnn', '=nnn', 'current' or '!current' or space-separated list of patterns.
      */
     String value();
 }
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m4/ToolingApiEclipseLinkedResourcesCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m4/ToolingApiEclipseLinkedResourcesCrossVersionSpec.groovy
index 2061b82b22aa..595de367ba69 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m4/ToolingApiEclipseLinkedResourcesCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m4/ToolingApiEclipseLinkedResourcesCrossVersionSpec.groovy
@@ -16,13 +16,9 @@
 
 package org.gradle.integtests.tooling.m4
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.model.eclipse.HierarchicalEclipseProject
 
-@ToolingApiVersion('>=1.0-milestone-4')
-@TargetGradleVersion('>=1.0-milestone-4')
 class ToolingApiEclipseLinkedResourcesCrossVersionSpec extends ToolingApiSpecification {
     def "can build linked resources"() {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m4/ToolingApiEclipseMinimalModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m4/ToolingApiEclipseMinimalModelCrossVersionSpec.groovy
index 52a7e1093926..b938105b4c8f 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m4/ToolingApiEclipseMinimalModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m4/ToolingApiEclipseMinimalModelCrossVersionSpec.groovy
@@ -15,11 +15,9 @@
  */
 package org.gradle.integtests.tooling.m4
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.model.eclipse.HierarchicalEclipseProject
 
-@TargetGradleVersion('>=1.0-milestone-4')
 class ToolingApiEclipseMinimalModelCrossVersionSpec extends ToolingApiSpecification {
     def "minimal Eclipse model does not attempt to resolve external dependencies"() {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/EclipseModelWithFlatRepoCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/EclipseModelWithFlatRepoCrossVersionSpec.groovy
index 57ad728a2b0e..00acefecb13f 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/EclipseModelWithFlatRepoCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/EclipseModelWithFlatRepoCrossVersionSpec.groovy
@@ -16,12 +16,10 @@
 
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.model.eclipse.EclipseProject
 import spock.lang.Issue
 
-@TargetGradleVersion('>=1.0-milestone-5')
 class EclipseModelWithFlatRepoCrossVersionSpec extends ToolingApiSpecification {
 
     @Issue("GRADLE-1621")
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiBuildExecutionCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiBuildExecutionCrossVersionSpec.groovy
index dbe9248a7006..519a4aac8986 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiBuildExecutionCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiBuildExecutionCrossVersionSpec.groovy
@@ -15,16 +15,12 @@
  */
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.BuildException
 import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.Task
 import org.gradle.tooling.model.eclipse.EclipseProject
 
-@ToolingApiVersion('>=1.0-milestone-5')
-@TargetGradleVersion('>=1.0-milestone-5')
 class ToolingApiBuildExecutionCrossVersionSpec extends ToolingApiSpecification {
     def "can build the set of tasks for a project"() {
         file('build.gradle') << '''
@@ -39,6 +35,7 @@ task c
         GradleProject project = withConnection { connection -> connection.getModel(GradleProject.class) }
 
         then:
+        project.tasks.count { it.name != 'setupBuild' } == 3
         def taskA = project.tasks.find { it.name == 'a' }
         taskA != null
         taskA.path == ':a'
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiBuildableEclipseModelFixesCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiBuildableEclipseModelFixesCrossVersionSpec.groovy
index d95aa5fd1279..06f96f668c15 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiBuildableEclipseModelFixesCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiBuildableEclipseModelFixesCrossVersionSpec.groovy
@@ -15,15 +15,11 @@
  */
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.eclipse.EclipseProject
 import spock.lang.Issue
 
-@ToolingApiVersion('>=1.0-milestone-5')
-@TargetGradleVersion('>=1.0-milestone-5')
 class ToolingApiBuildableEclipseModelFixesCrossVersionSpec extends ToolingApiSpecification {
     @Issue("GRADLE-1529")
     //this is just one of the ways of fixing the problem. See the issue for details
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiEclipseModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiEclipseModelCrossVersionSpec.groovy
index a511ac2b214b..d3f03b863735 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiEclipseModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiEclipseModelCrossVersionSpec.groovy
@@ -15,11 +15,9 @@
  */
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.model.eclipse.EclipseProject
 
-@ToolingApiVersion('>=1.0-milestone-5')
 class ToolingApiEclipseModelCrossVersionSpec extends ToolingApiSpecification {
     def "eclipse project has access to gradle project and its tasks"() {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiGradleProjectCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiGradleProjectCrossVersionSpec.groovy
index 08cdd50a8b1a..fda999f96c12 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiGradleProjectCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiGradleProjectCrossVersionSpec.groovy
@@ -15,12 +15,10 @@
  */
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.GradleTask
 
-@ToolingApiVersion('>=1.0-milestone-5')
 class ToolingApiGradleProjectCrossVersionSpec extends ToolingApiSpecification {
 
     def "provides tasks of a project"() {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiHonorsProjectCustomizationsCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiHonorsProjectCustomizationsCrossVersionSpec.groovy
index adbb978a7c00..448fb6354b19 100755
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiHonorsProjectCustomizationsCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiHonorsProjectCustomizationsCrossVersionSpec.groovy
@@ -15,14 +15,10 @@
  */
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.ProjectConnection
 import org.gradle.tooling.model.eclipse.EclipseProject
 
-@ToolingApiVersion('>=1.0-milestone-5')
-@TargetGradleVersion('>=1.0-milestone-5')
 class ToolingApiHonorsProjectCustomizationsCrossVersionSpec extends ToolingApiSpecification {
 
     def "should honour reconfigured project names"() {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiIdeaModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiIdeaModelCrossVersionSpec.groovy
index 9894ddd59b9d..680921d99484 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiIdeaModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiIdeaModelCrossVersionSpec.groovy
@@ -15,14 +15,10 @@
  */
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.test.fixtures.maven.MavenFileRepository
 import org.gradle.tooling.model.idea.*
 
-@ToolingApiVersion('>=1.0-milestone-5')
-@TargetGradleVersion('>=1.0-milestone-5')
 class ToolingApiIdeaModelCrossVersionSpec extends ToolingApiSpecification {
 
     def "builds the model even if idea plugin not applied"() {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiModelCrossVersionSpec.groovy
index 803a0f8a1748..603aed6cb5c8 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiModelCrossVersionSpec.groovy
@@ -15,14 +15,10 @@
  */
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.BuildException
 import org.gradle.tooling.model.GradleProject
 
-@ToolingApiVersion('>=1.0-milestone-5')
-@TargetGradleVersion('>=1.0-milestone-5')
 class ToolingApiModelCrossVersionSpec extends ToolingApiSpecification {
     def "receives progress while the model is building"() {
         file('build.gradle') << '''
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiReceivingStandardStreamsCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiReceivingStandardStreamsCrossVersionSpec.groovy
index 382028260773..635549790106 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiReceivingStandardStreamsCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/ToolingApiReceivingStandardStreamsCrossVersionSpec.groovy
@@ -15,13 +15,9 @@
  */
 package org.gradle.integtests.tooling.m5
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.model.GradleProject
 
-@ToolingApiVersion('>=1.0-milestone-5')
-@TargetGradleVersion('>=1.0-milestone-5')
 class ToolingApiReceivingStandardStreamsCrossVersionSpec extends ToolingApiSpecification {
 
     def setup() {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/UnsupportedModelFeedbackCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/UnsupportedModelFeedbackCrossVersionSpec.groovy
deleted file mode 100644
index 2572087638a2..000000000000
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m5/UnsupportedModelFeedbackCrossVersionSpec.groovy
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.integtests.tooling.m5
-
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.tooling.UnknownModelException
-import org.gradle.tooling.model.idea.BasicIdeaProject
-import org.gradle.tooling.model.idea.IdeaProject
-
-@TargetGradleVersion('<=1.0-milestone-4')
-class UnsupportedModelFeedbackCrossVersionSpec extends ToolingApiSpecification {
-    def "fails gracefully when unsupported model requested"() {
-        when:
-        withConnection { it.getModel(model) }
-
-        then:
-        UnknownModelException e = thrown()
-        e.message.contains(model.simpleName)
-
-        where:
-        model << [IdeaProject, BasicIdeaProject]
-    }
-}
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/BuildEnvironmentModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/BuildEnvironmentModelCrossVersionSpec.groovy
index 635bc0be79db..77117147e369 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/BuildEnvironmentModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/BuildEnvironmentModelCrossVersionSpec.groovy
@@ -18,12 +18,9 @@ package org.gradle.integtests.tooling.m8
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.build.BuildEnvironment
 
-@ToolingApiVersion('>=1.0-milestone-8')
-@TargetGradleVersion('>=1.0-milestone-8')
 class BuildEnvironmentModelCrossVersionSpec extends ToolingApiSpecification {
 
     def "informs about build environment"() {
@@ -36,6 +33,16 @@ class BuildEnvironmentModelCrossVersionSpec extends ToolingApiSpecification {
         !model.java.jvmArguments.empty
     }
 
+    @TargetGradleVersion("<1.0-milestone-8")
+    def "partial BuildEnvironment model for pre 1.0m8 providers"() {
+        when:
+        BuildEnvironment buildEnv = withConnection { it.getModel(BuildEnvironment.class) }
+
+        then:
+        buildEnv != null
+        buildEnv.gradle.gradleVersion == targetDist.version.version
+    }
+
     def "informs about java args as in the build script"() {
         given:
         toolingApi.isEmbedded = false //cannot be run in embedded mode
@@ -52,10 +59,26 @@ class BuildEnvironmentModelCrossVersionSpec extends ToolingApiSpecification {
         env.java.jvmArguments.each { inputArgsInBuild.contains(it) }
     }
 
+    @TargetGradleVersion(">=1.0-milestone-8 <=1.0-milestone-9")
+    def "informs about java home as in the build script for older versions"() {
+        given:
+        file('build.gradle') << """
+        description = org.gradle.util.Jvm.current().javaHome.toString()
+        """
+
+        when:
+        BuildEnvironment env = withConnection { it.getModel(BuildEnvironment.class) }
+        GradleProject project = withConnection { it.getModel(GradleProject.class) }
+
+        then:
+        env.java.javaHome.toString() == project.description
+    }
+
+    @TargetGradleVersion(">1.0-milestone-9")
     def "informs about java home as in the build script"() {
         given:
         file('build.gradle') << """
-        description = Jvm.current().javaHome.toString()
+        description = org.gradle.internal.jvm.Jvm.current().javaHome.toString()
         """
 
         when:
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ConsumingStandardInputCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ConsumingStandardInputCrossVersionSpec.groovy
index 3346da2e6924..677516cf4ade 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ConsumingStandardInputCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ConsumingStandardInputCrossVersionSpec.groovy
@@ -16,15 +16,11 @@
 
 package org.gradle.integtests.tooling.m8
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.ProjectConnection
 import org.gradle.tooling.model.GradleProject
 import spock.lang.Timeout
 
-@ToolingApiVersion('>=1.0-milestone-8')
-@TargetGradleVersion('>=1.0-milestone-8')
 class ConsumingStandardInputCrossVersionSpec extends ToolingApiSpecification {
 
     def setup() {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/JavaConfigurabilityCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/JavaConfigurabilityCrossVersionSpec.groovy
index e2d4468c5a84..0a554c5da8c3 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/JavaConfigurabilityCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/JavaConfigurabilityCrossVersionSpec.groovy
@@ -16,16 +16,12 @@
 
 package org.gradle.integtests.tooling.m8
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.build.BuildEnvironment
 import spock.lang.Issue
 import spock.lang.Timeout
 
-@ToolingApiVersion('>=1.0-milestone-8')
-@TargetGradleVersion('>=1.0-milestone-8')
 class JavaConfigurabilityCrossVersionSpec extends ToolingApiSpecification {
 
     def setup() {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/StrictLongRunningOperationCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/StrictLongRunningOperationCrossVersionSpec.groovy
deleted file mode 100644
index 65ec7a078136..000000000000
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/StrictLongRunningOperationCrossVersionSpec.groovy
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.integtests.tooling.m8
-
-import org.gradle.integtests.fixtures.AvailableJavaHomes
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
-import org.gradle.tooling.exceptions.UnsupportedOperationConfigurationException
-import org.gradle.tooling.model.build.BuildEnvironment
-import spock.lang.IgnoreIf
-
-@ToolingApiVersion('>=1.0-milestone-8')
-@TargetGradleVersion('<=1.0-milestone-7')
-class StrictLongRunningOperationCrossVersionSpec extends ToolingApiSpecification {
-
-    def setup() {
-        //this test does not make any sense in embedded mode
-        //as we don't own the process and we will attempt to configure system wide options.
-        toolingApi.isEmbedded = false
-    }
-
-    @IgnoreIf({ AvailableJavaHomes.bestAlternative == null })
-    def "fails eagerly when java home unsupported for model"() {
-        def java = AvailableJavaHomes.bestAlternative
-        when:
-        withConnection {
-            def model = it.model(BuildEnvironment.class)
-            model.setJavaHome(java)
-            model.get()
-        }
-
-        then:
-        UnsupportedOperationConfigurationException e = thrown()
-        assertExceptionInformative(e, "setJavaHome()")
-    }
-
-    @IgnoreIf({ AvailableJavaHomes.bestAlternative == null })
-    def "fails eagerly when java home unsupported for build"() {
-        def java = AvailableJavaHomes.bestAlternative
-        when:
-        withConnection {
-            def build = it.newBuild()
-            build.setJavaHome(java)
-            build.forTasks('tasks').run()
-        }
-
-        then:
-        UnsupportedOperationConfigurationException e = thrown()
-        assertExceptionInformative(e, "setJavaHome()")
-    }
-
-    def "fails eagerly when java args unsupported"() {
-        when:
-        withConnection {
-            def model = it.model(BuildEnvironment.class)
-            model.setJvmArguments("-Xmx512m")
-            model.get()
-        }
-
-        then:
-        UnsupportedOperationConfigurationException e = thrown()
-        assertExceptionInformative(e, "setJvmArguments()")
-    }
-
-    def "fails eagerly when standard input unsupported"() {
-        when:
-        withConnection {
-            def model = it.model(BuildEnvironment.class)
-            model.setStandardInput(new ByteArrayInputStream('yo!'.bytes))
-            model.get()
-        }
-
-        then:
-        UnsupportedOperationConfigurationException e = thrown()
-        assertExceptionInformative(e, "setStandardInput()")
-    }
-
-    void assertExceptionInformative(UnsupportedOperationConfigurationException actual, String expectedMessageSubstring) {
-        assert actual.message.contains(expectedMessageSubstring)
-    }
-}
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ToolingApiEclipseModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ToolingApiEclipseModelCrossVersionSpec.groovy
index df96e1184567..2421d9298ae7 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ToolingApiEclipseModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ToolingApiEclipseModelCrossVersionSpec.groovy
@@ -15,13 +15,9 @@
  */
 package org.gradle.integtests.tooling.m8
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.model.eclipse.EclipseProject
 
-@ToolingApiVersion('>=1.0-milestone-3')
-@TargetGradleVersion('>=1.0-milestone-8')
 class ToolingApiEclipseModelCrossVersionSpec extends ToolingApiSpecification {
     def "can customize model late in the configuration phase"() {
         projectDir.file('build.gradle').text = """
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ToolingApiLoggingCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ToolingApiLoggingCrossVersionSpec.groovy
index f8c78ac13d43..3a190fc298e0 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ToolingApiLoggingCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/ToolingApiLoggingCrossVersionSpec.groovy
@@ -16,14 +16,10 @@
 
 package org.gradle.integtests.tooling.m8
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.internal.consumer.ConnectorServices
 import org.junit.Assume
 
-@ToolingApiVersion('>=1.0-milestone-8')
-@TargetGradleVersion('>=1.0-milestone-8')
 class ToolingApiLoggingCrossVersionSpec extends ToolingApiSpecification {
 
     def setup() {
@@ -119,7 +115,7 @@ project.logger.debug("debug logging");
     }
 
     String filterToolingApiSpecific(String output) {
-        return output.replaceFirst("Connection from tooling API older than version 1.2 has been deprecated and is scheduled to be removed in Gradle 2.0" + System.getProperty("line.separator"), "")
+        return output.replaceFirst("Connection from tooling API older than version 1.2 has been deprecated and is scheduled to be removed in Gradle 3.0" + System.getProperty("line.separator"), "")
     }
 
     void shouldNotContainProviderLogging(String output) {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/VersionOnlyBuildEnvironmentCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/VersionOnlyBuildEnvironmentCrossVersionSpec.groovy
deleted file mode 100644
index 18ff125df9cf..000000000000
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m8/VersionOnlyBuildEnvironmentCrossVersionSpec.groovy
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.integtests.tooling.m8
-
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
-import org.gradle.tooling.model.UnsupportedMethodException
-import org.gradle.tooling.model.build.BuildEnvironment
-
-@ToolingApiVersion('>=1.0-milestone-8')
-@TargetGradleVersion('<=1.0-milestone-7')
-class VersionOnlyBuildEnvironmentCrossVersionSpec extends ToolingApiSpecification {
-
-    def "informs about version"() {
-        when:
-        BuildEnvironment model = withConnection { it.getModel(BuildEnvironment.class) }
-
-        then:
-        model.gradle.gradleVersion == targetDist.version.version
-    }
-
-    def "fails gracefully for other info"() {
-        given:
-        BuildEnvironment model = withConnection { it.getModel(BuildEnvironment.class) }
-
-        when:
-        model.java.javaHome
-        then:
-        def ex = thrown(UnsupportedMethodException)
-        ex instanceof UnsupportedOperationException //backwards compatibility
-
-        when:
-        model.java.jvmArguments
-        then:
-        def e = thrown(UnsupportedMethodException)
-        e instanceof UnsupportedOperationException //backwards compatibility
-    }
-}
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/DaemonErrorFeedbackCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/DaemonErrorFeedbackCrossVersionSpec.groovy
index 151d34a2d249..22e7ce61403f 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/DaemonErrorFeedbackCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/DaemonErrorFeedbackCrossVersionSpec.groovy
@@ -17,13 +17,11 @@
 package org.gradle.integtests.tooling.m9
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.GradleConnectionException
 import spock.lang.Issue
 import spock.lang.Timeout
 
-@ToolingApiVersion('>=1.0-milestone-9')
 @TargetGradleVersion('>=1.0-milestone-9')
 class DaemonErrorFeedbackCrossVersionSpec extends ToolingApiSpecification {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/GradlePropertiesToolingApiCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/GradlePropertiesToolingApiCrossVersionSpec.groovy
index fa5672f5d887..db407d1c75b1 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/GradlePropertiesToolingApiCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/GradlePropertiesToolingApiCrossVersionSpec.groovy
@@ -20,11 +20,9 @@ import org.gradle.integtests.fixtures.AvailableJavaHomes
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.TextUtil
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.model.build.BuildEnvironment
 import spock.lang.IgnoreIf
 
-@ToolingApiVersion('>=1.0-milestone-9')
 @TargetGradleVersion('>=1.0-milestone-9')
 class GradlePropertiesToolingApiCrossVersionSpec extends ToolingApiSpecification {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/M9JavaConfigurabilityCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/M9JavaConfigurabilityCrossVersionSpec.groovy
index 94b183fdad3e..deaddef1cd41 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/M9JavaConfigurabilityCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/m9/M9JavaConfigurabilityCrossVersionSpec.groovy
@@ -20,16 +20,13 @@ import org.gradle.integtests.fixtures.AvailableJavaHomes
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.TextUtil
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.GradleConnectionException
 import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.build.BuildEnvironment
-import org.gradle.util.GradleVersion
 import spock.lang.IgnoreIf
 import spock.lang.Issue
 import spock.lang.Timeout
 
-@ToolingApiVersion('>=1.0-milestone-9')
 @TargetGradleVersion('>=1.0-milestone-9')
 class M9JavaConfigurabilityCrossVersionSpec extends ToolingApiSpecification {
 
@@ -109,7 +106,7 @@ class M9JavaConfigurabilityCrossVersionSpec extends ToolingApiSpecification {
     def "tooling api provided java home takes precedence over gradle.properties"() {
         File javaHome = AvailableJavaHomes.bestAlternative
         String javaHomePath = TextUtil.escapeString(javaHome.canonicalPath)
-        File otherJava = getOtherJava()
+        File otherJava = new File(System.getProperty("java.home"))
         String otherJavaPath = TextUtil.escapeString(otherJava.canonicalPath)
         file('build.gradle') << "assert new File(System.getProperty('java.home')).canonicalPath.startsWith('$javaHomePath')"
         file('gradle.properties') << "org.gradle.java.home=$otherJavaPath"
@@ -127,15 +124,4 @@ class M9JavaConfigurabilityCrossVersionSpec extends ToolingApiSpecification {
         env.java.javaHome == javaHome
         env.java.javaHome != otherJava
     }
-
-    // We use different ways of resolving JVM depending on the Gradle version
-    // this is necessary as we moved the Jvm class and dont ship the org.gradle.util.Jvm class with the
-    // toolingApi jar
-    File getOtherJava() {
-        if (GradleVersion.current().compareTo(GradleVersion.version("1.0-milestone-9")) > 0) {
-            return org.gradle.internal.jvm.Jvm.current().getJavaHome()
-        } else {
-            return org.gradle.util.Jvm.current().getJavaHome();
-        }
-    }
 }
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r10rc1/PassingCommandLineArgumentsCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r10rc1/PassingCommandLineArgumentsCrossVersionSpec.groovy
index 5252f14e92e2..95a3039dfe2f 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r10rc1/PassingCommandLineArgumentsCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r10rc1/PassingCommandLineArgumentsCrossVersionSpec.groovy
@@ -20,12 +20,10 @@ package org.gradle.integtests.tooling.r10rc1
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.ProjectConnection
 import org.gradle.tooling.exceptions.UnsupportedBuildArgumentException
 import org.gradle.tooling.model.GradleProject
 
-@ToolingApiVersion(">=1.0")
 @TargetGradleVersion(">=1.0")
 class PassingCommandLineArgumentsCrossVersionSpec extends ToolingApiSpecification {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/BuildInvocationsCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/BuildInvocationsCrossVersionSpec.groovy
index de6b15ad06f1..bbbf51789d16 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/BuildInvocationsCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/BuildInvocationsCrossVersionSpec.groovy
@@ -20,18 +20,15 @@ import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.BuildLauncher
-import org.gradle.tooling.UnknownModelException
 import org.gradle.tooling.exceptions.UnsupportedBuildArgumentException
-import org.gradle.tooling.model.GradleProject
-import org.gradle.tooling.model.GradleTask
-import org.gradle.tooling.model.Launchable
-import org.gradle.tooling.model.Task
-import org.gradle.tooling.model.TaskSelector
-import org.gradle.tooling.model.UnsupportedMethodException
+import org.gradle.tooling.model.*
 import org.gradle.tooling.model.gradle.BuildInvocations
 
 @ToolingApiVersion(">=1.12")
 class BuildInvocationsCrossVersionSpec extends ToolingApiSpecification {
+    def implicitTaskNames = ['dependencies', 'dependencyInsight', 'help', 'init', 'projects', 'properties', 'tasks', 'wrapper']
+    def nonRootImplicitTaskNames = ['dependencies', 'dependencyInsight', 'help', 'projects', 'properties', 'tasks']
+
     def setup() {
         settingsFile << '''
 include 'a'
@@ -102,21 +99,8 @@ project(':b:c') {
 
         then:
         result.result.assertTasksExecuted(':b:c:t1')
-
-        when:
-        BuildInvocations rootProjectSelectors = withConnection { connection ->
-            connection.action(new FetchTaskSelectorsBuildAction('test')).run() }
-        TaskSelector rootSelector = rootProjectSelectors.taskSelectors.find { it -> it.name == 't1'}
-        withBuild { BuildLauncher it ->
-            it.forLaunchables(selector, rootSelector)
-        }
-
-        then:
-        UnsupportedBuildArgumentException e = thrown()
-        e.message.contains('Problem with provided launchable arguments')
     }
 
-    @TargetGradleVersion(">=1.0-milestone-5")
     def "build task selectors from connection"() {
         when:
         toolingApi.isEmbedded = false // to load launchables using correct classloader in integTest
@@ -134,7 +118,6 @@ project(':b:c') {
         result.result.assertTasksExecuted(':t1', ':b:c:t1')
     }
 
-    @TargetGradleVersion(">=1.0-milestone-5")
     def "build task selectors from connection in specified order"() {
         when:
         toolingApi.isEmbedded = false // to load launchables using correct classloader in integTest
@@ -157,7 +140,6 @@ project(':b:c') {
         result.result.assertTasksExecuted(':b:t2', ':b:c:t2', ':t1', ':b:c:t1')
     }
 
-    @TargetGradleVersion(">=1.0-milestone-5")
     def "can request task selectors for project"() {
         given:
         BuildInvocations model = withConnection { connection ->
@@ -172,34 +154,55 @@ project(':b:c') {
         selectors*.name as Set == ['t1', 't2', 't3'] as Set
     }
 
-    @TargetGradleVersion("<1.0-milestone-5")
-    def "cannot request BuildInvocations for old project"() {
+    @TargetGradleVersion("=1.12")
+    def "get tasks for projects"() {
         when:
-        withConnection { connection ->
-            connection.getModel(BuildInvocations)
+        List<Task> tasks = withConnection { connection ->
+            connection.action(new FetchTasksBuildAction(':b')).run()
         }
 
         then:
-        UnknownModelException e = thrown()
-        e.message.contains('does not support building a model of type \'' + BuildInvocations.simpleName + '\'')
+        tasks.size() == 2
+        tasks*.name as Set == ['t2', 't3'] as Set
+
+        when:
+        tasks[0].project
+        then:
+        UnsupportedMethodException e = thrown()
+        e != null
     }
 
-    @TargetGradleVersion(">=1.12")
-    def "get tasks for projects"() {
+    @TargetGradleVersion(">=2.0")
+    def "get tasks including implicit for projects"() {
         when:
         List<Task> tasks = withConnection { connection ->
             connection.action(new FetchTasksBuildAction(':b')).run()
         }
 
         then:
-        tasks.size() == 2
-        tasks*.name as Set == ['t2', 't3'] as Set
+        tasks.size() == 2 + nonRootImplicitTaskNames.size()
+        tasks*.name as Set == (['t2', 't3'] + nonRootImplicitTaskNames) as Set
 
         when:
         tasks[0].project
         then:
         UnsupportedMethodException e = thrown()
         e != null
+
+        when:
+        tasks = withConnection { connection ->
+            connection.action(new FetchTasksBuildAction(':')).run()
+        }
+
+        then:
+        tasks.size() == 1 + implicitTaskNames.size()
+        tasks*.name as Set == (['t1'] + implicitTaskNames) as Set
+
+        when:
+        tasks[0].project
+        then:
+        e = thrown()
+        e != null
     }
 
     @TargetGradleVersion(">=1.12")
@@ -219,7 +222,6 @@ project(':b:c') {
         result.result.assertTaskNotExecuted(':b:c:t2')
     }
 
-    @TargetGradleVersion(">=1.0-milestone-5")
     def "build task from connection as Launchable"() {
         when:
         toolingApi.isEmbedded = false // to load launchables using correct classloader in integTest
@@ -237,7 +239,6 @@ project(':b:c') {
         result.result.assertTasksExecuted(':t1')
     }
 
-    @TargetGradleVersion(">=1.0-milestone-5")
     def "build tasks Launchables in order"() {
         when:
         toolingApi.isEmbedded = false // to load launchables using correct classloader in integTest
@@ -281,7 +282,6 @@ project(':b:c') {
         result.result.assertTasksExecuted(':b:c:t1', ':b:t3', ':t1')
     }
 
-    @TargetGradleVersion(">=1.0-milestone-5")
     def "build tasks and selectors in order cross version"() {
         when:
         toolingApi.isEmbedded = false // to load launchables using correct classloader in integTest
@@ -302,10 +302,9 @@ project(':b:c') {
         result.result.assertTasksExecuted(':t1', ':b:c:t1', ':b:t2', ':b:c:t2')
     }
 
-    @TargetGradleVersion(">=1.12")
+    @TargetGradleVersion("=1.12")
     def "build fails with selectors from different projects"() {
         when:
-        toolingApi.isEmbedded = false // to load launchables using correct classloader in integTest
         BuildInvocations rootSelectors = withConnection { connection ->
             connection.action(new FetchTaskSelectorsBuildAction('test')).run()
         }
@@ -323,7 +322,27 @@ project(':b:c') {
         e.message.contains 'Only selector from the same Gradle project can be built.'
     }
 
-    @TargetGradleVersion(">=1.0-milestone-5")
+    @TargetGradleVersion(">=2.0")
+    def "builds selectors from different projects"() {
+        when:
+        toolingApi.isEmbedded = false // to load launchables using correct classloader in integTest
+        BuildInvocations rootSelectors = withConnection { connection ->
+            connection.action(new FetchTaskSelectorsBuildAction('test')).run()
+        }
+        BuildInvocations bSelectors = withConnection { connection ->
+            connection.action(new FetchTaskSelectorsBuildAction('b')).run()
+        }
+        TaskSelector selectorT1 = rootSelectors.taskSelectors.find { it.name == 't1' }
+        TaskSelector selectorBT1 = bSelectors.taskSelectors.find { it.name == 't1' }
+        TaskSelector selectorBT3 = bSelectors.taskSelectors.find { it.name == 't3' }
+        def result = withBuild { BuildLauncher it ->
+            it.forLaunchables(selectorBT1, selectorBT3, selectorT1)
+        }
+        then:
+        result.result.assertTasksExecuted(':b:c:t1', ':b:t3', ':t1')
+    }
+
+    @TargetGradleVersion(">=1.0-milestone-8")
     def "can request tasks for root project"() {
         // TODO make sure it is for root project if default project is different
 
@@ -333,10 +352,10 @@ project(':b:c') {
         }
 
         expect:
-        model.tasks.count { it.name != 'setupBuild' } == 1
+        model.tasks.count { it.name != 'setupBuild' && !implicitTaskNames.contains(it.name) } == 1
 
         when:
-        def task = model.tasks.find { Task it -> it.name != 'setupBuild' }
+        def task = model.tasks.find { Task it -> it.name != 'setupBuild' && !implicitTaskNames.contains(it.name) }
 
         then:
         task.name == 't1'
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/PublicationsCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/PublicationsCrossVersionSpec.groovy
index 90fae773ee21..c9617070eada 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/PublicationsCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/PublicationsCrossVersionSpec.groovy
@@ -25,6 +25,16 @@ import org.gradle.tooling.model.gradle.ProjectPublications
 @ToolingApiVersion('>=1.12')
 @TargetGradleVersion('>=1.12')
 class PublicationsCrossVersionSpec extends ToolingApiSpecification {
+    def "empty project"() {
+        when:
+        ProjectPublications publications = withConnection { connection ->
+            connection.getModel(ProjectPublications)
+        }
+
+        then:
+        publications.publications.empty
+    }
+
     def "project without any configured publications"() {
         buildFile << "apply plugin: 'java'"
 
@@ -48,7 +58,7 @@ group = "test.group"
 
 uploadArchives {
     repositories {
-        ivy { url uri("\$buildDir/ivy-repo") }
+        ivy { url uri("ivy-repo") }
     }
 }
 """
@@ -79,7 +89,7 @@ group = "test.group"
 uploadArchives {
     repositories {
         mavenDeployer {
-            repository(url: uri("\$buildDir/maven-repo"))
+            repository(url: uri("maven-repo"))
         }
     }
 }
@@ -111,7 +121,7 @@ group = "test.group"
 uploadArchives {
     repositories {
         mavenDeployer {
-            repository(url: uri("\$buildDir/maven-repo"))
+            repository(url: uri("maven-repo"))
             pom.groupId = "test.groupId"
             pom.artifactId = "test.artifactId"
             pom.version = "1.1"
@@ -147,8 +157,8 @@ group = "test.group"
 
 publishing {
     repositories {
-        ivy { url uri("\$buildDir/ivy-repo") }
-        maven { url uri("\$buildDir/maven-repo") }
+        ivy { url uri("ivy-repo") }
+        maven { url uri("maven-repo") }
     }
     publications {
         mainIvy(IvyPublication) {
@@ -188,7 +198,7 @@ publishing {
         pub2.id.version == "1.2"
     }
 
-    @TargetGradleVersion('<1.12')
+    @TargetGradleVersion('>=1.0-milestone-8 <1.12')
     def "decent error message for Gradle version that doesn't expose publications"() {
         when:
         ProjectPublications publications = withConnection { connection ->
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TaskDisplayNameCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TaskDisplayNameCrossVersionSpec.groovy
index bf9c62d959b3..724a517f5030 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TaskDisplayNameCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TaskDisplayNameCrossVersionSpec.groovy
@@ -15,14 +15,12 @@
  */
 package org.gradle.integtests.tooling.r112
 
-import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.model.GradleProject
 
 @ToolingApiVersion('>=1.12')
 class TaskDisplayNameCrossVersionSpec extends ToolingApiSpecification {
-    @TargetGradleVersion('>=1.0-milestone-5') // Task.path is broken on 1.0-m3
     def "can get task's display name"() {
         file('build.gradle') << '''
 task a
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TestFilteringCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TestFilteringCrossVersionSpec.groovy
index d74d8292f04d..e14ff66c3385 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TestFilteringCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/TestFilteringCrossVersionSpec.groovy
@@ -17,10 +17,8 @@ package org.gradle.integtests.tooling.r112
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import spock.lang.Issue
 
-@ToolingApiVersion(">=1.0")
 @TargetGradleVersion(">=1.10")
 class TestFilteringCrossVersionSpec extends ToolingApiSpecification {
     @Issue("GRADLE-2972")
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/ToolingApiDeprecationsCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/ToolingApiDeprecationsCrossVersionSpec.groovy
index 9758f89d38a7..e03cfe85c75e 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/ToolingApiDeprecationsCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r112/ToolingApiDeprecationsCrossVersionSpec.groovy
@@ -19,11 +19,18 @@ package org.gradle.integtests.tooling.r112
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.integtests.tooling.fixture.ToolingApiVersion
+import org.gradle.tooling.GradleConnectionException
 import org.gradle.tooling.ProjectConnection
+import org.gradle.tooling.UnsupportedVersionException
 import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.eclipse.EclipseProject
 
+import java.util.regex.Pattern
+
 class ToolingApiDeprecationsCrossVersionSpec extends ToolingApiSpecification {
+    private static final Pattern REGEXP_UNSUPPORTED_CONNECTION = Pattern.compile(
+            'Connection to the specified Gradle installation \'.*\' is not supported in this version of tooling API. Update your tooling API provider to version newer than 1.0-milestone-8.')
+
     def setup() {
         file("build.gradle") << """
 task noop << {
@@ -34,7 +41,7 @@ task noop << {
 
     @ToolingApiVersion(">=1.12")
     @TargetGradleVersion("<1.0-milestone-8")
-    def "build shows deprecation warning for pre 1.0m8 providers"() {
+    def "build rejected for pre 1.0m8 providers"() {
         when:
         def output = new ByteArrayOutputStream()
         withConnection { ProjectConnection connection ->
@@ -45,12 +52,13 @@ task noop << {
         }
 
         then:
-        output.toString().contains(deprecationMessageProvider(targetDist.version.version))
+        UnsupportedVersionException e = thrown()
+        REGEXP_UNSUPPORTED_CONNECTION.matcher(e.message).matches()
     }
 
     @ToolingApiVersion(">=1.12")
     @TargetGradleVersion("<1.0-milestone-8")
-    def "model retrieving shows deprecation warning for pre 1.0m8 providers"() {
+    def "model retrieving fails for pre 1.0m8 providers"() {
         when:
         def output = new ByteArrayOutputStream()
         withConnection { ProjectConnection connection ->
@@ -60,7 +68,8 @@ task noop << {
         }
 
         then:
-        output.toString().contains(deprecationMessageProvider(targetDist.version.version))
+        UnsupportedVersionException e = thrown()
+        REGEXP_UNSUPPORTED_CONNECTION.matcher(e.message).matches()
     }
 
     @ToolingApiVersion(">=1.12")
@@ -100,7 +109,7 @@ task noop << {
 
     @ToolingApiVersion("<1.2")
     @TargetGradleVersion(">=1.12")
-    def "provider shows deprecation warning when build is requested by old toolingApi"() {
+    def "provider rejects build request from old toolingApi (pre 1.2)"() {
         when:
         def output = new ByteArrayOutputStream()
         withConnection { ProjectConnection connection ->
@@ -111,7 +120,8 @@ task noop << {
         }
 
         then:
-        output.toString().contains(deprecationMessageApi(targetDist.version.version))
+        GradleConnectionException e = thrown()
+        e.cause.message.contains('Consumers using version older than 1.2 are not supported.')
     }
 
     @ToolingApiVersion(">=1.2")
@@ -132,7 +142,7 @@ task noop << {
 
     @ToolingApiVersion("<1.2")
     @TargetGradleVersion(">=1.12")
-    def "provider shows deprecation warning when model is requested by old toolingApi"() {
+    def "provider rejects model request from old toolingApi"() {
         when:
         def output = new ByteArrayOutputStream()
         withConnection { ProjectConnection connection ->
@@ -142,7 +152,9 @@ task noop << {
         }
 
         then:
-        output.toString().contains(deprecationMessageApi(targetDist.version.version))
+        GradleConnectionException e = thrown()
+        e.cause.message.contains('Consumers using version older than 1.2 are not supported.')
+        // TODO cause is UnsupportedVersionException?
     }
 
     @ToolingApiVersion(">=1.2")
@@ -161,7 +173,7 @@ task noop << {
     }
 
     def deprecationMessageApi(def version) {
-        "Connection from tooling API older than version 1.2 has been deprecated and is scheduled to be removed in Gradle 2.0"
+        "Connection from tooling API older than version 1.2 has been deprecated and is scheduled to be removed in Gradle"
     }
 
 }
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r11rc1/DependencyMetaDataCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r11rc1/DependencyMetaDataCrossVersionSpec.groovy
index 9997424eb267..7a3cf7385e1a 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r11rc1/DependencyMetaDataCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r11rc1/DependencyMetaDataCrossVersionSpec.groovy
@@ -17,13 +17,11 @@ package org.gradle.integtests.tooling.r11rc1
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.test.fixtures.maven.MavenFileRepository
 import org.gradle.tooling.model.ExternalDependency
 import org.gradle.tooling.model.eclipse.EclipseProject
 import org.gradle.tooling.model.idea.IdeaProject
 
-@ToolingApiVersion('>=1.1')
 @TargetGradleVersion('>=1.1')
 class DependencyMetaDataCrossVersionSpec extends ToolingApiSpecification {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/BuildModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/BuildModelCrossVersionSpec.groovy
index eb314c23c3a5..d66647cdfc78 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/BuildModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/BuildModelCrossVersionSpec.groovy
@@ -17,12 +17,10 @@
 package org.gradle.integtests.tooling.r12rc1
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import org.gradle.tooling.ProjectConnection
 import org.gradle.tooling.model.eclipse.HierarchicalEclipseProject
 
-@ToolingApiVersion(">=1.2")
 @TargetGradleVersion(">=1.2")
 class BuildModelCrossVersionSpec extends ToolingApiSpecification {
     def "can run tasks before building Eclipse model"() {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/ProjectOutcomesModuleCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/ProjectOutcomesModuleCrossVersionSpec.groovy
index 86f58a7652b2..e954a6048f37 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/ProjectOutcomesModuleCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/ProjectOutcomesModuleCrossVersionSpec.groovy
@@ -18,11 +18,9 @@ package org.gradle.integtests.tooling.r12rc1
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.ProjectConnection
 import org.gradle.tooling.model.internal.outcomes.ProjectOutcomes
 
-@ToolingApiVersion(">=1.2")
 @TargetGradleVersion(">=1.2")
 class ProjectOutcomesModuleCrossVersionSpec extends ToolingApiSpecification {
     def "modelContainsAllArchivesOnTheArchivesConfiguration"() {
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/UnsupportedOperationFeedbackCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/UnsupportedOperationFeedbackCrossVersionSpec.groovy
index 9c5ed54e5955..b02cf8c6feb5 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/UnsupportedOperationFeedbackCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r12rc1/UnsupportedOperationFeedbackCrossVersionSpec.groovy
@@ -18,13 +18,11 @@ package org.gradle.integtests.tooling.r12rc1
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.ProjectConnection
 import org.gradle.tooling.exceptions.UnsupportedOperationConfigurationException
 import org.gradle.tooling.model.eclipse.EclipseProject
 
-@ToolingApiVersion(">=1.2")
-@TargetGradleVersion("<=1.1")
+@TargetGradleVersion(">=1.0-milestone-8 <=1.1")
 class UnsupportedOperationFeedbackCrossVersionSpec extends ToolingApiSpecification {
     def "fails when attempting to run tasks when building a model"() {
         when:
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r15/CombiningCommandLineArgumentsCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r15/CombiningCommandLineArgumentsCrossVersionSpec.groovy
index 9393c5b00d83..8fe7bc4fa159 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r15/CombiningCommandLineArgumentsCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r15/CombiningCommandLineArgumentsCrossVersionSpec.groovy
@@ -21,11 +21,9 @@
 package org.gradle.integtests.tooling.r15
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
 import spock.lang.Issue
 
-@ToolingApiVersion(">=1.0")
 @TargetGradleVersion(">=1.5")
 class CombiningCommandLineArgumentsCrossVersionSpec extends ToolingApiSpecification {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r15/ToolingApiConfigurationOnDemandCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r15/ToolingApiConfigurationOnDemandCrossVersionSpec.groovy
index 661fe84340b0..63ed4c8a469e 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r15/ToolingApiConfigurationOnDemandCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r15/ToolingApiConfigurationOnDemandCrossVersionSpec.groovy
@@ -20,10 +20,8 @@ package org.gradle.integtests.tooling.r15
 
 import org.gradle.integtests.tooling.fixture.TargetGradleVersion
 import org.gradle.integtests.tooling.fixture.ToolingApiSpecification
-import org.gradle.integtests.tooling.fixture.ToolingApiVersion
 import org.gradle.tooling.model.GradleProject
 
-@ToolingApiVersion(">=1.0-milestone-5") //because we acquire GradleProject model
 @TargetGradleVersion(">=1.5")
 class ToolingApiConfigurationOnDemandCrossVersionSpec extends ToolingApiSpecification {
 
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r16/UnknownCustomModelFeedbackCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r16/UnknownCustomModelFeedbackCrossVersionSpec.groovy
index 69c4cc3a7396..8dae5905eff0 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r16/UnknownCustomModelFeedbackCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r16/UnknownCustomModelFeedbackCrossVersionSpec.groovy
@@ -35,7 +35,7 @@ class UnknownCustomModelFeedbackCrossVersionSpec extends ToolingApiSpecification
     }
 
     @ToolingApiVersion("current")
-    @TargetGradleVersion("<1.6")
+    @TargetGradleVersion(">=1.0-milestone-8 <1.6")
     def "fails gracefully when unknown model requested when custom models are not supported by the target version"() {
         when:
         withConnection { it.getModel(CustomModel.class) }
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildActionCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildActionCrossVersionSpec.groovy
index 7417a1356ac7..34125c35670c 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildActionCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildActionCrossVersionSpec.groovy
@@ -92,7 +92,7 @@ class BuildActionCrossVersionSpec extends ToolingApiSpecification {
     }
 
     @ToolingApiVersion('current')
-    @TargetGradleVersion('<1.8')
+    @TargetGradleVersion('>=1.0-milestone-8 <1.8')
     def "gives reasonable error message when target Gradle version does not support build actions"() {
         when:
         withConnection { it.action(new FetchCustomModel()).run() }
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildScriptModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildScriptModelCrossVersionSpec.groovy
index d9b4da8a25ea..2c47412b168e 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildScriptModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/BuildScriptModelCrossVersionSpec.groovy
@@ -44,8 +44,7 @@ class BuildScriptModelCrossVersionSpec extends ToolingApiSpecification {
         project.buildScript.sourceFile == custom
     }
 
-    @ToolingApiVersion('current')
-    @TargetGradleVersion('<1.8 >=1.0-milestone-5')
+    @TargetGradleVersion('<1.8 >=1.0-milestone-8')
     def "gives reasonable error message when target Gradle version does not provide build script details"() {
         when:
         GradleProject project = withConnection { it.getModel(GradleProject.class) }
@@ -71,24 +70,4 @@ class BuildScriptModelCrossVersionSpec extends ToolingApiSpecification {
         e = thrown()
         e.message.startsWith('Unsupported method: GradleProject.getBuildScript().')
     }
-
-    @ToolingApiVersion('current')
-    @TargetGradleVersion('<1.0-milestone-5')
-    def "gives reasonable error message when build script details not available via Eclipse model"() {
-        when:
-        GradleProject project = withConnection { it.getModel(GradleProject.class) }
-        project.buildScript
-
-        then:
-        UnsupportedMethodException e = thrown()
-        e.message.startsWith('Unsupported method: GradleProject.getBuildScript().')
-
-        when:
-        EclipseProject eclipseProject = withConnection { it.getModel(EclipseProject.class) }
-        eclipseProject.gradleProject.buildScript
-
-        then:
-        e = thrown()
-        e.message.startsWith('Unsupported method: GradleProject.getBuildScript().')
-    }
 }
diff --git a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/GradleBuildModelCrossVersionSpec.groovy b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/GradleBuildModelCrossVersionSpec.groovy
index bfbf92a0c503..497bcf2a5bd7 100644
--- a/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/GradleBuildModelCrossVersionSpec.groovy
+++ b/subprojects/tooling-api/src/integTest/groovy/org/gradle/integtests/tooling/r18/GradleBuildModelCrossVersionSpec.groovy
@@ -39,7 +39,7 @@ allprojects {
 """
     }
 
-    @TargetGradleVersion("<1.8")
+    @TargetGradleVersion(">=1.0-milestone-8 <1.8")
     def "can request GradleBuild model"() {
         when:
         GradleBuild model = withConnection { connection -> connection.getModel(GradleBuild) }
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultBuildLauncher.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultBuildLauncher.java
index aa365da8cd82..d4c1d6344a83 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultBuildLauncher.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/DefaultBuildLauncher.java
@@ -15,28 +15,19 @@
  */
 package org.gradle.tooling.internal.consumer;
 
-import com.google.common.collect.Lists;
-import org.gradle.api.GradleException;
 import org.gradle.tooling.BuildLauncher;
 import org.gradle.tooling.ResultHandler;
-import org.gradle.tooling.internal.adapter.ProtocolToModelAdapter;
 import org.gradle.tooling.internal.consumer.async.AsyncConsumerActionExecutor;
 import org.gradle.tooling.internal.consumer.connection.ConsumerAction;
 import org.gradle.tooling.internal.consumer.connection.ConsumerConnection;
 import org.gradle.tooling.internal.consumer.parameters.ConsumerOperationParameters;
-import org.gradle.tooling.internal.gradle.TaskListingLaunchable;
-import org.gradle.tooling.internal.protocol.InternalLaunchable;
 import org.gradle.tooling.model.Launchable;
 import org.gradle.tooling.model.Task;
-import org.gradle.tooling.model.TaskSelector;
 
-import java.lang.reflect.Proxy;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 
 class DefaultBuildLauncher extends AbstractLongRunningOperation<DefaultBuildLauncher> implements BuildLauncher {
     private final AsyncConsumerActionExecutor connection;
@@ -76,38 +67,10 @@ public BuildLauncher forLaunchables(Launchable... launchables) {
     }
 
     public BuildLauncher forLaunchables(Iterable<? extends Launchable> launchables) {
-        Set<String> taskPaths = new LinkedHashSet<String>();
-        List<InternalLaunchable> launchablesParams = Lists.newArrayList();
-        for (Launchable launchable : launchables) {
-            if (launchable instanceof Task) {
-                taskPaths.add(((Task) launchable).getPath());
-            } else if (launchable instanceof TaskListingLaunchable) {
-                taskPaths.addAll(((TaskListingLaunchable) launchable).getTaskNames());
-            } else if (!(launchable instanceof TaskSelector)) {
-                throw new GradleException("Only Task or TaskSelector instances are supported: "
-                        + (launchable != null ? launchable.getClass() : "null"));
-            }
-            maybeAddLaunchableParameter(launchablesParams, launchable);
-        }
-        operationParamsBuilder.setTasks(new ArrayList<String>(taskPaths));
-        operationParamsBuilder.setLaunchables(launchablesParams);
+        operationParamsBuilder.setLaunchables(launchables);
         return this;
     }
 
-    private void maybeAddLaunchableParameter(List<InternalLaunchable> launchablesParams, Launchable launchable) {
-        Object original = launchable;
-        try {
-            if (Proxy.isProxyClass(launchable.getClass())) {
-                original = new ProtocolToModelAdapter().unpack(launchable);
-            }
-        } catch (IllegalArgumentException iae) {
-            // ignore: launchable created on consumer side for older provider
-        }
-        if (original instanceof InternalLaunchable) {
-            launchablesParams.add((InternalLaunchable) original);
-        }
-    }
-
     public void run() {
         BlockingResultHandler<Void> handler = new BlockingResultHandler<Void>(Void.class);
         run(handler);
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnection.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnection.java
index c7549d627f34..8e5037d56f2d 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnection.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnection.java
@@ -16,160 +16,52 @@
 
 package org.gradle.tooling.internal.consumer.connection;
 
-import org.gradle.api.Action;
-import org.gradle.internal.Actions;
+import org.gradle.tooling.BuildAction;
+import org.gradle.tooling.UnsupportedVersionException;
 import org.gradle.tooling.internal.adapter.ProtocolToModelAdapter;
-import org.gradle.tooling.internal.adapter.SourceObjectMapping;
 import org.gradle.tooling.internal.build.VersionOnlyBuildEnvironment;
-import org.gradle.tooling.internal.consumer.converters.GradleProjectConverter;
-import org.gradle.tooling.internal.consumer.converters.PropertyHandlerFactory;
-import org.gradle.tooling.internal.consumer.converters.TaskPropertyHandlerFactory;
+import org.gradle.tooling.internal.consumer.Distribution;
 import org.gradle.tooling.internal.consumer.parameters.ConsumerOperationParameters;
-import org.gradle.tooling.internal.consumer.versioning.ModelMapping;
-import org.gradle.tooling.internal.consumer.versioning.VersionDetails;
 import org.gradle.tooling.internal.protocol.ConnectionVersion4;
-import org.gradle.tooling.internal.protocol.ProjectVersion3;
-import org.gradle.tooling.internal.protocol.eclipse.EclipseProjectVersion3;
-import org.gradle.tooling.model.GradleProject;
 import org.gradle.tooling.model.build.BuildEnvironment;
-import org.gradle.tooling.model.eclipse.EclipseProject;
-import org.gradle.tooling.model.eclipse.HierarchicalEclipseProject;
-import org.gradle.tooling.model.idea.BasicIdeaProject;
-import org.gradle.tooling.model.idea.IdeaProject;
-import org.gradle.tooling.model.internal.Exceptions;
-import org.gradle.util.GradleVersion;
-
-import java.io.IOException;
-import java.io.OutputStream;
 
 /**
- * An adapter that wraps a {@link ConnectionVersion4} based provider.
+ * An adapter for unsupported connection using a {@code ConnectionVersion4} based provider.
  */
-public class ConnectionVersion4BackedConsumerConnection extends AbstractPre12ConsumerConnection {
-    private final ModelProducer modelProducer;
-
-    public ConnectionVersion4BackedConsumerConnection(ConnectionVersion4 delegate, ModelMapping modelMapping, ProtocolToModelAdapter adapter) {
-        super(delegate, getMetaData(delegate), adapter);
-        ModelProducer consumerConnectionBackedModelProducer = new ConnectionVersion4BackedModelProducer(adapter, getVersionDetails(), modelMapping, delegate);
-        ModelProducer gradleProjectAdapterProducer = new GradleProjectAdapterProducer(adapter, getVersionDetails(), modelMapping, consumerConnectionBackedModelProducer);
-        ModelProducer producerWithGradleBuild = new GradleBuildAdapterProducer(adapter, getVersionDetails(), modelMapping, gradleProjectAdapterProducer);
-        modelProducer = new BuildInvocationsAdapterProducer(adapter, getVersionDetails(), modelMapping, producerWithGradleBuild);
+public class ConnectionVersion4BackedConsumerConnection implements ConsumerConnection {
+    private final Distribution distribution;
+    private final ProtocolToModelAdapter adapter;
+    private final String version;
+
+    public ConnectionVersion4BackedConsumerConnection(Distribution distribution, ConnectionVersion4 delegate, ProtocolToModelAdapter adapter) {
+        this.distribution = distribution;
+        this.adapter = adapter;
+        version = delegate.getMetaData().getVersion();
     }
 
-    private static VersionDetails getMetaData(final ConnectionVersion4 delegate) {
-        GradleVersion version = GradleVersion.version(delegate.getMetaData().getVersion());
-        if (version.compareTo(GradleVersion.version("1.0-milestone-5")) < 0) {
-            return new R10M3VersionDetails(delegate);
-        } else {
-            return new R10M5VersionDetails(delegate);
-        }
+    public void stop() {
     }
 
-    @Override
-    public <T> T run(Class<T> type, ConsumerOperationParameters operationParameters) throws UnsupportedOperationException, IllegalStateException {
-        VersionDetails versionDetails = getVersionDetails();
-        if (operationParameters.getJavaHome() != null) {
-            throw Exceptions.unsupportedOperationConfiguration("modelBuilder.setJavaHome() and buildLauncher.setJavaHome()", versionDetails.getVersion());
-        }
-        if (operationParameters.getJvmArguments() != null) {
-            throw Exceptions.unsupportedOperationConfiguration("modelBuilder.setJvmArguments() and buildLauncher.setJvmArguments()", versionDetails.getVersion());
-        }
-        if (operationParameters.getStandardInput() != null) {
-            throw Exceptions.unsupportedOperationConfiguration("modelBuilder.setStandardInput() and buildLauncher.setStandardInput()", versionDetails.getVersion());
-        }
-        OutputStream out = operationParameters.getStandardOutput();
-        if (out != null) {
-            try {
-                String deprecationMessage = String.format("Connecting to Gradle version %s from the Gradle tooling API has been deprecated and is scheduled to be removed in version 2.0 of the Gradle tooling API%n", versionDetails.getVersion());
-                out.write(deprecationMessage.getBytes());
-            } catch (IOException e) {
-                throw new RuntimeException("Cannot write to stream", e);
-            }
-        }
-        return super.run(type, operationParameters);
-    }
-
-    @Override
-    protected <T> T doGetModel(Class<T> modelType, ConsumerOperationParameters operationParameters) {
-        return modelProducer.produceModel(modelType, operationParameters);
+    public String getDisplayName() {
+        return distribution.getDisplayName();
     }
 
-    private static class R10M3VersionDetails extends VersionDetails {
-        public R10M3VersionDetails(ConnectionVersion4 delegate) {
-            super(delegate.getMetaData().getVersion());
-        }
-
-        @Override
-        public boolean maySupportModel(Class<?> modelType) {
-            return modelType.equals(HierarchicalEclipseProject.class) || modelType.equals(EclipseProjectVersion3.class) || modelType.equals(EclipseProject.class) || modelType.equals(Void.class);
+    public <T> T run(Class<T> type, ConsumerOperationParameters operationParameters) throws UnsupportedOperationException, IllegalStateException {
+        if (type.equals(BuildEnvironment.class)) {
+            return adapter.adapt(type, doGetBuildEnvironment());
         }
+        throw fail();
     }
 
-    private static class R10M5VersionDetails extends VersionDetails {
-        public R10M5VersionDetails(ConnectionVersion4 delegate) {
-            super(delegate.getMetaData().getVersion());
-        }
-
-        @Override
-        public boolean supportsGradleProjectModel() {
-            return true;
-        }
-
-        @Override
-        public boolean maySupportModel(Class<?> modelType) {
-            return modelType.equals(HierarchicalEclipseProject.class)
-                    || modelType.equals(EclipseProject.class)
-                    || modelType.equals(IdeaProject.class)
-                    || modelType.equals(BasicIdeaProject.class)
-                    || modelType.equals(GradleProject.class)
-                    || modelType.equals(Void.class);
-        }
+    private Object doGetBuildEnvironment() {
+        return new VersionOnlyBuildEnvironment(version);
     }
 
-    private class ConnectionVersion4BackedModelProducer extends AbstractModelProducer {
-        private final ConnectionVersion4 delegate;
-        private final Action<SourceObjectMapping> mapper;
-
-        public ConnectionVersion4BackedModelProducer(ProtocolToModelAdapter adapter, VersionDetails versionDetails, ModelMapping modelMapping, ConnectionVersion4 delegate) {
-            super(adapter, versionDetails, modelMapping);
-            this.delegate = delegate;
-            mapper = Actions.composite(
-                    new PropertyHandlerFactory().forVersion(versionDetails),
-                    new TaskPropertyHandlerFactory().forVersion(versionDetails));
-        }
-
-        public <T> T produceModel(Class<T> modelType, ConsumerOperationParameters operationParameters) {
-            if (modelType == BuildEnvironment.class && !versionDetails.maySupportModel(BuildEnvironment.class)) {
-                //early versions of provider do not support BuildEnvironment model
-                //since we know the gradle version at least we can give back some result
-                return adapter.adapt(modelType, new VersionOnlyBuildEnvironment(versionDetails.getVersion()), mapper);
-            }
-            if (!versionDetails.maySupportModel(modelType)) {
-                //don't bother asking the provider for this model
-                throw Exceptions.unsupportedModel(modelType, versionDetails.getVersion());
-            }
-            Class<? extends ProjectVersion3> protocolType = modelMapping.getProtocolType(modelType).asSubclass(ProjectVersion3.class);
-            final ProjectVersion3 model = delegate.getModel(protocolType, operationParameters);
-            return adapter.adapt(modelType, model, mapper);
-        }
+    public <T> T run(BuildAction<T> action, ConsumerOperationParameters operationParameters) throws UnsupportedOperationException, IllegalStateException {
+        throw fail();
     }
 
-    private class GradleProjectAdapterProducer extends AbstractModelProducer {
-        private final ModelProducer delegate;
-
-        public GradleProjectAdapterProducer(ProtocolToModelAdapter adapter, VersionDetails versionDetails, ModelMapping modelMapping, ModelProducer delegate) {
-            super(adapter, versionDetails, modelMapping);
-            this.delegate = delegate;
-        }
-
-        public <T> T produceModel(Class<T> modelType, ConsumerOperationParameters operationParameters) {
-            if (modelType == GradleProject.class && !versionDetails.maySupportModel(GradleProject.class)) {
-                //we broke compatibility around M9 wrt getting the tasks of a project (issue GRADLE-1875)
-                //this patch enables getting gradle tasks for target gradle version pre M5
-                EclipseProjectVersion3 project = delegate.produceModel(EclipseProjectVersion3.class, operationParameters);
-                return adapter.adapt(modelType, new GradleProjectConverter().convert(project));
-            }
-            return delegate.produceModel(modelType, operationParameters);
-        }
+    private UnsupportedVersionException fail() {
+        return new UnsupportedVersionException(String.format("Connection to the specified %s is not supported in this version of tooling API. Update your tooling API provider to version newer than 1.0-milestone-8.", distribution.getDisplayName()));
     }
 }
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/BuildInvocationsConverter.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/BuildInvocationsConverter.java
index cfeacd9fadb7..50ae756e1b8b 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/BuildInvocationsConverter.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/BuildInvocationsConverter.java
@@ -16,9 +16,7 @@
 
 package org.gradle.tooling.internal.consumer.converters;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Iterators;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
@@ -28,7 +26,6 @@
 import org.gradle.tooling.model.GradleProject;
 import org.gradle.tooling.model.GradleTask;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.SortedSet;
 
@@ -41,20 +38,14 @@ public DefaultBuildInvocations<DefaultGradleTask> convert(GradleProject project)
         List<BasicGradleTaskSelector> selectors = buildRecursively(rootProject);
         return new DefaultBuildInvocations<DefaultGradleTask>()
                 .setSelectors(selectors)
-                .setTasks(convertTasks(rootProject.getTasks().iterator()));
+                .setTasks(convertTasks(rootProject.getTasks()));
     }
 
     private List<BasicGradleTaskSelector> buildRecursively(GradleProject project) {
         Multimap<String, String> aggregatedTasks = ArrayListMultimap.create();
-        for (GradleProject childProject : project.getChildren()) {
-            List<BasicGradleTaskSelector> childSelectors = buildRecursively(childProject);
-            for (BasicGradleTaskSelector childSelector : childSelectors) {
-                aggregatedTasks.putAll(childSelector.getName(), childSelector.getTaskNames());
-            }
-        }
-        for (GradleTask task : project.getTasks()) {
-            aggregatedTasks.put(task.getName(), task.getPath());
-        }
+
+        collectTasks(project, aggregatedTasks);
+
         List<BasicGradleTaskSelector> selectors = Lists.newArrayList();
         for (String selectorName : aggregatedTasks.keySet()) {
             SortedSet<String> selectorTasks = Sets.newTreeSet(new TaskNameComparator());
@@ -70,17 +61,23 @@ private List<BasicGradleTaskSelector> buildRecursively(GradleProject project) {
         return selectors;
     }
 
-    private List<DefaultGradleTask> convertTasks(Iterator<? extends GradleTask> tasks) {
-        return Lists.newArrayList(Iterators.transform(
-                tasks,
-                new Function<GradleTask, DefaultGradleTask>() {
-                    public DefaultGradleTask apply(GradleTask task) {
-                        return new DefaultGradleTask()
-                                .setName(task.getName())
-                                .setPath(task.getPath())
-                                .setDescription(task.getDescription());
-                    }
-                }
-        ));
+    private void collectTasks(GradleProject project, Multimap<String, String> aggregatedTasks) {
+        for (GradleProject childProject : project.getChildren()) {
+            collectTasks(childProject, aggregatedTasks);
+        }
+        for (GradleTask task : project.getTasks()) {
+            aggregatedTasks.put(task.getName(), task.getPath());
+        }
+    }
+
+    private List<DefaultGradleTask> convertTasks(Iterable<? extends GradleTask> tasks) {
+        List<DefaultGradleTask> result = Lists.newArrayList();
+        for (GradleTask task : tasks) {
+            result.add(new DefaultGradleTask()
+                    .setName(task.getName())
+                    .setPath(task.getPath())
+                    .setDescription(task.getDescription()));
+        }
+        return result;
     }
 }
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectConverter.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectConverter.java
deleted file mode 100644
index abe840049bb5..000000000000
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectConverter.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.tooling.internal.consumer.converters;
-
-import org.gradle.tooling.internal.gradle.DefaultConvertedGradleProject;
-import org.gradle.tooling.internal.gradle.DefaultGradleProjectTask;
-import org.gradle.tooling.internal.gradle.DefaultGradleTask;
-import org.gradle.tooling.internal.gradle.PartialGradleProject;
-import org.gradle.tooling.internal.protocol.TaskVersion1;
-import org.gradle.tooling.internal.protocol.eclipse.EclipseProjectVersion3;
-
-import java.util.LinkedList;
-import java.util.List;
-
-public class GradleProjectConverter {
-
-    public DefaultConvertedGradleProject convert(EclipseProjectVersion3 project) {
-        //build children recursively
-        List<DefaultConvertedGradleProject> children = new LinkedList<DefaultConvertedGradleProject>();
-        for (EclipseProjectVersion3 p : project.getChildren()) {
-            children.add(convert(p));
-        }
-        //build parent
-        DefaultConvertedGradleProject parent = new DefaultConvertedGradleProject()
-                .setPath(project.getPath())
-                .setName(project.getName())
-                .setChildren(children)
-                .setDescription(project.getDescription());
-
-        //build tasks
-        List<DefaultGradleTask> tasks = new LinkedList<DefaultGradleTask>();
-        for (TaskVersion1 t : project.getTasks()) {
-            tasks.add(new DefaultGradleProjectTask()
-                    .setProject(parent)
-                    .setName(t.getName())
-                    .setPath(t.getPath())
-                    .setDescription(t.getDescription())
-                    );
-        }
-        parent.setTasks(tasks);
-
-        //apply parent to each child
-        for (PartialGradleProject child : children) {
-            child.setParent(parent);
-        }
-
-        return parent;
-    }
-}
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectMixInHandler.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectMixInHandler.java
deleted file mode 100644
index 36b326afd519..000000000000
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/GradleProjectMixInHandler.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2012 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.tooling.internal.consumer.converters;
-
-import org.gradle.tooling.internal.adapter.MethodInvocation;
-import org.gradle.tooling.internal.adapter.MethodInvoker;
-import org.gradle.tooling.internal.protocol.eclipse.EclipseProjectVersion3;
-
-public class GradleProjectMixInHandler implements MethodInvoker {
-    public void invoke(MethodInvocation invocation) throws Throwable {
-        if (invocation.getName().equals("getGradleProject")
-                && invocation.getDelegate() instanceof EclipseProjectVersion3) {
-            invocation.setResult(new GradleProjectConverter().convert((EclipseProjectVersion3) invocation.getDelegate()));
-        }
-     }
-}
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/PropertyHandlerFactory.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/PropertyHandlerFactory.java
deleted file mode 100644
index 8ed687bdc4e6..000000000000
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/converters/PropertyHandlerFactory.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.tooling.internal.consumer.converters;
-
-import org.gradle.api.Action;
-import org.gradle.tooling.internal.adapter.SourceObjectMapping;
-import org.gradle.tooling.internal.consumer.versioning.VersionDetails;
-import org.gradle.tooling.model.eclipse.EclipseProject;
-
-import java.io.Serializable;
-
-public class PropertyHandlerFactory {
-    public Action<SourceObjectMapping> forVersion(VersionDetails versionDetails) {
-        return new ConsumerMapping(versionDetails);
-    }
-
-    private static class ConsumerMapping implements Action<SourceObjectMapping>, Serializable {
-        private final VersionDetails versionDetails;
-
-        public ConsumerMapping(VersionDetails versionDetails) {
-            this.versionDetails = versionDetails;
-        }
-
-        public void execute(SourceObjectMapping mapping) {
-            if (EclipseProject.class.isAssignableFrom(mapping.getTargetType()) && !versionDetails.supportsGradleProjectModel()) {
-                mapping.mixIn(new GradleProjectMixInHandler());
-            }
-        }
-    }
-}
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoader.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoader.java
index dab8617ca04d..a59205c545a5 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoader.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoader.java
@@ -74,7 +74,7 @@ public ConsumerConnection create(Distribution distribution, ProgressLoggerFactor
             } else if (connection instanceof InternalConnection) {
                 adaptedConnection = new InternalConnectionBackedConsumerConnection(connection, modelMapping, adapter);
             } else {
-                adaptedConnection = new ConnectionVersion4BackedConsumerConnection(connection, modelMapping, adapter);
+                return new ConnectionVersion4BackedConsumerConnection(distribution, connection, adapter);
             }
             adaptedConnection.configure(connectionParameters);
             return adaptedConnection;
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/ConsumerOperationParameters.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/ConsumerOperationParameters.java
index 06bb2a84f4cd..8a46480c3b60 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/ConsumerOperationParameters.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/ConsumerOperationParameters.java
@@ -16,19 +16,29 @@
 
 package org.gradle.tooling.internal.consumer.parameters;
 
+import com.google.common.collect.Lists;
+import org.gradle.api.GradleException;
 import org.gradle.tooling.ProgressListener;
+import org.gradle.tooling.internal.adapter.ProtocolToModelAdapter;
 import org.gradle.tooling.internal.consumer.ConnectionParameters;
+import org.gradle.tooling.internal.gradle.TaskListingLaunchable;
 import org.gradle.tooling.internal.protocol.BuildOperationParametersVersion1;
 import org.gradle.tooling.internal.protocol.BuildParameters;
 import org.gradle.tooling.internal.protocol.BuildParametersVersion1;
 import org.gradle.tooling.internal.protocol.InternalLaunchable;
 import org.gradle.tooling.internal.protocol.ProgressListenerVersion1;
+import org.gradle.tooling.model.Launchable;
+import org.gradle.tooling.model.Task;
+import org.gradle.tooling.model.TaskSelector;
 
 import java.io.File;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.reflect.Proxy;
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 public class ConsumerOperationParameters implements BuildOperationParametersVersion1, BuildParametersVersion1, BuildParameters {
@@ -93,11 +103,39 @@ public Builder setTasks(List<String> tasks) {
             return this;
         }
 
-        public Builder setLaunchables(List<InternalLaunchable> launchables) {
-            this.launchables = launchables;
+        public Builder setLaunchables(Iterable<? extends Launchable> launchables) {
+            Set<String> taskPaths = new LinkedHashSet<String>();
+            List<InternalLaunchable> launchablesParams = Lists.newArrayList();
+            for (Launchable launchable : launchables) {
+                if (launchable instanceof Task) {
+                    taskPaths.add(((Task) launchable).getPath());
+                } else if (launchable instanceof TaskListingLaunchable) {
+                    taskPaths.addAll(((TaskListingLaunchable) launchable).getTaskNames());
+                } else if (!(launchable instanceof TaskSelector)) {
+                    throw new GradleException("Only Task or TaskSelector instances are supported: "
+                            + (launchable != null ? launchable.getClass() : "null"));
+                }
+                maybeAddLaunchableParameter(launchablesParams, launchable);
+            }
+            this.launchables = launchablesParams;
+            tasks = Lists.newArrayList(taskPaths);
             return this;
         }
 
+        private void maybeAddLaunchableParameter(List<InternalLaunchable> launchablesParams, Launchable launchable) {
+            Object original = launchable;
+            try {
+                if (Proxy.isProxyClass(launchable.getClass())) {
+                    original = new ProtocolToModelAdapter().unpack(launchable);
+                }
+            } catch (IllegalArgumentException iae) {
+                // ignore: launchable created on consumer side for older provider
+            }
+            if (original instanceof InternalLaunchable) {
+                launchablesParams.add((InternalLaunchable) original);
+            }
+        }
+
         public void addProgressListener(ProgressListener listener) {
             progressListener.add(listener);
         }
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultConvertedGradleProject.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultConvertedGradleProject.java
deleted file mode 100644
index 9bf62e40197f..000000000000
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultConvertedGradleProject.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2011 the original author or authors.
- *
- * 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.
- */
-
-package org.gradle.tooling.internal.gradle;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-public class DefaultConvertedGradleProject extends PartialGradleProject {
-    private List<DefaultGradleTask> tasks = new LinkedList<DefaultGradleTask>();
-
-    @Override
-    public DefaultConvertedGradleProject setName(String name) {
-        super.setName(name);
-        return this;
-    }
-
-    @Override
-    public DefaultConvertedGradleProject setPath(String path) {
-        super.setPath(path);
-        return this;
-    }
-
-    @Override
-    public DefaultConvertedGradleProject setDescription(String description) {
-        super.setDescription(description);
-        return this;
-    }
-
-    @Override
-    public DefaultConvertedGradleProject setChildren(List<? extends PartialGradleProject> children) {
-        super.setChildren(children);
-        return this;
-    }
-
-    public Collection<DefaultGradleTask> getTasks() {
-        return tasks;
-    }
-
-    public DefaultConvertedGradleProject setTasks(List<DefaultGradleTask> tasks) {
-        this.tasks = tasks;
-        return this;
-    }
-}
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleProject.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleProject.java
index d28f624f48e6..f94e4c1ea8cf 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleProject.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/DefaultGradleProject.java
@@ -16,15 +16,12 @@
 
 package org.gradle.tooling.internal.gradle;
 
-import org.gradle.tooling.internal.protocol.InternalGradleProject;
-
-import java.io.File;
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
-public class DefaultGradleProject<T> extends PartialGradleProject implements InternalGradleProject, Serializable, GradleProjectIdentity {
+public class DefaultGradleProject<T> extends PartialGradleProject implements Serializable, GradleProjectIdentity {
     private DefaultGradleScript buildScript = new DefaultGradleScript();
     private List<T> tasks = new LinkedList<T>();
 
@@ -65,10 +62,6 @@ public DefaultGradleScript getBuildScript() {
         return buildScript;
     }
 
-    public File getProjectDirectory() {
-        throw new RuntimeException("ProjectVersion3 methods are deprecated.");
-    }
-
     @Override
     public DefaultGradleProject<T> findByPath(String path) {
         return (DefaultGradleProject<T>) super.findByPath(path);
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/PartialGradleProject.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/PartialGradleProject.java
index 29fe7f683d4e..4a53fc8bda75 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/PartialGradleProject.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/gradle/PartialGradleProject.java
@@ -21,6 +21,9 @@
 import java.util.LinkedList;
 import java.util.List;
 
+/**
+ * A partial implementation of {@link org.gradle.tooling.model.GradleProject}.
+ */
 public class PartialGradleProject implements Serializable {
     private String name;
     private String description;
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/BuildableProjectVersion1.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/BuildableProjectVersion1.java
index 5f44c145a226..fcaea93227d6 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/BuildableProjectVersion1.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/BuildableProjectVersion1.java
@@ -18,6 +18,6 @@
 /**
  * DO NOT CHANGE THIS INTERFACE. It is part of the cross-version protocol.
  */
-public interface BuildableProjectVersion1 extends ProjectVersion3 {
+public interface BuildableProjectVersion1 {
     Iterable<? extends TaskVersion1> getTasks();
 }
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/ConnectionVersion4.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/ConnectionVersion4.java
index 6667a2d4c663..7eb375663c3c 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/ConnectionVersion4.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/ConnectionVersion4.java
@@ -66,7 +66,7 @@ public interface ConnectionVersion4 {
      * <p>Consumer compatibility: This method is used by all consumer versions from 1.0-milestone-3 to 1.0-milestone-7. It is also used by later consumers when the provider
      * does not implement {@link InternalConnection} or {@link BuildActionRunner}
      * </p>
-     * <p>Provider compatibility: This method is implemented by all provider versions from 1.0-milestone-3.</p>
+     * <p>Provider compatibility: This method is implemented by all provider versions from 1.0-milestone-3. Versions 2.0 and later fail with a 'no longer supported' exception.</p>
      *
      * @throws UnsupportedOperationException When the given model type is not supported.
      * @throws IllegalStateException When this connection has been stopped.
@@ -82,7 +82,7 @@ public interface ConnectionVersion4 {
      * <p>Consumer compatibility: This method is used by all consumer versions from 1.0-milestone-3 to 1.1. It is also used by later consumers when the provider
      * does not implement {@link BuildActionRunner}
      * </p>
-     * <p>Provider compatibility: This method is implemented by all provider versions from 1.0-milestone-3.</p>
+     * <p>Provider compatibility: This method is implemented by all provider versions from 1.0-milestone-3. Versions 2.0 and later fail with a 'no longer supported' exception.</p>
      *
      * @param buildParameters The parameters for the build.
      * @throws IllegalStateException When this connection has been stopped.
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/HierarchicalProjectVersion1.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/HierarchicalProjectVersion1.java
index 84fea62ebd6f..afbecf5325d8 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/HierarchicalProjectVersion1.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/HierarchicalProjectVersion1.java
@@ -18,7 +18,7 @@
 /**
  * DO NOT CHANGE THIS INTERFACE. It is part of the cross-version protocol.
  */
-public interface HierarchicalProjectVersion1 extends ProjectVersion3 {
+public interface HierarchicalProjectVersion1 {
     HierarchicalProjectVersion1 getParent();
 
     Iterable<? extends HierarchicalProjectVersion1> getChildren();
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBasicIdeaProject.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBasicIdeaProject.java
index 3f39c9c87451..280adaf21254 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBasicIdeaProject.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalBasicIdeaProject.java
@@ -21,4 +21,4 @@
  *
  * @since 1.0-milestone-5
  */
-public interface InternalBasicIdeaProject extends ProjectVersion3, InternalProtocolInterface {}
+public interface InternalBasicIdeaProject extends InternalProtocolInterface {}
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalConnection.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalConnection.java
index a538431460a9..d4b688ebf6dc 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalConnection.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalConnection.java
@@ -37,7 +37,7 @@ public interface InternalConnection extends ConnectionVersion4, InternalProtocol
      *
      * <p>Consumer compatibility: This method is used by all consumer versions from 1.0-milestone-8 to 1.1. It is also used by later consumers when the
      * provider does not implement {@link BuildActionRunner} or {@link ModelBuilder}.</p>
-     * <p>Provider compatibility: This interface is implemented by all provider versions from 1.0-milestone-8.</p>
+     * <p>Provider compatibility: This interface is implemented by all provider versions from 1.0-milestone-8. Versions 2.0 and later fail with a 'no longer implemented' exception.</p>
      *
      * @throws UnsupportedOperationException When the given model type is not supported.
      * @throws IllegalStateException When this connection has been stopped.
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalGradleProject.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalGradleProject.java
index e903a8db708a..be88b76b2894 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalGradleProject.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalGradleProject.java
@@ -21,4 +21,4 @@
  *
  * @since 1.0-milestone-5
  */
-public interface InternalGradleProject extends ProjectVersion3, InternalProtocolInterface {}
+public interface InternalGradleProject extends InternalProtocolInterface {}
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalIdeaProject.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalIdeaProject.java
index 6457f6c55162..1b357fd0880d 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalIdeaProject.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/InternalIdeaProject.java
@@ -21,5 +21,5 @@
  *
  * @since 1.0-milestone-5
  */
-public interface InternalIdeaProject extends ProjectVersion3, InternalProtocolInterface {
+public interface InternalIdeaProject extends InternalProtocolInterface {
 }
diff --git a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/eclipse/EclipseProjectVersion3.java b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/eclipse/EclipseProjectVersion3.java
index 96aad9a4dc17..5a6a78ecdcd7 100644
--- a/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/eclipse/EclipseProjectVersion3.java
+++ b/subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/protocol/eclipse/EclipseProjectVersion3.java
@@ -17,13 +17,14 @@
 
 import org.gradle.tooling.internal.protocol.BuildableProjectVersion1;
 import org.gradle.tooling.internal.protocol.ExternalDependencyVersion1;
+import org.gradle.tooling.internal.protocol.ProjectVersion3;
 
 /**
  * DO NOT CHANGE THIS INTERFACE. It is part of the cross-version protocol.
  *
  * @since 1.0-milestone-3
  */
-public interface EclipseProjectVersion3 extends HierarchicalEclipseProjectVersion1, BuildableProjectVersion1 {
+public interface EclipseProjectVersion3 extends HierarchicalEclipseProjectVersion1, BuildableProjectVersion1, ProjectVersion3 {
     EclipseProjectVersion3 getParent();
 
     Iterable<? extends EclipseTaskVersion1> getTasks();
diff --git a/subprojects/tooling-api/src/test/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpecTest.groovy b/subprojects/tooling-api/src/test/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpecTest.groovy
index 9063ce9e5c97..7b1c6f195657 100644
--- a/subprojects/tooling-api/src/test/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpecTest.groovy
+++ b/subprojects/tooling-api/src/test/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpecTest.groovy
@@ -37,6 +37,24 @@ class GradleVersionSpecTest extends Specification {
         !spec.isSatisfiedBy(GradleVersion.version("0.5"))
     }
 
+    def "greater-than version constraint matches all versions later than specified base version"() {
+        def spec = GradleVersionSpec.toSpec(">1.0")
+
+        expect:
+        !spec.isSatisfiedBy(GradleVersion.version("1.0"))
+        !spec.isSatisfiedBy(GradleVersion.version("1.0-rc-1"))
+        !spec.isSatisfiedBy(GradleVersion.version("1.0-12341010120000+1000"))
+
+        spec.isSatisfiedBy(GradleVersion.version("1.1"))
+        spec.isSatisfiedBy(GradleVersion.version("1.1-rc-7"))
+        spec.isSatisfiedBy(GradleVersion.version("1.1-12341010120000+1000"))
+        spec.isSatisfiedBy(GradleVersion.version("2.56"))
+
+        !spec.isSatisfiedBy(GradleVersion.version("1.0-milestone-9"))
+        !spec.isSatisfiedBy(GradleVersion.version("0.9.2"))
+        !spec.isSatisfiedBy(GradleVersion.version("0.5"))
+    }
+
     def "less-than-or-equal version constraint matches all versions with specified base version and earlier"() {
         def spec = GradleVersionSpec.toSpec("<=1.4")
 
diff --git a/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/DistributionFactoryTest.groovy b/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/DistributionFactoryTest.groovy
index 4be0d4498c4f..cdf224ef1f23 100644
--- a/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/DistributionFactoryTest.groovy
+++ b/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/DistributionFactoryTest.groovy
@@ -21,8 +21,6 @@ import org.gradle.test.fixtures.file.TestFile
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.DistributionLocator
 import org.gradle.util.GradleVersion
-import org.gradle.util.Requires
-import org.gradle.util.TestPrecondition
 import org.junit.Rule
 import spock.lang.Specification
 
@@ -191,13 +189,12 @@ class DistributionFactoryTest extends Specification {
         0 * _._
     }
 
-    @Requires(TestPrecondition.ONLINE)
     def failsWhenDistributionZipDoesNotExist() {
-        URI zipFile = new URI("http://google.com/does-not-exist/gradle-1.0.zip")
+        URI zipFile = tmpDir.file("no-exists.zip").toURI()
         def dist = factory.getDistribution(zipFile)
 
         when:
-        dist.getToolingImplementationClasspath(progressLoggerFactory)
+        dist.getToolingImplementationClasspath(progressLoggerFactory, null)
 
         then:
         IllegalArgumentException e = thrown()
diff --git a/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnectionTest.groovy b/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnectionTest.groovy
index 049d01a5eac6..f7c7e863de10 100644
--- a/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnectionTest.groovy
+++ b/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/connection/ConnectionVersion4BackedConsumerConnectionTest.groovy
@@ -15,274 +15,46 @@
  */
 package org.gradle.tooling.internal.consumer.connection
 
-import org.gradle.tooling.BuildAction
-import org.gradle.tooling.UnknownModelException
 import org.gradle.tooling.UnsupportedVersionException
-import org.gradle.tooling.exceptions.UnsupportedOperationConfigurationException
 import org.gradle.tooling.internal.adapter.ProtocolToModelAdapter
-import org.gradle.tooling.internal.build.VersionOnlyBuildEnvironment
+import org.gradle.tooling.internal.consumer.Distribution
 import org.gradle.tooling.internal.consumer.parameters.ConsumerOperationParameters
-import org.gradle.tooling.internal.consumer.versioning.CustomModel
-import org.gradle.tooling.internal.consumer.versioning.ModelMapping
-import org.gradle.tooling.internal.gradle.DefaultGradleBuild
-import org.gradle.tooling.internal.gradle.PartialGradleProject
 import org.gradle.tooling.internal.protocol.ConnectionMetaDataVersion1
 import org.gradle.tooling.internal.protocol.ConnectionVersion4
-import org.gradle.tooling.internal.protocol.ProjectVersion3
-import org.gradle.tooling.internal.protocol.eclipse.EclipseProjectVersion3
 import org.gradle.tooling.model.GradleProject
 import org.gradle.tooling.model.build.BuildEnvironment
-import org.gradle.tooling.model.eclipse.EclipseProject
-import org.gradle.tooling.model.eclipse.HierarchicalEclipseProject
-import org.gradle.tooling.model.gradle.GradleBuild
-import org.gradle.tooling.model.idea.BasicIdeaProject
-import org.gradle.tooling.model.idea.IdeaProject
-import org.gradle.tooling.model.internal.outcomes.ProjectOutcomes
 import spock.lang.Specification
 
 class ConnectionVersion4BackedConsumerConnectionTest extends Specification {
-    final ConnectionMetaDataVersion1 metaData = Stub()
-    final ConnectionVersion4 target = Mock() {
-        getMetaData() >> metaData
-    }
+    final Distribution distribution = Mock(Distribution)
     final ConsumerOperationParameters parameters = Mock()
-    final ModelMapping modelMapping = Stub()
-    final ProtocolToModelAdapter adapter = Mock()
-
-    def "describes capabilities of a 1.0-m3 provider"() {
-        given:
-        metaData.version >> "1.0-milestone-3"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-        def details = connection.versionDetails
-
-        expect:
-        !details.supportsGradleProjectModel()
-
-        and:
-        details.maySupportModel(HierarchicalEclipseProject)
-        details.maySupportModel(EclipseProject)
-        details.maySupportModel(Void)
-
-        and:
-        !details.maySupportModel(IdeaProject)
-        !details.maySupportModel(BasicIdeaProject)
-        !details.maySupportModel(GradleProject)
-        !details.maySupportModel(BuildEnvironment)
-        !details.maySupportModel(ProjectOutcomes)
-        !details.maySupportModel(CustomModel)
-        !details.maySupportModel(GradleBuild)
-    }
-
-    def "describes capabilities of a 1.0-m5 provider"() {
-        given:
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-        def details = connection.versionDetails
-
-        expect:
-        details.supportsGradleProjectModel()
-
-        and:
-        details.maySupportModel(HierarchicalEclipseProject)
-        details.maySupportModel(EclipseProject)
-        details.maySupportModel(IdeaProject)
-        details.maySupportModel(BasicIdeaProject)
-        details.maySupportModel(GradleProject)
-        details.maySupportModel(Void)
-
-        and:
-        !details.maySupportModel(BuildEnvironment)
-        !details.maySupportModel(ProjectOutcomes)
-        !details.maySupportModel(CustomModel)
-        !details.maySupportModel(GradleBuild)
-    }
-
-    def "builds model using connection's getModel() method"() {
-        ProjectVersion3 protocolModel = Mock()
-        GradleProject model = Mock()
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        when:
-        def result = connection.run(GradleProject.class, parameters)
-
-        then:
-        result == model
-
-        and:
-        _ * modelMapping.getProtocolType(GradleProject.class) >> ProjectVersion3.class
-        1 * target.getModel(ProjectVersion3.class, parameters) >> protocolModel
-        1 * adapter.adapt(GradleProject.class, protocolModel, _) >> model
-        0 * target._
-    }
-
-    def "runs build using connection's executeBuild() method"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        when:
-        connection.run(Void.class, parameters)
-
-        then:
-        1 * target.executeBuild(parameters, parameters)
-        0 * target._
-    }
-
-    def "builds partial BuildEnvironment model locally"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-        BuildEnvironment model = Stub()
-
-        when:
-        def result = connection.run(BuildEnvironment.class, parameters)
-
-        then:
-        result == model
-
-        and:
-        1 * adapter.adapt(BuildEnvironment.class, {it instanceof VersionOnlyBuildEnvironment}, _) >> model
-        0 * target._
-    }
-
-    def "builds partial GradleProject model using the Eclipse model for a 1.0-m3 provider"() {
-        metaData.version >> "1.0-milestone-3"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-        EclipseProjectVersion3 protocolModel = Stub()
-        GradleProject model = Stub()
-
-        when:
-        def result = connection.run(GradleProject.class, parameters)
-
-        then:
-        result == model
-
-        and:
-        _ * modelMapping.getProtocolType(EclipseProjectVersion3) >> EclipseProjectVersion3.class
-        1 * target.getModel(EclipseProjectVersion3.class, parameters) >> protocolModel
-        1 * adapter.adapt(EclipseProjectVersion3.class, _, _) >> protocolModel
-        1 * adapter.adapt(GradleProject.class, _) >> model
-        0 * target._
-    }
-
-    def "builds partial GradleBuild model using the Eclipse model for a 1.0-m3 provider"() {
-        metaData.version >> "1.0-milestone-3"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-        EclipseProjectVersion3 protocolModel = Stub()
-        GradleProject gradleProject = Stub()
-        GradleBuild model = Stub()
+    final ConnectionVersion4 connection = Mock()
+    final ConnectionMetaDataVersion1 metaDataVersion1 = Mock()
+    final ProtocolToModelAdapter adapter = new ProtocolToModelAdapter()
 
-        when:
-        def result = connection.run(GradleBuild.class, parameters)
-
-        then:
-        result == model
-
-        and:
-        _ * modelMapping.getProtocolType(EclipseProjectVersion3) >> EclipseProjectVersion3.class
-        1 * target.getModel(EclipseProjectVersion3.class, parameters) >> protocolModel
-        1 * adapter.adapt(EclipseProjectVersion3.class, _, _) >> protocolModel
-        1 * adapter.adapt(GradleProject.class, { it instanceof PartialGradleProject }) >> gradleProject
-        1 * adapter.adapt(GradleBuild.class, { it instanceof DefaultGradleBuild }) >> model
-        0 * adapter._
-        0 * target._
-    }
-
-    def "fails when unknown model is requested"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        when:
-        connection.run(CustomModel.class, parameters)
-
-        then:
-        UnknownModelException e = thrown()
-        e.message == /The version of Gradle you are using (1.0-milestone-5) does not support building a model of type 'CustomModel'. Support for building custom tooling models was added in Gradle 1.6 and is available in all later versions./
+    def setup() {
+        _ * connection.metaData >> metaDataVersion1
+        _ * metaDataVersion1.version >> '1.0-milestoneX'
     }
 
-    def "fails when unsupported model is requested"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        when:
-        connection.run(ProjectOutcomes.class, parameters)
-
-        then:
-        UnknownModelException e = thrown()
-        e.message == /The version of Gradle you are using (1.0-milestone-5) does not support building a model of type 'ProjectOutcomes'. Support for building 'ProjectOutcomes' models was added in Gradle 1.2 and is available in all later versions./
-    }
-
-    def "fails when both tasks and model requested"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        given:
-        parameters.tasks >> ['a']
+    def "run fails"() {
+        def connection = new ConnectionVersion4BackedConsumerConnection(distribution, connection, adapter)
 
         when:
         connection.run(GradleProject.class, parameters)
 
-        then:
-        UnsupportedOperationConfigurationException e = thrown()
-        e.message.startsWith("Unsupported configuration: modelBuilder.forTasks()")
-    }
-
-    def "fails when build action requested"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        given:
-        parameters.tasks >> ['a']
-
-        when:
-        connection.run(Stub(BuildAction), parameters)
-
         then:
         UnsupportedVersionException e = thrown()
-        e.message == /The version of Gradle you are using (1.0-milestone-5) does not support execution of build actions provided by the tooling API client. Support for this was added in Gradle 1.8 and is available in all later versions./
+        e != null
     }
 
-    def "fails when stdin provided"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        given:
-        parameters.standardInput >> new ByteArrayInputStream("hi".bytes)
-
-        when:
-        connection.run(CustomModel.class, parameters)
-
-        then:
-        UnsupportedOperationConfigurationException e = thrown()
-        e.message.startsWith("Unsupported configuration: modelBuilder.setStandardInput()")
-    }
-
-    def "fails when Java home specified"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        given:
-        parameters.javaHome >> new File("java-home")
-
-        when:
-        connection.run(CustomModel.class, parameters)
-
-        then:
-        UnsupportedOperationConfigurationException e = thrown()
-        e.message.startsWith("Unsupported configuration: modelBuilder.setJavaHome()")
-    }
-
-    def "fails when JVM args specified"() {
-        metaData.version >> "1.0-milestone-5"
-        def connection = new ConnectionVersion4BackedConsumerConnection(target, modelMapping, adapter)
-
-        given:
-        parameters.jvmArguments >> ['-Dsome.arg']
+    def "partial BuildEnvirnment"() {
+        def connection = new ConnectionVersion4BackedConsumerConnection(distribution, connection, adapter)
 
         when:
-        connection.run(CustomModel.class, parameters)
+        def buildEnv = connection.run(BuildEnvironment.class, parameters)
 
         then:
-        UnsupportedOperationConfigurationException e = thrown()
-        e.message.startsWith("Unsupported configuration: modelBuilder.setJvmArguments()")
+        buildEnv.gradle.gradleVersion == '1.0-milestoneX'
     }
 }
diff --git a/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoaderTest.groovy b/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoaderTest.groovy
index 1e42e04eb48a..cf1e090bdda3 100644
--- a/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoaderTest.groovy
+++ b/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/loader/DefaultToolingImplementationLoaderTest.groovy
@@ -69,7 +69,24 @@ class DefaultToolingImplementationLoaderTest extends Specification {
         TestR16Connection.class   | ModelBuilderBackedConsumerConnection.class
         TestR12Connection.class   | BuildActionRunnerBackedConsumerConnection.class
         TestR10M8Connection.class | InternalConnectionBackedConsumerConnection.class
-        TestR10M3Connection.class | ConnectionVersion4BackedConsumerConnection.class
+    }
+
+    def "locates connection implementation using meta-inf service for deprecated connection"() {
+        given:
+        distribution.getToolingImplementationClasspath(loggerFactory, userHomeDir) >> new DefaultClassPath(
+                getToolingApiResourcesDir(TestR10M3Connection.class),
+                ClasspathUtil.getClasspathForClass(TestConnection.class),
+                ClasspathUtil.getClasspathForClass(ActorFactory.class),
+                ClasspathUtil.getClasspathForClass(Logger.class),
+                ClasspathUtil.getClasspathForClass(GroovyObject.class),
+                getVersionResourcesDir(),
+                ClasspathUtil.getClasspathForClass(GradleVersion.class))
+
+        when:
+        def adaptedConnection = loader.create(distribution, loggerFactory, connectionParameters)
+
+        then:
+        adaptedConnection.class == ConnectionVersion4BackedConsumerConnection.class
     }
 
     private getToolingApiResourcesDir(Class implementation) {
diff --git a/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/parameters/ConsumerOperationParametersTest.groovy b/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/parameters/ConsumerOperationParametersTest.groovy
index 0725563627d2..0a6ececaa67c 100644
--- a/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/parameters/ConsumerOperationParametersTest.groovy
+++ b/subprojects/tooling-api/src/test/groovy/org/gradle/tooling/internal/consumer/parameters/ConsumerOperationParametersTest.groovy
@@ -16,13 +16,17 @@
 
 package org.gradle.tooling.internal.consumer.parameters
 
+import com.google.common.collect.Sets
+import org.gradle.tooling.internal.gradle.TaskListingLaunchable
+import org.gradle.tooling.internal.protocol.InternalLaunchable
+import org.gradle.tooling.model.Launchable
+import org.gradle.tooling.model.TaskSelector
 import spock.lang.Specification
 
 class ConsumerOperationParametersTest extends Specification {
-    
-    def params = ConsumerOperationParameters.builder()
-    
+
     def "null or empty arguments have the same meaning"() {
+        def params = ConsumerOperationParameters.builder()
         when:
         params.arguments = null
 
@@ -43,6 +47,7 @@ class ConsumerOperationParametersTest extends Specification {
     }
 
     def "null or empty jvm arguments have the same meaning"() {
+        def params = ConsumerOperationParameters.builder()
         when:
         params.jvmArguments = null
 
@@ -61,4 +66,52 @@ class ConsumerOperationParametersTest extends Specification {
         then:
         params.build().jvmArguments == ['-Xmx']
     }
+
+    def "task names and empty launchables"() {
+        def builder = ConsumerOperationParameters.builder()
+        when:
+        builder.tasks = ['a', 'b']
+        def params = builder.build()
+
+        then:
+        params.tasks == ['a', 'b']
+        params.launchables == null
+    }
+
+    interface LaunchableImpl extends Launchable, TaskSelector, InternalLaunchable {}
+
+    def "launchables from provider"() {
+        def builder = ConsumerOperationParameters.builder()
+        when:
+        def launchable1 = Mock(LaunchableImpl)
+        def launchable2 = Mock(LaunchableImpl)
+        builder.launchables = [launchable1, launchable2]
+        def params = builder.build()
+
+        then:
+        params.tasks == []
+        params.launchables == [launchable1, launchable2]
+    }
+
+    interface AdaptedLaunchable extends Launchable, TaskListingLaunchable {}
+
+    def "launchables from adapters"() {
+        def builder = ConsumerOperationParameters.builder()
+        when:
+        def launchable1 = Mock(AdaptedLaunchable)
+        def paths1 = Sets.newTreeSet()
+        paths1.add(':a')
+        _ * launchable1.taskNames >> paths1
+        def launchable2 = Mock(AdaptedLaunchable)
+        def paths2 = Sets.newTreeSet()
+        paths2.add(':b')
+        paths2.add(':lib:b')
+        _ * launchable2.taskNames >> paths2
+        builder.launchables = [launchable1, launchable2]
+        def params = builder.build()
+
+        then:
+        params.tasks == [':a', ':b', ':lib:b']
+        params.launchables == []
+    }
 }
diff --git a/subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpec.java b/subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpec.java
index d915a1407555..e64e4ba37022 100644
--- a/subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpec.java
+++ b/subprojects/tooling-api/src/testFixtures/groovy/org/gradle/integtests/tooling/fixture/GradleVersionSpec.java
@@ -59,6 +59,13 @@ public boolean isSatisfiedBy(GradleVersion element) {
                         return element.getBaseVersion().compareTo(minVersion) >= 0;
                     }
                 });
+            } else if (value.startsWith(">")) {
+                final GradleVersion minVersion = GradleVersion.version(value.substring(1));
+                specs.add(new Spec<GradleVersion>() {
+                    public boolean isSatisfiedBy(GradleVersion element) {
+                        return element.getBaseVersion().compareTo(minVersion) > 0;
+                    }
+                });
             } else if (value.startsWith("<=")) {
                 final GradleVersion maxVersion = GradleVersion.version(value.substring(2));
                 specs.add(new Spec<GradleVersion>() {
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/BlockingRequestObserver.java b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/BlockingRequestObserver.java
similarity index 99%
rename from subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/BlockingRequestObserver.java
rename to subprojects/ui/src/integTest/groovy/org/gradle/integtests/BlockingRequestObserver.java
index 547674af9b0b..5bede9e7438a 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/BlockingRequestObserver.java
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/BlockingRequestObserver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests.openapi;
+package org.gradle.integtests;
 
 import org.gradle.internal.UncheckedException;
 import org.gradle.openapi.external.foundation.RequestObserverVersion1;
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/ExtraTestCommandLineOptionsListener.java b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/ExtraTestCommandLineOptionsListenerWrapper.java
similarity index 81%
rename from subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/ExtraTestCommandLineOptionsListener.java
rename to subprojects/ui/src/integTest/groovy/org/gradle/integtests/ExtraTestCommandLineOptionsListenerWrapper.java
index 1f086dfd1722..1c8609d767ea 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/ExtraTestCommandLineOptionsListener.java
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/ExtraTestCommandLineOptionsListenerWrapper.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests.openapi;
+package org.gradle.integtests;
 
 import org.gradle.openapi.external.ui.CommandLineArgumentAlteringListenerVersion1;
 
 import java.io.File;
 
-public class ExtraTestCommandLineOptionsListener implements CommandLineArgumentAlteringListenerVersion1 {
+public class ExtraTestCommandLineOptionsListenerWrapper implements CommandLineArgumentAlteringListenerVersion1 {
     private final File gradleUserHomeDir;
 
-    public ExtraTestCommandLineOptionsListener(File gradleUserHomeDir) {
+    public ExtraTestCommandLineOptionsListenerWrapper(File gradleUserHomeDir) {
         this.gradleUserHomeDir = gradleUserHomeDir;
     }
 
diff --git a/subprojects/ui/src/integTest/groovy/org/gradle/integtests/LiveOutputIntegrationTest.groovy b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/LiveOutputIntegrationTest.groovy
index 59a9cc8f2087..09898f8590cc 100644
--- a/subprojects/ui/src/integTest/groovy/org/gradle/integtests/LiveOutputIntegrationTest.groovy
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/LiveOutputIntegrationTest.groovy
@@ -21,10 +21,8 @@ import org.gradle.foundation.output.FileLink
 import org.gradle.foundation.output.FileLinkDefinitionLord
 import org.gradle.foundation.output.LiveOutputParser
 import org.gradle.gradleplugin.foundation.GradlePluginLord
-import org.gradle.gradleplugin.foundation.runner.GradleRunner
 import org.gradle.integtests.fixtures.AbstractIntegrationTest
 import org.gradle.integtests.fixtures.Sample
-import org.gradle.logging.ShowStacktrace
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Rule
@@ -73,33 +71,6 @@ that's likely to change over time. This version executes the command via GradleP
         verifyLiveOutputObtained( executionInteraction );
     }
 
-    /**
-This executes 'build' on the java multiproject sample. We want to make sure that
-we do get live output from gradle. We're not concerned with what it is, because
-that's likely to change over time. This version executes the command via GradleRunner.
-*/
-    @Test
-    public void liveOutputObtainedViaGradleRunner() {
-        File multiProjectDirectory = sample.getDir();
-        Assert.assertTrue(multiProjectDirectory.exists()); //make sure things are setup the way we expect
-
-        GradleRunner gradleRunner = new GradleRunner( multiProjectDirectory, distribution.gradleHomeDir, null );
-
-        TestExecutionInteraction executionInteraction = new TestExecutionInteraction();
-
-        //execute a command. We don't really care what the command is, just something that generates output
-        def cl = new ExtraTestCommandLineOptionsListener(executer.gradleUserHomeDir).getAdditionalCommandLineArguments('') + ' tasks'
-        gradleRunner.executeCommand(cl, org.gradle.api.logging.LogLevel.LIFECYCLE,
-                                            ShowStacktrace.INTERNAL_EXCEPTIONS,
-                                            executionInteraction);
-
-        executionInteraction.waitForCompletion(100, TimeUnit.SECONDS)
-
-        verifyLiveOutputObtained( executionInteraction );
-    }
-
-
-
    /**
   This verifies that it has live output. It also checks that we received some final output as well
   as that the execution was successful
diff --git a/subprojects/ui/src/integTest/groovy/org/gradle/integtests/MultiprojectProjectAndTaskListIntegrationTest.groovy b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/MultiprojectProjectAndTaskListIntegrationTest.groovy
index e77daf7d1c5f..29beebdd9c2e 100644
--- a/subprojects/ui/src/integTest/groovy/org/gradle/integtests/MultiprojectProjectAndTaskListIntegrationTest.groovy
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/MultiprojectProjectAndTaskListIntegrationTest.groovy
@@ -34,14 +34,6 @@ import java.util.concurrent.TimeUnit
  This tests the multiproject sample with the GradleView mechanism.
  */
 class MultiprojectProjectAndTaskListIntegrationTest extends AbstractIntegrationTest {
-
-    static final String JAVA_PROJECT_NAME = 'javaproject'
-    static final String SHARED_NAME = 'shared'
-    static final String API_NAME = 'api'
-    static final String WEBAPP_NAME = 'webservice'
-    static final String SERVICES_NAME = 'services'
-    static final String WEBAPP_PATH = "$SERVICES_NAME/$WEBAPP_NAME" as String
-
     @Rule public final Sample sample = new Sample(testDirectoryProvider, 'java/multiproject')
     GradlePluginLord gradlePluginLord = new GradlePluginLord()
 
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OpenApiFixture.java b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/OpenApiFixture.java
similarity index 76%
rename from subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OpenApiFixture.java
rename to subprojects/ui/src/integTest/groovy/org/gradle/integtests/OpenApiFixture.java
index 8dd12808291e..ab9d528f84c6 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OpenApiFixture.java
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/OpenApiFixture.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests.openapi;
+package org.gradle.integtests;
 
 import org.gradle.integtests.fixtures.executer.IntegrationTestBuildContext;
 import org.gradle.internal.UncheckedException;
-import org.gradle.openapi.external.ui.DualPaneUIVersion1;
+import org.gradle.openapi.external.ui.SinglePaneUIInteractionVersion1;
 import org.gradle.openapi.external.ui.SinglePaneUIVersion1;
-import org.gradle.openapi.external.ui.UIFactory;
+import org.gradle.openapi.wrappers.ui.SinglePaneUIWrapper;
 import org.gradle.test.fixtures.file.TestDirectoryProvider;
 import org.junit.Assert;
 import org.junit.rules.MethodRule;
@@ -61,9 +61,14 @@ public void run() {
 
     public SinglePaneUIVersion1 createSinglePaneUI() {
         TestSingleDualPaneUIInteractionVersion1 testSingleDualPaneUIInteractionVersion1 = new TestSingleDualPaneUIInteractionVersion1(new TestAlternateUIInteractionVersion1(), new TestSettingsNodeVersion1());
+        return createSinglePaneUI(testSingleDualPaneUIInteractionVersion1);
+    }
+
+    public SinglePaneUIVersion1 createSinglePaneUI(SinglePaneUIInteractionVersion1 testSingleDualPaneUIInteractionVersion1) {
+        System.setProperty("gradle.home", buildContext.getGradleHomeDir().getAbsolutePath());
         SinglePaneUIVersion1 singlePane;
         try {
-            singlePane = UIFactory.createSinglePaneUI(getClass().getClassLoader(), buildContext.getGradleHomeDir(), testSingleDualPaneUIInteractionVersion1, false);
+            singlePane = new SinglePaneUIWrapper(testSingleDualPaneUIInteractionVersion1, false);
         } catch (Exception e) {
             throw UncheckedException.throwAsUncheckedException(e);
         }
@@ -72,37 +77,15 @@ public SinglePaneUIVersion1 createSinglePaneUI() {
         Assert.assertNotNull(singlePane);
 
         singlePane.setCurrentDirectory(testDirectoryProvider.getTestDirectory());
-        singlePane.addCommandLineArgumentAlteringListener(new ExtraTestCommandLineOptionsListener(buildContext.getGradleUserHomeDir()));
+        singlePane.addCommandLineArgumentAlteringListener(new ExtraTestCommandLineOptionsListenerWrapper(buildContext.getGradleUserHomeDir()));
 
         return singlePane;
     }
 
-    public DualPaneUIVersion1 createDualPaneUI() {
-        TestSingleDualPaneUIInteractionVersion1 testSingleDualPaneUIInteractionVersion1 = new TestSingleDualPaneUIInteractionVersion1(new TestAlternateUIInteractionVersion1(), new TestSettingsNodeVersion1());
-        DualPaneUIVersion1 dualPane;
-        try {
-            dualPane = UIFactory.createDualPaneUI(getClass().getClassLoader(), buildContext.getGradleHomeDir(), testSingleDualPaneUIInteractionVersion1, false);
-        } catch (Exception e) {
-            throw UncheckedException.throwAsUncheckedException(e);
-        }
-
-        //make sure we got something
-        Assert.assertNotNull(dualPane);
-
-        dualPane.setCurrentDirectory(testDirectoryProvider.getTestDirectory());
-        dualPane.addCommandLineArgumentAlteringListener(new ExtraTestCommandLineOptionsListener(buildContext.getGradleUserHomeDir()));
-
-        return dualPane;
-    }
-
     public JFrame open(SinglePaneUIVersion1 ui) {
         return createTestFrame(ui.getComponent(), null);
     }
 
-    public JFrame open(DualPaneUIVersion1 ui) {
-        return createTestFrame(ui.getMainComponent(), ui.getOutputPanel());
-    }
-
     /*
     * This shows the specified frame for a moment so the event queue can be emptied. This
     * ensures Swing events a processed
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OpenApiUiTest.groovy b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/OpenApiUiTest.groovy
similarity index 89%
rename from subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OpenApiUiTest.groovy
rename to subprojects/ui/src/integTest/groovy/org/gradle/integtests/OpenApiUiTest.groovy
index a1c6a54fdbb9..840bd60f43be 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OpenApiUiTest.groovy
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/OpenApiUiTest.groovy
@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests.openapi
+package org.gradle.integtests
 
-import org.gradle.integtests.fixtures.TestResources
 import org.gradle.integtests.fixtures.executer.IntegrationTestBuildContext
 import org.gradle.internal.os.OperatingSystem
-import org.gradle.openapi.external.ExternalUtility
 import org.gradle.openapi.external.foundation.GradleInterfaceVersion2
 import org.gradle.openapi.external.foundation.ProjectVersion1
 import org.gradle.openapi.external.foundation.RequestVersion1
@@ -26,14 +24,12 @@ import org.gradle.openapi.external.foundation.TaskVersion1
 import org.gradle.openapi.external.foundation.favorites.FavoriteTaskVersion1
 import org.gradle.openapi.external.foundation.favorites.FavoritesEditorVersion1
 import org.gradle.openapi.external.ui.*
+import org.gradle.openapi.wrappers.ui.SinglePaneUIWrapper
 import org.gradle.test.fixtures.file.TestNameTestDirectoryProvider
 import org.gradle.util.PreconditionVerifier
 import org.gradle.util.Requires
 import org.gradle.util.TestPrecondition
-import org.junit.Assert
-import org.junit.ClassRule
-import org.junit.Rule
-import org.junit.Test
+import org.junit.*
 
 import javax.swing.*
 import java.awt.*
@@ -46,16 +42,24 @@ import static org.hamcrest.Matchers.*
 /**
  * This tests numerous aspects of the Open API UI. This is how the Idea plugin extracts the UI from
  * Gradle.
+ *
+ * Note: even though the open API has been removed, this test covers aspects of the GUI that are not covered elsewhere. This test will
+ * gradually be replaced by other GUI tests.
  */
 @Requires(TestPrecondition.SWING)
 class OpenApiUiTest {
 
     @Rule public final TestNameTestDirectoryProvider temporaryFolder = new TestNameTestDirectoryProvider()
     private IntegrationTestBuildContext buildContext = new IntegrationTestBuildContext();
-    @Rule public TestResources resources = new TestResources(temporaryFolder, 'testproject')
     @Rule public OpenApiFixture openApi = new OpenApiFixture(temporaryFolder)
     @ClassRule public static PreconditionVerifier verifier = new PreconditionVerifier()
 
+    @Before
+    void setup() {
+        temporaryFolder.file("settings.gradle") << "include 'services', 'services:webservice', 'api'"
+        temporaryFolder.file("build.gradle") << "allprojects { apply plugin: 'java' }"
+    }
+
     /**
      This tests to see if we can call the UIFactory to create a single pane UI.
      This is only testing that extracting the UI returns something without giving
@@ -76,41 +80,15 @@ class OpenApiUiTest {
         Assert.assertNotNull(singlePane.getComponent())
     }
 
-    /**
-     * This tests to see if we can call the UIFactory to create a dual pane UI.
-     This is only testing that extracting the UI returns something without giving
-     errors and that it has its dual components. This is just a good general-case test
-     to make sure the basics are working.
-     */
-    @Test
-    void testDualPaneBasic() {
-        DualPaneUIVersion1 dualPane = openApi.createDualPaneUI()
-
-        //make sure we got something
-        Assert.assertNotNull(dualPane)
-
-        //tell it we're about to show it, so it'll create a component
-        dualPane.aboutToShow();
-
-        //make sure we now have the main component
-        Assert.assertNotNull(dualPane.getMainComponent())
-
-        //and the output component
-        Assert.assertNotNull(dualPane.getOutputPanel())
-    }
-
     /**
      * This verifies that favorites are working for some basics. We're going to test this with both
-     * the single and dual pane UIs (they actually use the same editor then for other tests we'll
+     * the single pane UIs (they actually use the same editor then for other tests we'll
      * assume they're same).
      */
     @Test
     void testFavoritesBasic() {
         SinglePaneUIVersion1 singlePane = openApi.createSinglePaneUI()
         checkFavoritesBasic(singlePane)
-
-        DualPaneUIVersion1 dualPane = openApi.createDualPaneUI()
-        checkFavoritesBasic(dualPane)
     }
 
     /**
@@ -286,12 +264,12 @@ class OpenApiUiTest {
     /**
      * This tests getting projects and tasks from gradle. It then goes through a series of tests
      * related to projects and tasks (such as making sure their description is returned, their
-     * parent is returned, etc).
+     * root is returned, etc).
      */
     @Test
     void testProjectsAndTasks() {
-        DualPaneUIVersion1 dualPane = openApi.createDualPaneUI()
-        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) dualPane.getGradleInterfaceVersion1()
+        SinglePaneUIVersion1 panel = openApi.createSinglePaneUI()
+        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) panel.getGradleInterfaceVersion1()
 
         //make sure our samples directory exists
         Assert.assertTrue(gradleInterface.getCurrentDirectory().isDirectory())
@@ -302,7 +280,7 @@ class OpenApiUiTest {
         gradleInterface.addRequestObserver(testRequestObserver)
 
         //this starts the execution queue
-        dualPane.aboutToShow()
+        panel.aboutToShow()
 
         gradleInterface.refreshTaskTree()
 
@@ -315,7 +293,7 @@ class OpenApiUiTest {
 
         ProjectVersion1 rootProject = rootProjects.get(0);
         Assert.assertNotNull(rootProject);
-        Assert.assertThat(rootProject.getSubProjects().size(), equalTo(3))
+        Assert.assertThat(rootProject.getSubProjects().size(), equalTo(2))
 
         //Quick check to make sure there are tasks on each of the sub projects.
         //The exact task names will change over time, so I don't want to try
@@ -337,7 +315,7 @@ class OpenApiUiTest {
         ProjectVersion1 apiProject = rootProjects.get(0).getSubProject("api");
         Assert.assertNotNull(apiProject);
 
-        //verify the parent project is set correctly
+        //verify the root project is set correctly
         Assert.assertEquals(servicesProject, webserviceProject.getParentProject())
 
         //verify its full name is correct (this might should be prefixed with a colon)
@@ -379,8 +357,8 @@ class OpenApiUiTest {
      */
     @Test
     void testRefreshWithArguments() {
-        DualPaneUIVersion1 dualPane = openApi.createDualPaneUI()
-        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) dualPane.getGradleInterfaceVersion1()
+        SinglePaneUIVersion1 panel = openApi.createSinglePaneUI()
+        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) panel.getGradleInterfaceVersion1()
 
         //make sure our samples directory exists
         if (!gradleInterface.getCurrentDirectory().exists()) {
@@ -391,7 +369,7 @@ class OpenApiUiTest {
         gradleInterface.addRequestObserver(setupListener)
 
         //this starts the execution queue
-        dualPane.aboutToShow()
+        panel.aboutToShow()
 
         // wait for the implicit refresh to complete
         setupListener.waitForRequestExecutionComplete(80, TimeUnit.SECONDS)
@@ -572,7 +550,7 @@ class OpenApiUiTest {
     /**
      * We want to make sure the settings are working correctly here. This is the mechanism that
      * handles saving/restoring the values within the UI and can be stored in different ways
-     * depending on how the UI integrated with its parent (its up to whoever implements
+     * depending on how the UI integrated with its root (its up to whoever implements
      * SettingsNodeVersion1). Here, to spot check that the basics are working, we'll create a
      * UI, set a value, close it, then recreate it using the same settings object. The values
      * should be saved upon close and then restored.
@@ -582,12 +560,7 @@ class OpenApiUiTest {
         TestSettingsNodeVersion1 settingsNode = new TestSettingsNodeVersion1();
 
         TestSingleDualPaneUIInteractionVersion1 testSingleDualPaneUIInteractionVersion1 = new TestSingleDualPaneUIInteractionVersion1(new TestAlternateUIInteractionVersion1(), settingsNode);
-        SinglePaneUIVersion1 singlePane = null;
-        try {
-            singlePane = UIFactory.createSinglePaneUI(getClass().getClassLoader(), buildContext.getGradleHomeDir(), testSingleDualPaneUIInteractionVersion1, false);
-        } catch (Exception e) {
-            throw new AssertionError("Failed to extract single pane: Caused by " + e.getMessage())
-        }
+        SinglePaneUIVersion1 singlePane = openApi.createSinglePaneUI(testSingleDualPaneUIInteractionVersion1);
 
         File illegalDirectory = temporaryFolder.testDirectory.file("non-existant").createDir();
         if (illegalDirectory.equals(singlePane.getCurrentDirectory())) {
@@ -606,7 +579,7 @@ class OpenApiUiTest {
         //now instantiate it again
         testSingleDualPaneUIInteractionVersion1 = new TestSingleDualPaneUIInteractionVersion1(new TestAlternateUIInteractionVersion1(), settingsNode);
         try {
-            singlePane = UIFactory.createSinglePaneUI(getClass().getClassLoader(), buildContext.getGradleHomeDir(), testSingleDualPaneUIInteractionVersion1, false);
+            singlePane = new SinglePaneUIWrapper(testSingleDualPaneUIInteractionVersion1, false);
         } catch (Exception e) {
             throw new AssertionError("Failed to extract single pane (second time): Caused by " + e.getMessage())
         }
@@ -631,11 +604,11 @@ class OpenApiUiTest {
      */
     @Test
     void testCommandLineAlteringListener() {
-        DualPaneUIVersion1 dualPane = openApi.createDualPaneUI()
-        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) dualPane.getGradleInterfaceVersion1()
+        SinglePaneUIVersion1 panel = openApi.createSinglePaneUI()
+        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) panel.getGradleInterfaceVersion1()
 
         //this starts the execution queue. This also initiates a refresh that we'll ignore later.
-        dualPane.aboutToShow()
+        panel.aboutToShow()
 
         //add a request observer so we can observe when the command is finished. This allows us to
         //see what was actually executed.
@@ -685,18 +658,6 @@ class OpenApiUiTest {
         Assert.assertNotNull("null version number", version)
 
         Assert.assertFalse("Empty version number", version.trim().equals(""))       //shouldn't be empty
-
-        File gradleJar = ExternalUtility.getGradleJar(buildContext.gradleHomeDir)
-
-        Assert.assertNotNull("Missing gradle jar", gradleJar)                         //we should have a gradle jar
-
-        int indexOfExtension = gradleJar.getName().toLowerCase().lastIndexOf(".jar")  //get the index of its extension
-
-        Assert.assertTrue("Has no '.jar' extension", indexOfExtension != -1)          //it had better have an extension
-
-        String jarName = gradleJar.getName().substring(0, indexOfExtension)              //get its name minus the extension
-
-        assert jarName.endsWith(version)  //the name (minus extension) should end with the version
     }
 
     /**
@@ -723,39 +684,38 @@ class OpenApiUiTest {
     }
 
     /**
-     * This tests that you can correctly obtain the number of output tabs from a
-     * dual pane UI. This
+     * This tests that you can correctly obtain the number of output tabs from the ui.
      */
     @Test
-    void testDualPaneOutputPaneNumber() {
+    void testOutputPaneNumber() {
         if (java.awt.GraphicsEnvironment.isHeadless()) {
             return;  // Can't run this test in headless mode!
         }
 
-        DualPaneUIVersion1 dualPane = openApi.createDualPaneUI()
+        SinglePaneUIWrapper panel = openApi.createSinglePaneUI()
 
         //now create a frame, place the UI in it, then show it briefly
-        JFrame frame = openApi.open(dualPane)
+        JFrame frame = openApi.open(panel)
 
         //make sure we got something
-        Assert.assertNotNull(dualPane)
+        Assert.assertNotNull(panel)
 
         //tell it we're about to show it, so it'll create a component
-        dualPane.aboutToShow()
+        panel.aboutToShow()
 
-        dualPane.refreshTaskTree()
+        panel.refreshTaskTree()
 
         openApi.flushEventQueue(frame)
 
         //there should be one opened output tab for the refresh
-        Assert.assertEquals(1, dualPane.getNumberOfOpenedOutputTabs())
+        Assert.assertEquals(1, panel.getNumberOfOpenedOutputTabs())
 
-        dualPane.executeCommand("build", "build")
+        panel.executeCommand("build", "build")
 
         openApi.flushEventQueue(frame)
 
         //there should be 2 opened output tabs. One for refresh, one for build
-        Assert.assertEquals(2, dualPane.getNumberOfOpenedOutputTabs())
+        Assert.assertEquals(2, panel.getNumberOfOpenedOutputTabs())
     }
 
     /**
@@ -769,11 +729,11 @@ class OpenApiUiTest {
      */
     @Test
     void testBusy() {
-        DualPaneUIVersion1 dualPane = openApi.createDualPaneUI()
-        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) dualPane.getGradleInterfaceVersion1()
+        SinglePaneUIVersion1 panel = openApi.createSinglePaneUI()
+        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) panel.getGradleInterfaceVersion1()
 
         //this starts the execution queue. This also initiates a refresh that we'll ignore later.
-        dualPane.aboutToShow()
+        panel.aboutToShow()
 
         //add a request observer so we can observe when the command is finished.
         BlockingRequestObserver testRequestObserver = new BlockingRequestObserver(RequestVersion1.EXECUTION_TYPE)
@@ -782,12 +742,12 @@ class OpenApiUiTest {
         gradleInterface.executeCommand("build", "test command")
 
         //now that there's a real command in the queue, we should be considered busy
-        Assert.assertTrue(dualPane.isBusy())
+        Assert.assertTrue(panel.isBusy())
         Assert.assertTrue(gradleInterface.isBusy())
 
         //we're busy, we shouldn't be able to close
         TestCloseInteraction testCloseInteraction = new TestCloseInteraction(false)
-        Assert.assertFalse(dualPane.canClose(testCloseInteraction))
+        Assert.assertFalse(panel.canClose(testCloseInteraction))
 
         //since we just asked to close and we're busy, make sure we prompted the user
         Assert.assertTrue(testCloseInteraction.wasPromptedToConfirmClose)
@@ -800,12 +760,12 @@ class OpenApiUiTest {
         Assert.assertEquals("Execution failed with return code: " + testRequestObserver.result + "\nOutput:\n" + testRequestObserver.output, 0, testRequestObserver.result)
 
         //make sure we're not longer considered busy
-        Assert.assertFalse(dualPane.isBusy())
+        Assert.assertFalse(panel.isBusy())
         Assert.assertFalse(gradleInterface.isBusy())
 
         //make sure we can close now
         testCloseInteraction = new TestCloseInteraction(false)
-        Assert.assertTrue(dualPane.canClose(testCloseInteraction))
+        Assert.assertTrue(panel.canClose(testCloseInteraction))
 
         //since we just asked to close and we're NOT busy, make sure we did NOT prompt the user
         Assert.assertFalse(testCloseInteraction.wasPromptedToConfirmClose)
@@ -818,8 +778,8 @@ class OpenApiUiTest {
      */
     @Test
     void testSettingCustomGradleExecutor() {
-        DualPaneUIVersion1 dualPane = openApi.createDualPaneUI()
-        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) dualPane.getGradleInterfaceVersion1()
+        SinglePaneUIVersion1 panel = openApi.createSinglePaneUI()
+        GradleInterfaceVersion2 gradleInterface = (GradleInterfaceVersion2) panel.getGradleInterfaceVersion1()
 
         //it should be null by default
         Assert.assertNull(gradleInterface.getCustomGradleExecutable())
@@ -834,16 +794,16 @@ class OpenApiUiTest {
 
         //make sure it was set
         Assert.assertEquals(gradleExecutor, gradleInterface.getCustomGradleExecutable())
-        Assert.assertEquals(gradleExecutor, dualPane.getCustomGradleExecutable()) //just another way to get it
+        Assert.assertEquals(gradleExecutor, panel.getCustomGradleExecutable()) //just another way to get it
 
         //add a request observer so we can observe when the command is finished.
         BlockingRequestObserver testRequestObserver = new BlockingRequestObserver(RequestVersion1.REFRESH_TYPE)
         gradleInterface.addRequestObserver(testRequestObserver)
 
         //this starts the execution queue
-        dualPane.aboutToShow()
+        panel.aboutToShow()
 
-        dualPane.refreshTaskTree()
+        panel.refreshTaskTree()
 
         testRequestObserver.waitForRequestExecutionComplete(80, TimeUnit.SECONDS)
 
@@ -875,7 +835,7 @@ class OpenApiUiTest {
  * A HierarchyListener is how Swing notifies you that a component's visibility has changed.
  * We'll use it to track if the component was shown and then hidden.
  */
-private class TestVisibilityHierarchyListener implements HierarchyListener {
+class TestVisibilityHierarchyListener implements HierarchyListener {
     private boolean componentWasShown = false;
     private boolean componentWasHidden = false;
 
@@ -935,7 +895,7 @@ class TestTab implements GradleTabVersion1 {
  * Class that tracks whether we were prompted to confirm close. It also returns a specific
  * value to that prompt.
  */
-private class TestCloseInteraction implements BasicGradleUIVersion1.CloseInteraction {
+class TestCloseInteraction implements BasicGradleUIVersion1.CloseInteraction {
     boolean wasPromptedToConfirmClose
     boolean promptResult
 
@@ -954,7 +914,7 @@ private class TestCloseInteraction implements BasicGradleUIVersion1.CloseInterac
 /**
  * This appends a specified string to the command line when executing a command.
  */
-private class TestCommandLineArgumentAlteringListenerVersion1 implements CommandLineArgumentAlteringListenerVersion1 {
+class TestCommandLineArgumentAlteringListenerVersion1 implements CommandLineArgumentAlteringListenerVersion1 {
     private final String additionalArguments;
 
     def TestCommandLineArgumentAlteringListenerVersion1(additionalArguments) {
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OutputUILordTest.groovy b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/OutputUILordTest.groovy
similarity index 99%
rename from subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OutputUILordTest.groovy
rename to subprojects/ui/src/integTest/groovy/org/gradle/integtests/OutputUILordTest.groovy
index a6d9cf0f0c97..bc7d6f143592 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/OutputUILordTest.groovy
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/OutputUILordTest.groovy
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests.openapi
+package org.gradle.integtests
 
 import org.gradle.integtests.fixtures.TestResources
 import org.gradle.openapi.external.ui.OutputUILordVersion1
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestAlternateUIInteractionVersion1.java b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestAlternateUIInteractionVersion1.java
similarity index 97%
rename from subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestAlternateUIInteractionVersion1.java
rename to subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestAlternateUIInteractionVersion1.java
index e6ea876073c7..79d284382ce8 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestAlternateUIInteractionVersion1.java
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestAlternateUIInteractionVersion1.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests.openapi;
+package org.gradle.integtests;
 
 import org.gradle.openapi.external.ui.AlternateUIInteractionVersion1;
 
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestSettingsNodeVersion1.java b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestSettingsNodeVersion1.java
similarity index 99%
rename from subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestSettingsNodeVersion1.java
rename to subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestSettingsNodeVersion1.java
index 9ba3cca282b6..b87088340fb1 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestSettingsNodeVersion1.java
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestSettingsNodeVersion1.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests.openapi;
+package org.gradle.integtests;
 
 import org.gradle.openapi.external.ui.SettingsNodeVersion1;
 
diff --git a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestSingleDualPaneUIInteractionVersion1.java b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestSingleDualPaneUIInteractionVersion1.java
similarity index 91%
rename from subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestSingleDualPaneUIInteractionVersion1.java
rename to subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestSingleDualPaneUIInteractionVersion1.java
index 96e8f825fcc0..98ef7c553c82 100644
--- a/subprojects/open-api/src/integTest/groovy/org/gradle/integtests/openapi/TestSingleDualPaneUIInteractionVersion1.java
+++ b/subprojects/ui/src/integTest/groovy/org/gradle/integtests/TestSingleDualPaneUIInteractionVersion1.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.gradle.integtests.openapi;
+package org.gradle.integtests;
 
 import org.gradle.openapi.external.ui.AlternateUIInteractionVersion1;
-import org.gradle.openapi.external.ui.DualPaneUIInteractionVersion1;
 import org.gradle.openapi.external.ui.SettingsNodeVersion1;
 import org.gradle.openapi.external.ui.SinglePaneUIInteractionVersion1;
 
@@ -24,7 +23,7 @@
  * This is a test implementation of both SinglePaneUIInteractionVersion1 and DualPaneUIInteractionVersion1.
  * This is really just a container to hand off more complex interactions to the UI when asked for.
  */
-public class TestSingleDualPaneUIInteractionVersion1 implements SinglePaneUIInteractionVersion1, DualPaneUIInteractionVersion1 {
+public class TestSingleDualPaneUIInteractionVersion1 implements SinglePaneUIInteractionVersion1 {
 
     private AlternateUIInteractionVersion1 alternateUIInteractionVersion1;
     private SettingsNodeVersion1 settingsNodeVersion1;
diff --git a/subprojects/ui/src/main/java/org/gradle/foundation/ProjectConverter.java b/subprojects/ui/src/main/java/org/gradle/foundation/ProjectConverter.java
index 92d96c0c0a2b..8bb3bdd83dbe 100644
--- a/subprojects/ui/src/main/java/org/gradle/foundation/ProjectConverter.java
+++ b/subprojects/ui/src/main/java/org/gradle/foundation/ProjectConverter.java
@@ -17,21 +17,16 @@
 
 import org.gradle.api.Project;
 import org.gradle.api.Task;
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * This converts Gradle's projects into ProjectView objects. These can be safely reused unlike Gradle's projects.
  */
 public class ProjectConverter {
     private List<ProjectView> rootLevelResultingProjects = new ArrayList<ProjectView>();
-    private HashMap<Project, ProjectView> projectMap = new HashMap<Project, ProjectView>();
-    private final Logger logger = Logging.getLogger(ProjectConverter.class);
-
-    public ProjectConverter() {
-    }
 
     /**
      * Call this to convert the projects.
@@ -40,23 +35,19 @@ public ProjectConverter() {
      */
     public List<ProjectView> convertProjects(Project rootProject) {
         rootLevelResultingProjects.clear();
-        projectMap.clear();
 
         addRootLevelProject(rootProject);
 
-        buildDependencies();
-
         return rootLevelResultingProjects;
     }
 
     /**
-     * This adds the specified poject as a root level projects. It then adds all tasks and recursively adds all sub projects.
+     * This adds the specified project as a root level projects. It then adds all tasks and recursively adds all sub projects.
      *
      * @param rootLevelProject a root level project.
      */
     public void addRootLevelProject(Project rootLevelProject) {
         ProjectView rootLevelProjectView = new ProjectView(null, rootLevelProject.getName(), rootLevelProject.getBuildFile(), rootLevelProject.getDescription());
-        projectMap.put(rootLevelProject, rootLevelProjectView);
 
         rootLevelResultingProjects.add(rootLevelProjectView);
 
@@ -77,7 +68,6 @@ private void addSubProjects(Project parentProject, ProjectView parentProjectView
         Collection<Project> subProjects = parentProject.getChildProjects().values();
         for (Project subProject : subProjects) {
             ProjectView projectView = new ProjectView(parentProjectView, subProject.getName(), subProject.getBuildFile(), subProject.getDescription());
-            projectMap.put(subProject, projectView);
 
             addTasks(subProject, projectView);
 
@@ -103,38 +93,4 @@ private void addTasks(Project project, ProjectView projectView) {
             projectView.createTask(taskName, task.getDescription(), isDefault);
         }
     }
-
-    /**
-     * This sets the dependencies on the ProjectViews. We ask the gradle projects for the dependencies and then convert them to ProjectViews. Obviously, this must be done after converting all Projects
-     * to ProjectViews.
-     */
-    private void buildDependencies() {
-        for (Project project : projectMap.keySet()) {
-            ProjectView projectView = projectMap.get(project);
-
-            List<ProjectView> projectViewList = getProjectViews(project.getDependsOnProjects());
-
-            projectView.setDependsOnProjects(projectViewList);
-        }
-    }
-
-    /**
-     * Converts a set of projects to the existing project views. This does not actually instantiate new ProjectView objects.
-     */
-    private List<ProjectView> getProjectViews(Set<Project> projects) {
-        List<ProjectView> views = new ArrayList<ProjectView>();
-
-        Iterator<Project> projectIterator = projects.iterator();
-        while (projectIterator.hasNext()) {
-            Project project = projectIterator.next();
-            ProjectView projectView = projectMap.get(project);
-            if (projectView == null) {
-                logger.error("Missing project: " + project.getName());
-            } else {
-                views.add(projectView);
-            }
-        }
-
-        return views;
-    }
 }
\ No newline at end of file
diff --git a/subprojects/ui/src/main/java/org/gradle/foundation/ProjectView.java b/subprojects/ui/src/main/java/org/gradle/foundation/ProjectView.java
index de3fe026643b..9a7d0791149c 100644
--- a/subprojects/ui/src/main/java/org/gradle/foundation/ProjectView.java
+++ b/subprojects/ui/src/main/java/org/gradle/foundation/ProjectView.java
@@ -34,7 +34,6 @@ public class ProjectView implements Comparable<ProjectView>, Serializable {
     // It is null for the root project.
     private final List<ProjectView> subProjects = new ArrayList<ProjectView>();
     private final List<TaskView> tasks = new ArrayList<TaskView>();
-    private final List<ProjectView> dependsOnProjects = new ArrayList<ProjectView>();
 
     private final File buildFile;
     private final String description;
@@ -91,22 +90,6 @@ public int compareTo(ProjectView otherProject) {
         subProjects.add(subProject);
     }
 
-    /**
-     * Sets the project that this project depends on. This is only meant to be called internally whenever generating a hierachy of projects and tasks.
-     */
-    /*package*/ void setDependsOnProjects(List<ProjectView> newDependsOnProjects) {
-        if (newDependsOnProjects == null) {
-            return;
-        }
-
-        this.dependsOnProjects.clear();
-        this.dependsOnProjects.addAll(newDependsOnProjects);
-    }
-
-    public List<ProjectView> getDependsOnProjects() {
-        return dependsOnProjects;
-    }
-
     public List<TaskView> getTasks() {
         return Collections.unmodifiableList(tasks);
     }
diff --git a/subprojects/ui/src/main/java/org/gradle/foundation/ipc/basic/ClientProcess.java b/subprojects/ui/src/main/java/org/gradle/foundation/ipc/basic/ClientProcess.java
index 5cc8a6205e28..b01dac4ba986 100644
--- a/subprojects/ui/src/main/java/org/gradle/foundation/ipc/basic/ClientProcess.java
+++ b/subprojects/ui/src/main/java/org/gradle/foundation/ipc/basic/ClientProcess.java
@@ -15,12 +15,12 @@
  */
 package org.gradle.foundation.ipc.basic;
 
+import org.gradle.api.UncheckedIOException;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;
 
 import java.io.IOException;
 import java.io.Serializable;
-import java.net.ConnectException;
 import java.net.Socket;
 
 /**
@@ -64,33 +64,26 @@ public ClientProcess(Protocol protocol) {
      * Call this to attempt to connect to the server.
      *
      * @param port where the server is listening. Since it launched this client, it should have either been passed to it on the command line or via a system property (-D).
-     * @return true if we connected to the server, false if not.
      */
-    public boolean start(int port) {
-        Socket clientSocket = null;
+    public void start(int port) {
+        Socket clientSocket;
         try {
             clientSocket = new Socket((String) null, port);
             socketWrapper = new ObjectSocketWrapper(clientSocket);
             if (protocol.serverConnected(clientSocket)) {
-                return true;
+                return;
             }
-
-            logger.error("Failed to connect to server (might not have returned correct connection string): " + port);
-        } catch (ConnectException e) {
-            logger.error("Failed to connect to server: " + port);
-        } catch (Exception e) {
-            logger.error("Failed to connect to server: " + port, e);
+        } catch (IOException e) {
+            throw new UncheckedIOException(String.format("Could not connect to GUI server at port %s.", port), e);
         }
 
         try {
-            if (clientSocket != null) {
-                clientSocket.close();
-            }
+            clientSocket.close();
             socketWrapper = null;
-        } catch (IOException e1) {
-            logger.error("Failed to close socket", e1);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
         }
-        return false;
+        throw new UncheckedIOException("GUI protocol failed to connect.");
     }
 
     /**
diff --git a/subprojects/ui/src/main/java/org/gradle/foundation/ipc/gradle/GradleClient.java b/subprojects/ui/src/main/java/org/gradle/foundation/ipc/gradle/GradleClient.java
index 55825fcab705..3986b5f80bf3 100644
--- a/subprojects/ui/src/main/java/org/gradle/foundation/ipc/gradle/GradleClient.java
+++ b/subprojects/ui/src/main/java/org/gradle/foundation/ipc/gradle/GradleClient.java
@@ -15,9 +15,8 @@
  */
 package org.gradle.foundation.ipc.gradle;
 
-import org.gradle.api.logging.Logger;
-import org.gradle.api.logging.Logging;
 import org.gradle.foundation.ipc.basic.ClientProcess;
+import org.gradle.internal.UncheckedException;
 
 import java.io.Serializable;
 
@@ -28,31 +27,24 @@
  */
 public class GradleClient {
     private ClientProcess clientProcess;
-    private final Logger logger = Logging.getLogger(GradleClient.class);
-
-    public GradleClient() {
-    }
 
     /**
      * Call this to start the client. This version gets the port number as a system property. It does nothing if this property isn't defined.
      *
      * @param protocol the protocol to use to communicate with the server.
-     * @return true if successful, false if not.
      */
-    public boolean start(ClientProcess.Protocol protocol) {
+    public void start(ClientProcess.Protocol protocol) {
         //make sure we've been given the port number to use
         String portText = System.getProperty(ProtocolConstants.PORT_NUMBER_SYSTEM_PROPERTY);
         if (portText == null) {
-            logger.error("No port number specified. Cannot run client");
-            return false;
+            throw new RuntimeException("No port number specified. Cannot run client");
         }
 
         try {
             int port = Integer.parseInt(portText);
-            return start(protocol, port);
+            start(protocol, port);
         } catch (NumberFormatException e) {
-            logger.error("Parsing port '" + portText + "'", e);
-            return false;
+            throw UncheckedException.throwAsUncheckedException(e);
         }
     }
 
@@ -61,16 +53,10 @@ public boolean start(ClientProcess.Protocol protocol) {
      *
      * @param protocol the protocol to use to communicate with the server.
      * @param port the port the server is listening on
-     * @return true if successful, false if not.
      */
-    public boolean start(ClientProcess.Protocol protocol, int port) {
+    public void start(ClientProcess.Protocol protocol, int port) {
         clientProcess = new ClientProcess(protocol);
-
-        if (!clientProcess.start(port)) {
-            return false;
-        }
-
-        return true;
+        clientProcess.start(port);
     }
 
     /**
diff --git a/subprojects/ui/src/main/java/org/gradle/foundation/ipc/gradle/KillGradleServerProtocol.java b/subprojects/ui/src/main/java/org/gradle/foundation/ipc/gradle/KillGradleServerProtocol.java
index 13323c042b84..29bf2e4eadab 100644
--- a/subprojects/ui/src/main/java/org/gradle/foundation/ipc/gradle/KillGradleServerProtocol.java
+++ b/subprojects/ui/src/main/java/org/gradle/foundation/ipc/gradle/KillGradleServerProtocol.java
@@ -22,14 +22,10 @@
  * This protocol is used by a client that launches its own server. See KillGradleClientProtocol.
  */
 public class KillGradleServerProtocol implements Server.Protocol<Server> {
-    private Server server;
-
     public void initialize(Server server) {
-        this.server = server;
     }
 
     public void connectionAccepted() {
-
     }
 
     public boolean continueConnection() {
diff --git a/subprojects/ui/src/main/java/org/gradle/foundation/queue/ExecutionQueue.java b/subprojects/ui/src/main/java/org/gradle/foundation/queue/ExecutionQueue.java
index d23d21fc83a0..886dc2a1ece1 100644
--- a/subprojects/ui/src/main/java/org/gradle/foundation/queue/ExecutionQueue.java
+++ b/subprojects/ui/src/main/java/org/gradle/foundation/queue/ExecutionQueue.java
@@ -112,9 +112,10 @@ private ExecutionThread(ExecutionInteraction<R> executeInteraction) {
         public void run() {
             while (true) {
                 R request = getNextAvailableRequest();
-                if (request != null) {
-                    executeInteraction.execute(request);
+                if (request == null) {
+                    return;
                 }
+                executeInteraction.execute(request);
             }
         }
     }
diff --git a/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/GradlePluginLord.java b/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/GradlePluginLord.java
index bd6290b3477c..e506338a54b0 100644
--- a/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/GradlePluginLord.java
+++ b/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/GradlePluginLord.java
@@ -148,6 +148,9 @@ public GradlePluginLord() {
     }
 
     public File getGradleHomeDirectory() {
+        if (gradleHomeDirectory == null || !gradleHomeDirectory.isDirectory()) {
+            throw new IllegalArgumentException("Could not locate Gradle home directory.");
+        }
         return gradleHomeDirectory;
     }
 
diff --git a/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/request/ExecutionRequest.java b/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/request/ExecutionRequest.java
index d5571e74127e..d3c18a76a3c0 100644
--- a/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/request/ExecutionRequest.java
+++ b/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/request/ExecutionRequest.java
@@ -25,7 +25,7 @@
 import java.io.File;
 
 /**
- * This represents a reques to gradle that is executed in a separate process using the ProcessLauncherServer. This version is for directly executing commands in gradle (the most common type of
+ * This represents a request to gradle that is executed in a separate process using the ProcessLauncherServer. This version is for directly executing commands in gradle (the most common type of
  * request).
  */
 public class ExecutionRequest extends AbstractRequest {
diff --git a/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/runner/GradleRunner.java b/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/runner/GradleRunner.java
deleted file mode 100644
index 87cb23766a78..000000000000
--- a/subprojects/ui/src/main/java/org/gradle/gradleplugin/foundation/runner/GradleRunner.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.gradleplugin.foundation.runner;
-
-import org.gradle.api.logging.LogLevel;
-import org.gradle.foundation.ipc.basic.ProcessLauncherServer;
-import org.gradle.foundation.ipc.gradle.ExecuteGradleCommandServerProtocol;
-import org.gradle.logging.ShowStacktrace;
-
-import java.io.File;
-
-/**
- * This executes a command line in an external process.
- */
-public class GradleRunner {
-    private File currentDirectory;
-    private File gradleHomeDirectory;
-    private File customGradleExecutor;
-    private ProcessLauncherServer server;
-
-    public GradleRunner(File currentDirectory, File gradleHomeDirectory, File customGradleExecutor) {
-        this.currentDirectory = currentDirectory;
-        this.gradleHomeDirectory = gradleHomeDirectory;
-        this.customGradleExecutor = customGradleExecutor;
-    }
-
-    public synchronized void executeCommand(String commandLine, LogLevel logLevel, ShowStacktrace stackTraceLevel,
-                                            ExecuteGradleCommandServerProtocol.ExecutionInteraction executionInteraction) {
-        //the protocol manages the command line and messaging observers
-        ExecuteGradleCommandServerProtocol serverProtocol = new ExecuteGradleCommandServerProtocol(currentDirectory, gradleHomeDirectory, customGradleExecutor, commandLine, logLevel, stackTraceLevel,
-                executionInteraction);
-
-        //the server kicks off gradle as an external process and manages the communication with said process
-        server = new ProcessLauncherServer(serverProtocol);
-        server.addServerObserver(new ProcessLauncherServer.ServerObserver() {
-            public void clientExited(int result, String output) {
-            }
-
-            public void serverExited() {
-                clearServer();
-            }
-        }, false);
-
-        executionInteraction.reportExecutionStarted();  //go ahead and fire off that the execution has started. Normally, this is done by the request, but we don't have a request in this case.
-        server.start();
-    }
-
-    /**
-     * Call this to stop the gradle process.
-     */
-    public synchronized void killProcess() {
-        if (server != null) {
-            server.killProcess();
-        }
-    }
-
-    private synchronized void clearServer() {
-        server = null;
-    }
-}
diff --git a/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/generic/DualPaneUIInstance.java b/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/generic/DualPaneUIInstance.java
deleted file mode 100644
index a1e9e8ff8863..000000000000
--- a/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/generic/DualPaneUIInstance.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.gradleplugin.userinterface.swing.generic;
-
-import org.gradle.gradleplugin.foundation.settings.SettingsNode;
-import org.gradle.gradleplugin.userinterface.AlternateUIInteraction;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * A simple UI for gradle. This has two panels that can be inserted into a stand-alone application or an IDE. This is meant to hide most of the complexities of gradle. The two panes are a tabbed pane
- * for executing tasks and an output pane.
- */
-public class DualPaneUIInstance extends AbstractGradleUIInstance {
-    private OutputPanelLord outputPanelLord;
-
-    public DualPaneUIInstance() {
-    }
-
-    public void initialize(SettingsNode settings, AlternateUIInteraction alternateUIInteraction) {
-
-        outputPanelLord = new OutputPanelLord(gradlePluginLord, alternateUIInteraction);
-
-        super.initialize(settings, alternateUIInteraction);
-    }
-
-    /**
-     * We've overridden this to setup our splitter and our output window.
-     */
-    @Override
-    protected void setupUI() {
-        mainPanel = new JPanel(new BorderLayout());
-        mainPanel.add(createMainGradlePanel(), BorderLayout.CENTER);
-    }
-
-    public OutputUILord getOutputUILord() {
-        return outputPanelLord;
-    }
-
-    public Component getOutputPanel() {
-        return outputPanelLord.getMainPanel();
-    }
-}
diff --git a/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/generic/OutputPanel.java b/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/generic/OutputPanel.java
index 9a52d45e269f..c4c8a01b4430 100644
--- a/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/generic/OutputPanel.java
+++ b/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/generic/OutputPanel.java
@@ -461,7 +461,7 @@ public void run() {
      *
      * @param size the total number of tasks.
      */
-    public void reportNumberOfTasksToExecute(final int size) {  //if we only have a single task, then the intire process will be indeterminately long (it'll just from 0 to 100)
+    public void reportNumberOfTasksToExecute(final int size) {  //if we only have a single task, then the entire process will be indeterminately long (it'll just from 0 to 100)
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 boolean isIndeterminate = size == 1;
diff --git a/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/Application.java b/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/Application.java
index 751e81972d96..16e792c8131a 100644
--- a/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/Application.java
+++ b/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/Application.java
@@ -56,29 +56,12 @@ public class Application implements AlternateUIInteraction {
      * Interface that allows the caller to do post shutdown processing. For example, you may want to exit the VM. You may not.
      */
     public interface LifecycleListener {
-        /**
-         * Notification that the application has started successfully. This is fired within the same thread that instantiates us.
-         */
-        public void hasStarted();
-
         /**
          * Notification that the application has shut down. This is fired from the Event Dispatch Thread.
          */
         public void hasShutDown();
     }
 
-    public static void main(String[] args) {
-        new Application(new LifecycleListener() {
-            public void hasStarted() {
-                //we don't care
-            }
-
-            public void hasShutDown() {
-                System.exit(0);
-            }
-        });
-    }
-
     public Application(LifecycleListener lifecycleListener) {
         this.lifecycleListener = lifecycleListener;
 
@@ -104,8 +87,6 @@ public Application(LifecycleListener lifecycleListener) {
         restoreSettings();
 
         frame.setVisible(true);
-
-        lifecycleListener.hasStarted();  //notify listeners that we have successfully started
     }
 
     private void setupUI() {
diff --git a/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/BlockingApplication.java b/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/BlockingApplication.java
index 1cbd2c55b059..6cd80fa828ec 100644
--- a/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/BlockingApplication.java
+++ b/subprojects/ui/src/main/java/org/gradle/gradleplugin/userinterface/swing/standalone/BlockingApplication.java
@@ -19,6 +19,7 @@
 
 import javax.swing.*;
 import java.lang.reflect.InvocationTargetException;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * This is the same as Application, but this version blocks the calling thread until the Application shuts down.
@@ -34,70 +35,25 @@ public static void launchAndBlock() {
         }
 
         //create a lock to wait on
-        final WaitingLock waitingLock = new WaitingLock();
+        final CountDownLatch completed = new CountDownLatch(1);
 
         //instantiate the app in the Event Dispatch Thread
         try {
             SwingUtilities.invokeAndWait(new Runnable() {
                 public void run() {
                     new Application(new Application.LifecycleListener() {
-                        /**
-                         Notification that the application has started successfully. This is
-                         fired within the same thread that instantiates us.
-                         */
-                        public void hasStarted() {  //only lock if we start
-                            waitingLock.lock();
-                        }
-
-                        /**
-                         Notification that the application has shut down. This is fired from the
-                         Event Dispatch Thread.
-                         */
-                        public void hasShutDown() {  //when we shutdown we'll unlock
-                            waitingLock.unlock();
+                        public void hasShutDown() {
+                            completed.countDown();
                         }
                     });
                 }
             });
+
+            completed.await();
         } catch (InterruptedException e) {
             throw UncheckedException.throwAsUncheckedException(e);
         } catch (InvocationTargetException e) {
             throw UncheckedException.unwrapAndRethrow(e);
         }
-
-        //the calling thread will now block until the caller is complete.
-        waitingLock.waitOnLock();
-    }
-
-    /**
-     * Lock so the calling thread can wait on the Application to exit.
-     */
-    private static class WaitingLock {
-        private boolean isLocked;
-
-        public synchronized void lock() {
-            isLocked = true;
-
-            //Notify status has changed.
-            notifyAll();
-        }
-
-        public synchronized void unlock() {
-            isLocked = false;
-
-            //Notify status has changed.
-            notifyAll();
-        }
-
-        public synchronized void waitOnLock() {
-            //Wait only if we're locked
-            while (isLocked) {
-                try {
-                    wait();
-                } catch (InterruptedException e) {
-                    throw new UncheckedException(e);
-                }
-            }
-        }
     }
 }
diff --git a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/NoLongerSupportedException.java b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/NoLongerSupportedException.java
new file mode 100644
index 000000000000..40983f537d15
--- /dev/null
+++ b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/NoLongerSupportedException.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * 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.
+ */
+
+package org.gradle.openapi.wrappers;
+
+public class NoLongerSupportedException extends UnsupportedOperationException {
+    public NoLongerSupportedException() {
+        super("Support for the Gradle Open API was removed in the Gradle 2.0 release. You should use the Gradle tooling API instead.");
+    }
+}
diff --git a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/RunnerWrapperFactory.java b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/RunnerWrapperFactory.java
deleted file mode 100644
index 8ec718a2d3ba..000000000000
--- a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/RunnerWrapperFactory.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.wrappers;
-
-import org.gradle.openapi.external.runner.GradleRunnerInteractionVersion1;
-import org.gradle.openapi.external.runner.GradleRunnerVersion1;
-import org.gradle.openapi.wrappers.runner.GradleRunnerWrapper;
-
-import java.io.File;
-
-/**
- * This factory instantiates GradleRunnerWrappers by an external process. It is meant to be called via the Open API GradleRunnerFactory class using reflection. This is because it is called
- * dynamically. It is also meant to help shield a Gradle user from changes to different versions of the GradleRunner. It does so by using wrappers that can dynamically choose what/how to implement.
- * The wrappers usually use the latest, however, some of the functionality requires a matching Open API jar (which will be included with the external process trying to use this). If the matching
- * functionality is not found (a NoClassDefFoundError is thrown), it will fall back to earlier versions.
- *
- * This class should not be moved or renamed, nor should its functions be renamed or have arguments added to/removed from them. This is to ensure forward/backward compatibility with multiple versions
- * of IDE plugins. Instead, consider changing the interaction that is passed to the functions as a means of having the caller provide different functionality.
- */
-public class RunnerWrapperFactory {
-
-    /*
-      Call this to instantiate an object that you can use to execute gradle
-      commands directly.
-
-      Note: this function is meant to be backward and forward compatible. So
-      this signature should not change at all, however, it may take and return
-      objects that implement ADDITIONAL interfaces. That is, it will always
-      return a GradleRunnerVersion1, but it may also be an object that implements
-      GradleRunnerVersion2 (notice the 2). The caller will need to dynamically
-      determine that. The GradleRunnerInteractionVersion1 may take an object
-      that also implements GradleRunnerInteractionVersion2. If so, we'll
-      dynamically determine that and handle it. Of course, this all depends on
-      what happens in the future.
-
-      @param  gradleHomeDirectory  the root directory of a gradle installation
-      @param  interaction          this is how we interact with the caller.
-      @param  showDebugInfo        true to show some additional information that
-                                   may be helpful diagnosing problems is this
-                                   fails
-      @return a gradle runner
-   */
-    public static GradleRunnerVersion1 createGradleRunner(File gradleHomeDirectory, GradleRunnerInteractionVersion1 interaction, boolean showDebugInfo) throws Exception {
-        return new GradleRunnerWrapper(gradleHomeDirectory, interaction);
-    }
-}
diff --git a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/UIWrapperFactory.java b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/UIWrapperFactory.java
deleted file mode 100644
index 138f497b6243..000000000000
--- a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/UIWrapperFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2010 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.wrappers;
-
-import org.gradle.openapi.external.ui.DualPaneUIInteractionVersion1;
-import org.gradle.openapi.external.ui.DualPaneUIVersion1;
-import org.gradle.openapi.external.ui.SinglePaneUIInteractionVersion1;
-import org.gradle.openapi.external.ui.SinglePaneUIVersion1;
-import org.gradle.openapi.wrappers.ui.DualPaneUIWrapper;
-import org.gradle.openapi.wrappers.ui.SinglePaneUIWrapper;
-
-/**
- * This factory instantiates Gradle UIs used in IDE plugins. It is meant to be called via the Open API UIFactory class using reflection. This is because it is called dynamically. It is also meant to
- * help shield a Gradle user from changes to different versions of UI. It does so by using wrappers that can dynamically choose what/how to implement. The wrappers usually use the latest, however,
- * some of the functionality requires a matching Open API jar (which will be included with the plugin trying to use this). If the matching functionality is not found (a NoClassDefFoundError is
- * thrown), it will fall back to earlier versions.
- *
- * This class should not be moved or renamed, nor should its functions be renamed or have arguments added to/removed from them. This is to ensure forward/backward compatibility with multiple versions
- * of IDE plugins. Instead, consider changing the interaction that is passed to the functions as a means of having the caller provide different functionality.
- */
-public class UIWrapperFactory {
-
-    /**
-     * Creates a single-pane Gradle UI. The main UI and output panes are self-contained.
-     *
-     * @param interaction this is how we interact with the caller.
-     * @param showDebugInfo true to show some additional information that may be helpful diagnosing problems is this fails
-     * @return a single pane UI.
-     */
-    public static SinglePaneUIVersion1 createSinglePaneUI(final SinglePaneUIInteractionVersion1 interaction, boolean showDebugInfo) throws Exception {
-        return new SinglePaneUIWrapper(interaction);
-    }
-
-    /**
-     * Creates a dual-pane Gradle UI, consisting of a main panel (containing task tree, favorites, etc) and a separate panel containing the output.
-     *
-     * @param interaction this is how we interact with the caller.
-     * @param showDebugInfo true to show some additional information that may be helpful diagnosing problems is this fails
-     * @return a dual pane UI.
-     */
-    public static DualPaneUIVersion1 createDualPaneUI(final DualPaneUIInteractionVersion1 interaction, boolean showDebugInfo) throws Exception {
-        return new DualPaneUIWrapper(interaction);
-    }
-}
diff --git a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/foundation/ProjectWrapper.java b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/foundation/ProjectWrapper.java
index 1168f8d9011e..cf184491076e 100644
--- a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/foundation/ProjectWrapper.java
+++ b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/foundation/ProjectWrapper.java
@@ -22,6 +22,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
@@ -57,7 +58,7 @@ public ProjectVersion1 getParentProject() {
     }
 
     public List<ProjectVersion1> getDependantProjects() {
-        return convertProjects(projectView.getDependsOnProjects());
+        return Collections.emptyList();
     }
 
     public ProjectVersion1 getSubProject(String name) {
diff --git a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/runner/GradleRunnerInteractionWrapper.java b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/runner/GradleRunnerInteractionWrapper.java
deleted file mode 100644
index 11df9518a2b4..000000000000
--- a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/runner/GradleRunnerInteractionWrapper.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright 2009 the original author or authors.
- *
- * 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.
- */
-package org.gradle.openapi.wrappers.runner;
-
-import org.gradle.api.logging.LogLevel;
-import org.gradle.foundation.ipc.gradle.ExecuteGradleCommandServerProtocol;
-import org.gradle.logging.ShowStacktrace;
-import org.gradle.openapi.external.runner.GradleRunnerInteractionVersion1;
-
-import java.io.File;
-
-/**
- * Wrapper to shield version changes in GradleRunnerInteractionVersion1 from an external user of gradle open API.
- */
-public class GradleRunnerInteractionWrapper implements ExecuteGradleCommandServerProtocol.ExecutionInteraction {
-    private GradleRunnerInteractionVersion1 interactionVersion1;
-
-    public GradleRunnerInteractionWrapper(GradleRunnerInteractionVersion1 interactionVersion1) {
-        this.interactionVersion1 = interactionVersion1;
-    }
-
-    /**
-     * @return the log level. This determines the detail level of information reported via reportLiveOutput and reportExecutionFinished.
-     */
-    public LogLevel getLogLevel() {
-        GradleRunnerInteractionVersion1.LogLevel logLevel = interactionVersion1.getLogLevel();
-        switch (logLevel) {
-            case Quiet:
-                return LogLevel.QUIET;
-            case Lifecycle:
-                return LogLevel.LIFECYCLE;
-            case Debug:
-                return LogLevel.DEBUG;
-        }
-
-        return LogLevel.LIFECYCLE;
-    }
-
-    /**
-     * @return the stack trace level. This determines the detail level of any stack traces should an exception occur.
-     */
-    public ShowStacktrace getStackTraceLevel() {
-        GradleRunnerInteractionVersion1.StackTraceLevel stackTraceLevel = interactionVersion1.getStackTraceLevel();
-        switch (stackTraceLevel) {
-            case InternalExceptions:
-                return ShowStacktrace.INTERNAL_EXCEPTIONS;
-            case Always:
-                return ShowStacktrace.ALWAYS;
-            case AlwaysFull:
-                return ShowStacktrace.ALWAYS_FULL;
-        }
-
-        return ShowStacktrace.INTERNAL_EXCEPTIONS;
-    }
-
-    /**
-     * Notification that overall execution has been started. This is only called once at the end.
-     */
-    public void reportExecutionStarted() {
-        this.interactionVersion1.reportExecutionStarted();
-    }
-
-    /**
-     * Notification of the total number of tasks that will be executed. This is called after reportExecutionStarted and before any tasks are executed.
-     *
-     * @param size the total number of tasks.
-     */
-    public void reportNumberOfTasksToExecute(int size) {
-        this.interactionVersion1.reportNumberOfTasksToExecute(size);
-    }
-
-    /**
-     * Notification that a single task has completed. Note: the task you kicked off probably executes other tasks and this notifies you of those tasks and provides completion progress.
-     *
-     * @param currentTaskName the task being executed
-     * @param percentComplete the percent complete of all the tasks that make up the task you requested.
-     */
-    public void reportTaskStarted(String currentTaskName, float percentComplete) {
-        this.interactionVersion1.reportTaskStarted(currentTaskName, percentComplete);
-    }
-
-    public void reportTaskComplete(String currentTaskName, float percentComplete) {
-        this.interactionVersion1.reportTaskComplete(currentTaskName, percentComplete);
-    }
-
-    /**
-     * Report real-time output from gradle and its subsystems (such as ant).
-     *
-     * @param output a single line of text to show.
-     */
-    public void reportLiveOutput(String output) {
-        this.interactionVersion1.reportLiveOutput(output);
-    }
-
-    public void reportExecutionFinished(boolean wasSuccessful, String message, Throwable throwable) {
-        this.interactionVersion1.reportExecutionFinished(wasSuccessful, message, throwable);
-    }
-
-    /*
-    * This is called to get a custom gradle executable file. If you don't run
-    * gradle.bat or gradle shell script to run gradle, use this to specify
-    * what you do run. Note: we're going to pass it the arguments that we would
-    * pass to gradle so if you don't like that, see alterCommandLineArguments.
-    * Normaly, this should return null.
-    * @return the Executable to run gradle command or null to use the default
-    */
-    public File getCustomGradleExecutable() {
-        return interactionVersion1.getCustomGradleExecutable();
-    }
-}
diff --git a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/runner/GradleRunnerWrapper.java b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/runner/GradleRunnerWrapper.java
index f3eb7bd99365..9b93689b175b 100644
--- a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/runner/GradleRunnerWrapper.java
+++ b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/runner/GradleRunnerWrapper.java
@@ -15,40 +15,16 @@
  */
 package org.gradle.openapi.wrappers.runner;
 
-import org.gradle.gradleplugin.foundation.runner.GradleRunner;
 import org.gradle.openapi.external.runner.GradleRunnerInteractionVersion1;
-import org.gradle.openapi.external.runner.GradleRunnerVersion1;
+import org.gradle.openapi.wrappers.NoLongerSupportedException;
 
 import java.io.File;
 
 /**
- * Wrapper to shield version changes in GradleRunner from an external user of gradle open API.
+ * Entry point for the open API. No longer usable but still implemented so that old clients receive a decent error message.
  */
-public class GradleRunnerWrapper implements GradleRunnerVersion1 {
-    private GradleRunner gradleRunner;
-    private File gradleHomeDirectory;
-    private File workingDirectory;
-    private GradleRunnerInteractionWrapper interactionWrapper;
-
+public class GradleRunnerWrapper {
     public GradleRunnerWrapper(File gradleHomeDirectory, GradleRunnerInteractionVersion1 interactionVersion1) {
-        this.gradleHomeDirectory = gradleHomeDirectory;
-        this.workingDirectory = interactionVersion1.getWorkingDirectory();
-        interactionWrapper = new GradleRunnerInteractionWrapper(interactionVersion1);
-        File customGradleExecutable = interactionVersion1.getCustomGradleExecutable();
-
-        gradleRunner = new GradleRunner(workingDirectory, gradleHomeDirectory, customGradleExecutable);
-    }
-
-    public void executeCommand(String commandLine) {
-        gradleRunner.executeCommand(commandLine, interactionWrapper.getLogLevel(), interactionWrapper.getStackTraceLevel(), interactionWrapper);
-    }
-
-    /*
-       Call this to stop the gradle command. This is killing the process, not
-       gracefully exiting.
-    */
-
-    public void killProcess() {
-        gradleRunner.killProcess();
+        throw new NoLongerSupportedException();
     }
 }
diff --git a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/ui/DualPaneUIWrapper.java b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/ui/DualPaneUIWrapper.java
index 700512046487..ec1de42f38b3 100644
--- a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/ui/DualPaneUIWrapper.java
+++ b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/ui/DualPaneUIWrapper.java
@@ -15,47 +15,14 @@
  */
 package org.gradle.openapi.wrappers.ui;
 
-import org.gradle.gradleplugin.userinterface.swing.generic.DualPaneUIInstance;
 import org.gradle.openapi.external.ui.DualPaneUIInteractionVersion1;
-import org.gradle.openapi.external.ui.DualPaneUIVersion1;
-
-import javax.swing.*;
-import java.awt.*;
+import org.gradle.openapi.wrappers.NoLongerSupportedException;
 
 /**
- * This wraps a DualPaneUIVersion1 for the purpose of being instantiated for an external tool such an IDE plugin. It wraps several interfaces and uses delegation in an effort to make this backward and
- * forward compatible. Most of the work is done in AbstractOpenAPIUIWrapper
+ * Entry point for the open API. No longer usable but still implemented so that old clients receive a decent error message.
  */
-public class DualPaneUIWrapper extends AbstractOpenAPIUIWrapper<DualPaneUIInstance> implements DualPaneUIVersion1 {
+public class DualPaneUIWrapper {
     public DualPaneUIWrapper(DualPaneUIInteractionVersion1 dualPaneUIArguments) {
-
-        super(dualPaneUIArguments.instantiateSettings(), dualPaneUIArguments.instantiateAlternateUIInteraction());
-
-        //the main thing this does in instantiate the DualPaneUIInstance.
-        DualPaneUIInstance uiInstance = new DualPaneUIInstance();
-        uiInstance.initialize(settingsVersionWrapper, alternateUIInteractionVersionWrapper);
-        initialize(uiInstance);
-    }
-
-    /**
-     * Returns a component that shows the task tree tab, favorites tab, etc. suitable for inserting in your UI.
-     *
-     * @return the main component
-     */
-    public JComponent getMainComponent() {
-        return getGradleUI().getComponent();
-    }
-
-    /**
-     * Returns a component that shows the output of the tasks being executed.
-     *
-     * @return the output component
-     */
-    public Component getOutputPanel() {
-        return getGradleUI().getOutputPanel();
-    }
-
-    public int getNumberOfOpenedOutputTabs() {
-        return getGradleUI().getOutputUILord().getTabCount();
+        throw new NoLongerSupportedException();
     }
 }
diff --git a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/ui/SinglePaneUIWrapper.java b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/ui/SinglePaneUIWrapper.java
index 442f96aa82be..82c3a7175922 100644
--- a/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/ui/SinglePaneUIWrapper.java
+++ b/subprojects/ui/src/main/java/org/gradle/openapi/wrappers/ui/SinglePaneUIWrapper.java
@@ -16,8 +16,10 @@
 package org.gradle.openapi.wrappers.ui;
 
 import org.gradle.gradleplugin.userinterface.swing.generic.SinglePaneUIInstance;
+import org.gradle.openapi.external.ui.SettingsNodeVersion1;
 import org.gradle.openapi.external.ui.SinglePaneUIInteractionVersion1;
 import org.gradle.openapi.external.ui.SinglePaneUIVersion1;
+import org.gradle.openapi.wrappers.NoLongerSupportedException;
 
 import javax.swing.*;
 
@@ -27,6 +29,17 @@
  */
 public class SinglePaneUIWrapper extends AbstractOpenAPIUIWrapper<SinglePaneUIInstance> implements SinglePaneUIVersion1 {
     public SinglePaneUIWrapper(SinglePaneUIInteractionVersion1 singlePaneUIArguments) {
+        super(notSupported(), null);
+    }
+
+    private static SettingsNodeVersion1 notSupported() {
+        throw new NoLongerSupportedException();
+    }
+
+    /**
+     * The open API uses the other constructor.
+     */
+    public SinglePaneUIWrapper(SinglePaneUIInteractionVersion1 singlePaneUIArguments, boolean dummy) {
 
         super(singlePaneUIArguments.instantiateSettings(), singlePaneUIArguments.instantiateAlternateUIInteraction());
 
@@ -36,6 +49,10 @@ public SinglePaneUIWrapper(SinglePaneUIInteractionVersion1 singlePaneUIArguments
         initialize(singlePaneUIInstance);
     }
 
+    public int getNumberOfOpenedOutputTabs() {
+        return getGradleUI().getOutputUILord().getTabCount();
+    }
+
     /**
      * Returns this panel as a Swing object suitable for inserting in your UI.
      *
diff --git a/subprojects/ui/src/test/groovy/org/gradle/foundation/FileLinkTests.java b/subprojects/ui/src/test/groovy/org/gradle/foundation/FileLinkTests.java
index a5de7b414133..9371366414a2 100644
--- a/subprojects/ui/src/test/groovy/org/gradle/foundation/FileLinkTests.java
+++ b/subprojects/ui/src/test/groovy/org/gradle/foundation/FileLinkTests.java
@@ -155,7 +155,7 @@ public void testOffByOneCharacterBug() {
 
    /**
       This test that test reports file is found. This is a special case since we're not given
-      the actual file path and instead given only its parent path. The code assumes the report file
+      the actual file path and instead given only its root path. The code assumes the report file
       is present.
       */
    public void testFailedTestsReportFile() {
diff --git a/subprojects/ui/src/test/groovy/org/gradle/foundation/ProjectConverterTest.groovy b/subprojects/ui/src/test/groovy/org/gradle/foundation/ProjectConverterTest.groovy
index d534bc59ad00..1b7054b77d87 100644
--- a/subprojects/ui/src/test/groovy/org/gradle/foundation/ProjectConverterTest.groovy
+++ b/subprojects/ui/src/test/groovy/org/gradle/foundation/ProjectConverterTest.groovy
@@ -99,7 +99,6 @@ class ProjectConverterTest extends Specification {
         _ * project.tasks >> taskContainer
         _ * project.defaultTasks >> []
         _ * taskContainer.iterator() >> tasks.iterator()
-        _ * project.dependsOnProjects >> []
         _ * project.childProjects >> subprojects.inject([:]) { v, p -> v[p.name] = p; v }
         return project
     }
diff --git a/subprojects/ui/src/test/groovy/org/gradle/foundation/TestUtility.java b/subprojects/ui/src/test/groovy/org/gradle/foundation/TestUtility.java
index 4ff7bd5a044e..6129bca928d8 100644
--- a/subprojects/ui/src/test/groovy/org/gradle/foundation/TestUtility.java
+++ b/subprojects/ui/src/test/groovy/org/gradle/foundation/TestUtility.java
@@ -65,17 +65,16 @@ public static Project createMockProject(JUnit4Mockery context, final String name
         attachSubProjects(context, project, subProjectArray);
         attachTasks(context, project, tasks);
         assignDefaultTasks(context, project, defaultTasks);
-        assignDependsOnProjects(context, project, dependsOnProjects);
 
         return project;
     }
 
     /**
-     * This makes the sub projects children of the parent project. If you call this repeatedly on the same parentProject, any previous sub projects will be replaced with the new ones.
+     * This makes the sub projects children of the root project. If you call this repeatedly on the same parentProject, any previous sub projects will be replaced with the new ones.
      *
      * @param context the mock context
      * @param parentProject where to attach the sub projects. This must be a mock object.
-     * @param subProjectArray the sub projects to attach to the parent. These must be mock objects. Pass in null or an empty array to set no sub projects.
+     * @param subProjectArray the sub projects to attach to the root. These must be mock objects. Pass in null or an empty array to set no sub projects.
      */
     public static void attachSubProjects(JUnit4Mockery context, final Project parentProject, Project... subProjectArray) {
         final Map<String, Project> childProjects = new LinkedHashMap<String, Project>();
@@ -113,11 +112,11 @@ public static Task createTask(JUnit4Mockery context, final String name, final St
     }
 
     /**
-     * This makes the tasks children of the parent project. If you call this repeatedly on the same parentProject, any previous tasks will be replaced with the new ones.
+     * This makes the tasks children of the root project. If you call this repeatedly on the same parentProject, any previous tasks will be replaced with the new ones.
      *
      * @param context the mock context
      * @param parentProject where to attach the sub projects. This must be a mock object.
-     * @param taskArray the tasks to attach to the parent. these must be mock objects. Pass in null or an empty array to set no tasks.
+     * @param taskArray the tasks to attach to the root. these must be mock objects. Pass in null or an empty array to set no tasks.
      */
     public static void attachTasks(JUnit4Mockery context, final Project parentProject, Task... taskArray) {
         //first, make our project return our task container
@@ -134,7 +133,7 @@ public static void attachTasks(JUnit4Mockery context, final Project parentProjec
         if (taskArray != null && taskArray.length != 0) {
             set.addAll(Arrays.asList(taskArray));
 
-            //set the parent project of the tasks
+            //set the root project of the tasks
             for (int index = 0; index < taskArray.length; index++) {
                 final Task task = taskArray[index];
 
@@ -165,21 +164,6 @@ private static void assignDefaultTasks(JUnit4Mockery context, final Project proj
         }});
     }
 
-    private static void assignDependsOnProjects(JUnit4Mockery context, final Project project, final Project... dependsOnProjects) {
-        final Set<Project> set
-                = new LinkedHashSet<Project>();   //using a LinkedHashSet rather than TreeSet (which is what gradle uses) so I don't have to deal with compareTo() being called on mock objects.
-
-        if (dependsOnProjects != null && dependsOnProjects.length != 0) {
-            set.addAll(Arrays.asList(dependsOnProjects));
-        }
-
-        //populate the subprojects (this may be an empty set)
-        context.checking(new Expectations() {{
-            allowing(project).getDependsOnProjects();
-            will(returnValue(set));
-        }});
-    }
-
     public static <T> void assertListContents(List<T> actualObjects, T... expectedObjectsArray) {
         assertListContents(actualObjects, Arrays.asList(expectedObjectsArray));
     }
diff --git a/subprojects/wrapper/src/main/java/org/gradle/wrapper/ExclusiveFileAccessManager.java b/subprojects/wrapper/src/main/java/org/gradle/wrapper/ExclusiveFileAccessManager.java
index f63ef49fb652..880bcdc664d6 100644
--- a/subprojects/wrapper/src/main/java/org/gradle/wrapper/ExclusiveFileAccessManager.java
+++ b/subprojects/wrapper/src/main/java/org/gradle/wrapper/ExclusiveFileAccessManager.java
@@ -35,7 +35,7 @@ public ExclusiveFileAccessManager(int timeoutMs, int pollIntervalMs) {
         this.pollIntervalMs = pollIntervalMs;
     }
 
-    public <T> T access(File exclusiveFile, Callable<T> task) {
+    public <T> T access(File exclusiveFile, Callable<T> task) throws Exception {
         final File lockFile = new File(exclusiveFile.getParentFile(), exclusiveFile.getName() + LOCK_FILE_SUFFIX);
         lockFile.getParentFile().mkdirs();
         RandomAccessFile randomAccessFile = null;
@@ -71,12 +71,6 @@ public <T> T access(File exclusiveFile, Callable<T> task) {
                 maybeCloseQuietly(randomAccessFile);
                 randomAccessFile = null;
             }
-        } catch (Exception e) {
-            if (e instanceof RuntimeException) {
-                throw (RuntimeException) e;
-            } else {
-                throw new RuntimeException(e);
-            }
         } finally {
             maybeCloseQuietly(channel);
             maybeCloseQuietly(randomAccessFile);
diff --git a/subprojects/wrapper/src/main/java/org/gradle/wrapper/GradleWrapperMain.java b/subprojects/wrapper/src/main/java/org/gradle/wrapper/GradleWrapperMain.java
index d2cb34bcb642..fbc072d1e7ec 100644
--- a/subprojects/wrapper/src/main/java/org/gradle/wrapper/GradleWrapperMain.java
+++ b/subprojects/wrapper/src/main/java/org/gradle/wrapper/GradleWrapperMain.java
@@ -24,6 +24,7 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.HashMap;
 import java.util.Properties;
 
 public class GradleWrapperMain {
@@ -45,7 +46,7 @@ public static void main(String[] args) throws Exception {
         ParsedCommandLine options = parser.parse(args);
 
         Properties systemProperties = System.getProperties();
-        systemProperties.putAll(converter.convert(options));
+        systemProperties.putAll(converter.convert(options, new HashMap<String, String>()));
 
         File gradleUserHome = gradleUserHome(options);
 
diff --git a/version.txt b/version.txt
index 809bdcb851df..cd5ac039d67e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.12
+2.0