Adding the capability to base the "exported" attribute of Eclipse classpath entries on what configuration(s) they came from

subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/EclipsePlugin.groovy

@@ -155,6 +155,7 @@ class EclipsePlugin extends IdePlugin {
 
                 project.plugins.withType(JavaPlugin) {
                     classpath.plusConfigurations = [project.configurations.testRuntime]
+                    classpath.noExportConfigNames += [project.configurations.testCompile.name, project.configurations.testRuntime.name]
                     classpath.conventionMapping.classFolders = {
                         def dirs = project.sourceSets.main.output.dirs + project.sourceSets.test.output.dirs
                         dirs.collect { project.relativePath(it)} .findAll { !it.contains('..') }

subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/AbstractClasspathEntry.groovy

@@ -119,7 +119,6 @@ abstract class AbstractClasspathEntry implements ClasspathEntry {
 
         AbstractClasspathEntry that = (AbstractClasspathEntry) o;
 
-        if (exported != that.exported) { return false }
         if (accessRules != that.accessRules) { return false }
         if (nativeLibraryLocation != that.nativeLibraryLocation) { return false }
         if (path != that.path) { return false }
@@ -132,7 +131,6 @@ abstract class AbstractClasspathEntry implements ClasspathEntry {
 
         result = path.hashCode();
         result = 31 * result + (nativeLibraryLocation != null ? nativeLibraryLocation.hashCode() : 0);
-        result = 31 * result + (exported ? 1 : 0);
         result = 31 * result + accessRules.hashCode();
         return result;
     }

subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/AbstractLibrary.groovy

@@ -52,7 +52,6 @@ abstract class AbstractLibrary extends AbstractClasspathEntry {
 
         AbstractLibrary that = (AbstractLibrary) o;
 
-        if (exported != that.exported) { return false }
         if (accessRules != that.accessRules) { return false }
         if (javadocPath != that.javadocPath) { return false }
         if (nativeLibraryLocation != that.nativeLibraryLocation) { return false }
@@ -67,7 +66,6 @@ abstract class AbstractLibrary extends AbstractClasspathEntry {
 
         result = path.hashCode();
         result = 31 * result + (nativeLibraryLocation != null ? nativeLibraryLocation.hashCode() : 0);
-        result = 31 * result + (exported ? 1 : 0);
         result = 31 * result + accessRules.hashCode();
         result = 31 * result + (sourcePath != null ? sourcePath.hashCode() : 0);
         result = 31 * result + (javadocPath != null ? javadocPath.hashCode() : 0);

subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/EclipseClasspath.groovy

@@ -48,6 +48,9 @@ import org.gradle.util.ConfigureUtil
  *     //you can also remove configurations from the classpath:
  *     minusConfigurations += configurations.someBoringConfig
  *
+ *     //you can make some classpath entries not be exported by Eclipse by choosing configuration names:
+ *     noExportConfigNames += 'provided'
+ *
  *     //if you want to append extra containers:
  *     containers 'someFriendlyContainer', 'andYetAnotherContainer'
  *
@@ -123,6 +126,17 @@ class EclipseClasspath {
      */
     Collection<Configuration> minusConfigurations = []
 
+    /**
+     * The names of configurations whose classpath entries should not be exported to other Eclipse
+     * projects. By default this collection contains 'testCompile' and 'testRuntime'.
+     * <p>
+     * Note that if a class path entry comes from two or more configurations, any of which is
+     * exported, then the entry is exported.
+     * <p>
+     * For example see docs for {@link EclipseClasspath}
+     */
+    Collection<String> noExportConfigNames = []
+
    /**
      * Containers to be added to the classpath
      * <p>

subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/SourceFolder.groovy

@@ -69,7 +69,6 @@ class SourceFolder extends AbstractClasspathEntry {
 
         SourceFolder that = (SourceFolder) o;
 
-        if (exported != that.exported) { return false }
         if (accessRules != that.accessRules) { return false }
         if (excludes != that.excludes) { return false }
         if (includes != that.includes) { return false }
@@ -86,7 +85,6 @@ class SourceFolder extends AbstractClasspathEntry {
 
         result = path.hashCode();
         result = 31 * result + (nativeLibraryLocation != null ? nativeLibraryLocation.hashCode() : 0);
-        result = 31 * result + (exported ? 1 : 0);
         result = 31 * result + accessRules.hashCode();
         result = 31 * result + (output != null ? output.hashCode() : 0);
         result = 31 * result + excludes.hashCode();

subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/ClasspathFactory.groovy

@@ -53,7 +53,7 @@ class ClasspathFactory {
 
     protected List getModules(EclipseClasspath classpath) {
         return getDependencies(classpath.plusConfigurations, classpath.minusConfigurations, { it instanceof org.gradle.api.artifacts.ProjectDependency })
-                .collect { projectDependency -> new ProjectDependencyBuilder().build(projectDependency.dependencyProject) }
+                .collect { projectDependency -> new ProjectDependencyBuilder().build(projectDependency.dependencyProject, isExported(projectDependency, classpath)) }
     }
 
     protected Set getLibraries(EclipseClasspath classpath) {
@@ -69,35 +69,35 @@ class ClasspathFactory {
         }
         Map javadocFiles = classpath.downloadJavadoc ? getFiles(classpath.project, javadocDependencies, "javadoc") : [:]
 
-        List moduleLibraries = resolveFiles(classpath.plusConfigurations, classpath.minusConfigurations).collect { File binaryFile ->
+        Set moduleLibraries = resolveFromFiles(classpath.plusConfigurations, classpath.minusConfigurations, { File binaryFile, Dependency dependency ->
             File sourceFile = sourceFiles[binaryFile.name]
             File javadocFile = javadocFiles[binaryFile.name]
-            createLibraryEntry(binaryFile, sourceFile, javadocFile, classpath.pathVariables)
-        }
+            createLibraryEntry(binaryFile, sourceFile, javadocFile, classpath.pathVariables, isExported(dependency, classpath))
+        })
         moduleLibraries.addAll(getSelfResolvingFiles(getDependencies(classpath.plusConfigurations, classpath.minusConfigurations,
-                { it instanceof SelfResolvingDependency && !(it instanceof org.gradle.api.artifacts.ProjectDependency)}), classpath.pathVariables))
+                { it instanceof SelfResolvingDependency && !(it instanceof org.gradle.api.artifacts.ProjectDependency)}), classpath))
         moduleLibraries
     }
 
-    private getSelfResolvingFiles(Collection dependencies, Map<String, File> pathVariables) {
+    private getSelfResolvingFiles(Collection dependencies, EclipseClasspath classpath) {
         dependencies.collect { SelfResolvingDependency dependency ->
             dependency.resolve().collect { File file ->
-                createLibraryEntry(file, null, null, pathVariables)
+                createLibraryEntry(file, null, null, classpath.pathVariables, isExported(dependency, classpath))
             }
         }.flatten()
     }
 
-    AbstractLibrary createLibraryEntry(File binary, File source, File javadoc, Map<String, File> pathVariables) {
+    AbstractLibrary createLibraryEntry(File binary, File source, File javadoc, Map<String, File> pathVariables, boolean exported) {
         def usedVariableEntry = pathVariables.find { String name, File value -> binary.canonicalPath.startsWith(value.canonicalPath) }
         if (usedVariableEntry) {
             String name = usedVariableEntry.key
             String value = usedVariableEntry.value.canonicalPath
             String binaryPath = name + binary.canonicalPath.substring(value.length())
             String sourcePath = source ? name + source.canonicalPath.substring(value.length()) : null
             String javadocPath = javadoc ? name + javadoc.canonicalPath.substring(value.length()) : null
-            return new Variable(binaryPath, true, null, [] as Set, sourcePath, javadocPath)
+            return new Variable(binaryPath, exported, null, [] as Set, sourcePath, javadocPath)
         }
-        new Library(binary.canonicalPath, true, null, [] as Set, source ? source.canonicalPath : null, javadoc ? javadoc.canonicalPath : null)
+        new Library(binary.canonicalPath, exported, null, [] as Set, source ? source.canonicalPath : null, javadoc ? javadoc.canonicalPath : null)
     }
 
     private Set<Dependency> getDependencies(Collection<Configuration> plusConfigurations, Collection<Configuration> minusConfigurations, Closure filter) {
@@ -122,17 +122,35 @@ class ClasspathFactory {
         result
     }
 
-    private Set<File> resolveFiles(Collection<Configuration> plusConfigurations, Collection<Configuration> minusConfigurations) {
+    private Set<AbstractLibrary> resolveFromFiles(Collection<Configuration> plusConfigurations, Collection<Configuration> minusConfigurations, Closure generator) {
         def result = new LinkedHashSet()
+        def dependencies = getDependencies(plusConfigurations, minusConfigurations, { it instanceof ExternalDependency })
         for (plusConfiguration in plusConfigurations) {
-            result.addAll(plusConfiguration.files { it instanceof ExternalDependency })
-        }
-        for (minusConfiguration in minusConfigurations) {
-            result.removeAll(minusConfiguration.files { it instanceof ExternalDependency })
+            for (dependency in dependencies) {
+                def files = plusConfiguration.files(dependency)
+                for (file in files) {
+                    result.add(generator(file, dependency))
+                }
+            }
         }
         result
     }
 
+    private boolean isExported(Dependency dependency, EclipseClasspath classpath) {
+        // a dependency is exported if it is introduced by an exported configuration
+        for (Configuration plusConfiguration : classpath.plusConfigurations) {
+            for (Configuration config : plusConfiguration.hierarchy) {
+                if (classpath.noExportConfigNames.contains(config.name)) {
+                    continue
+                }
+                if (config.allDependencies.contains(dependency)) {
+                    return true
+                }
+            }
+        }
+        false
+    }
+
     private getFiles(org.gradle.api.Project project, Set dependencies, String classifier) {
         return project.configurations.detachedConfiguration((dependencies as Dependency[])).files.inject([:]) { result, sourceFile ->
             String key = sourceFile.name.replace("-${classifier}.jar", '.jar')

subprojects/ide/src/main/groovy/org/gradle/plugins/ide/eclipse/model/internal/ProjectDependencyBuilder.groovy

@@ -23,13 +23,13 @@ import org.gradle.plugins.ide.eclipse.model.ProjectDependency
  * @author Szczepan Faber, @date: 11.03.11
  */
 class ProjectDependencyBuilder {
-    ProjectDependency build(Project project) {
+    ProjectDependency build(Project project, exported) {
         def name
         if (project.plugins.hasPlugin(EclipsePlugin)) {
             name = project.eclipse.project.name
         } else {
             name = project.name
         }
-        new ProjectDependency('/' + name, true, null, [] as Set, project.path)
+        new ProjectDependency('/' + name, exported, null, [] as Set, project.path)
     }
 }

subprojects/ide/src/test/groovy/org/gradle/plugins/ide/eclipse/model/internal/ProjectDependencyBuilderTest.groovy

@@ -29,7 +29,7 @@ class ProjectDependencyBuilderTest extends Specification {
 
     def "should create dependency using project name"() {
         when:
-        def dependency = builder.build(project)
+        def dependency = builder.build(project, true)
 
         then:
         dependency.path == "/$project.name"
@@ -41,7 +41,7 @@ class ProjectDependencyBuilderTest extends Specification {
         project.eclipse.project.name = 'foo'
 
         when:
-        def dependency = builder.build(project)
+        def dependency = builder.build(project, true)
 
         then:
         dependency.path == '/foo'