Remove unused classes, fix a few tests.

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/ResolveDependency.kt

@@ -3,7 +3,6 @@ package com.beust.kobalt
 import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.maven.LocalRepo
 import com.beust.kobalt.maven.MavenId
-import com.beust.kobalt.maven.RepoFinder
 import com.beust.kobalt.maven.aether.KobaltAether
 import com.beust.kobalt.misc.KobaltExecutors
 import com.beust.kobalt.misc.Node
@@ -14,7 +13,7 @@ import java.util.*
 /**
  * Display information about a Maven id.
  */
-class ResolveDependency @Inject constructor(val repoFinder: RepoFinder,
+class ResolveDependency @Inject constructor(
         val localRepo: LocalRepo,
         val aether: KobaltAether,
         val executors: KobaltExecutors) {

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/DependencyManager.kt

@@ -24,19 +24,16 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
      */
     override fun create(id: String) : IClasspathDependency {
         if (id.startsWith(FileDependency.PREFIX_FILE)) {
-            return FileDependency(id.substring(FileDependency.PREFIX_FILE.length))
+            return createFile(id.substring(FileDependency.PREFIX_FILE.length))
         } else {
-            val mavenId = MavenId.create(id)
+            return createMaven(id)
-            val result = if (mavenId.hasVersion) aether.create(id)
-                else aether.create(id + "(0,]")
-            return result
         }
     }
 
     /**
      * Create an IClasspathDependency from a Maven id.
      */
-    override fun createMaven(id: String) : IClasspathDependency = create(id)
+    override fun createMaven(id: String) : IClasspathDependency = aether.create(id)
 
     /**
      * Create an IClasspathDependency from a path.

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/MavenId.kt

@@ -40,11 +40,13 @@ class MavenId private constructor(val groupId: String, val artifactId: String, v
                 MavenId(groupId, artifactId, extension, version)
             }
 
+        fun toKobaltId(id: String) = if (id.endsWith(":")) id + "(0,]" else id
         /**
          * The main entry point to create Maven Id's. Id's created by this function
          * will run through IMavenIdInterceptors.
          */
-        fun create(id: String) : MavenId {
+        fun create(originalId: String) : MavenId {
+            val id = toKobaltId(originalId)
             var originalMavenId = createNoInterceptors(id)
             var interceptedMavenId = originalMavenId
             val interceptors = Kobalt.context?.pluginInfo?.mavenIdInterceptors

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt

@@ -1,88 +0,0 @@
-package com.beust.kobalt.maven
-
-import com.beust.kobalt.HostConfig
-import com.beust.kobalt.api.Kobalt
-import com.beust.kobalt.misc.KobaltExecutors
-import com.beust.kobalt.misc.Version
-import com.beust.kobalt.misc.log
-import com.beust.kobalt.misc.warn
-import com.google.common.cache.CacheBuilder
-import com.google.common.cache.CacheLoader
-import com.google.common.cache.LoadingCache
-import java.util.concurrent.ExecutorCompletionService
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-/**
- * Find the repo that contains the given dependency among a list of repos. Searches are performed in parallel and
- * cached so we never make a network call for the same dependency more than once.
- */
-class RepoFinder @Inject constructor(val executors: KobaltExecutors, val finderFactory: RepoFinderCallable.IFactory) {
-    fun findCorrectRepo(id: String) = FOUND_REPOS.get(id)
-
-    /**
-     * archiveUrl: full URL
-     */
-    data class RepoResult(val hostConfig: HostConfig, val version: Version? = null,
-            val archiveUrl: String? = null, val snapshotVersion: Version? = null) {
-        val found = archiveUrl != null
-
-        val localPath = archiveUrl?.substring(hostConfig.url.length)
-        // If it's a snapshot, we download a specific timestamped jar file but we need to save it under
-        // the SNAPSHOT-3.2.jar name.
-        val path = if (snapshotVersion != null && snapshotVersion.snapshotTimestamp != null && localPath != null) {
-                val ind = localPath.indexOf(snapshotVersion.snapshotTimestamp)
-                val lastDot = localPath.lastIndexOf(".")
-                val result = localPath.substring(0, ind) + "SNAPSHOT" +
-                    localPath.substring(lastDot)
-                result
-            } else {
-                localPath
-            }
-    }
-
-    private val FOUND_REPOS: LoadingCache<String, RepoResult> = CacheBuilder.newBuilder()
-            .build(object : CacheLoader<String, RepoResult>() {
-        override fun load(key: String): RepoResult {
-            return loadCorrectRepo(key)
-        }})
-
-    /**
-     * Schedule an HTTP request to each repo in its own thread.
-     */
-    private fun loadCorrectRepo(id: String): RepoResult {
-        val executor = executors.newExecutor("RepoFinder-$id", Kobalt.repos.size)
-        val cs = ExecutorCompletionService<List<RepoResult>>(executor)
-
-        val results = arrayListOf<RepoResult>()
-        try {
-            log(2, "Looking for $id")
-            Kobalt.repos.forEach { cs.submit(finderFactory.create(id, it)) }
-            for (i in 0..Kobalt.repos.size - 1) {
-                try {
-                    val repos = cs.take().get(2000, TimeUnit.MILLISECONDS)
-                    repos.forEach { result ->
-                        if (result.found) {
-                            log(2, "Located $id in ${result.hostConfig.url}")
-                            results.add(result)
-                        } else {
-                            log(3, "  Result for repo #$i: $result")
-                        }
-                    }
-                } catch(ex: Exception) {
-                    warn("Error: $ex")
-                }
-            }
-        } finally {
-            executor.shutdownNow()
-        }
-
-        if (results.size > 0) {
-//            results.sortByDescending { Versions.toLongVersion(it.version) }
-            results.sort({ left, right -> right.version!!.compareTo(left.version!!) })
-            return results[0]
-        } else {
-            return RepoResult(HostConfig(""), Version.of(id))
-        }
-    }
-}

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/RepoFinderCallable.kt

@@ -1,193 +0,0 @@
-package com.beust.kobalt.maven
-
-import com.beust.kobalt.HostConfig
-import com.beust.kobalt.maven.dependency.FileDependency
-import com.beust.kobalt.misc.Version
-import com.beust.kobalt.misc.log
-import com.beust.kobalt.misc.warn
-import com.google.inject.Inject
-import com.google.inject.assistedinject.Assisted
-import kotlinx.dom.asElementList
-import kotlinx.dom.parseXml
-import org.w3c.dom.NodeList
-import java.io.File
-import java.util.concurrent.Callable
-import javax.xml.xpath.XPathConstants
-import javax.xml.xpath.XPathFactory
-
-/**
- * Execute a single HTTP request to one repo. This Callable can return more than one RepoResult
- * if the artifact we're tying to locate is a container pom (in which case, we'll return one
- * positive RepoResult for each of the artifacts listed in that .pom file). For example:
- * http://repo1.maven.org/maven2/nl/komponents/kovenant/kovenant/3.0.0/
- */
-class RepoFinderCallable @Inject constructor(@Assisted val id: String,
-        @Assisted val repo: HostConfig, val localRepo: LocalRepo, val pomFactory: Pom.IFactory,
-        val dependencyManager: DependencyManager)
-            : Callable<List<RepoFinder .RepoResult>> {
-
-    interface IFactory {
-        fun create(@Assisted id: String, @Assisted repo: HostConfig) : RepoFinderCallable
-    }
-
-    override fun call(): List<RepoFinder.RepoResult> {
-        val repoUrl = repo.url
-        log(2, "  Checking $repoUrl for $id")
-
-        val mavenId = MavenId.create(id)
-        val groupId = mavenId.groupId
-        val artifactId = mavenId.artifactId
-
-        if (mavenId.version == null) {
-            val ud = UnversionedDep(groupId, artifactId)
-            val isLocal = repoUrl.startsWith(FileDependency.PREFIX_FILE)
-            val path = ud.toMetadataXmlPath(false, isLocal)
-            val foundVersion = findCorrectVersionRelease(path, repoUrl)
-            // When looking up a versionless id, never return a SNAPSHOT
-            if (foundVersion != null && ! foundVersion.contains("SNAPSHOT")) {
-                return listOf(RepoFinder.RepoResult(repo, Version.of(foundVersion), repoUrl + path))
-            } else {
-                return listOf(RepoFinder.RepoResult(repo))
-            }
-        } else {
-            val version = Version.of(mavenId.version)
-            if (version.isSnapshot()) {
-                val dep = SimpleDep(mavenId)
-                val isLocal = repoUrl.startsWith(FileDependency.PREFIX_FILE)
-                val metadataXmlPath = dep.toMetadataXmlPath(false, isLocal, version.version)
-                val snapshotVersion =
-                        if (isLocal) version
-                        else findSnapshotVersion(metadataXmlPath, repoUrl, mavenId.version)
-                if (snapshotVersion != null) {
-                    val url = repoUrl + dep.toDirectory(fileSystem = false, v = dep.version) +
-                            dep.artifactId + "-" + snapshotVersion.noSnapshotVersion +
-                            "-" + snapshotVersion.snapshotTimestamp + ".jar"
-                    return listOf(RepoFinder.RepoResult(repo, version, url, snapshotVersion))
-                } else {
-                    return listOf(RepoFinder.RepoResult(repo))
-                }
-            } else if (version.isRangedVersion() ) {
-                val foundVersion = findRangedVersion(SimpleDep(mavenId), repoUrl)
-                if (foundVersion != null) {
-                    return listOf(RepoFinder.RepoResult(repo, foundVersion))
-                } else {
-                    return listOf(RepoFinder.RepoResult(repo))
-                }
-
-            } else {
-                val dep = SimpleDep(mavenId)
-                // Try to find the jar file
-                val depPomFile = dep.toPomFile(dep.version)
-                val attemptPaths = listOf(dep.toJarFile(dep.version), dep.toAarFile(dep.version), depPomFile)
-                val attemptUrls = attemptPaths.map { repo.copy(url = repo.url + it )} +
-                        attemptPaths.map { repo.copy(url = repo.url + File(it).parentFile.path.replace("\\", "/")) }
-
-                val firstFound = attemptUrls.map { Kurl(it)}.firstOrNull { it.exists }
-                if (firstFound != null) {
-                    val url = firstFound.hostInfo.url
-                    if (url.endsWith("ar")) {
-                        log(3, "Result for $repoUrl for $id: $firstFound")
-                        return listOf(RepoFinder.RepoResult(repo, Version.of(dep.version), firstFound.hostInfo.url))
-                    } else if (url.endsWith(".pom")) {
-                        log(2, "Found container pom: " + firstFound)
-                        File(localRepo.toFullPath(depPomFile)).let { pomFile ->
-                            pomFile.parentFile.mkdirs()
-                            Kurl(HostConfig(url)).toFile(pomFile)
-                            val pom2 = Pom2.parse(pomFile, dependencyManager).value
-                            val result = arrayListOf<RepoFinder.RepoResult>()
-                            if (pom2 != null) {
-                                val dependencies = pom2.pomProject.dependencies
-                                dependencies.map { it.id(pom2) }.forEach {
-                                    result.addAll(RepoFinderCallable(it, repo, localRepo, pomFactory,
-                                            dependencyManager).call())
-                                }
-                            } else {
-                                warn("Couldn't parse $pomFile")
-                            }
-                            return result
-                        }
-                    } else {
-                        return listOf(RepoFinder.RepoResult(repo, Version.of(dep.version), firstFound.hostInfo.url))
-                    }
-                } else {
-                    log(3, "Couldn't find $dep on $repoUrl")
-                    return emptyList()
-                }
-            }
-        }
-    }
-
-    val XPATH_FACTORY = XPathFactory.newInstance();
-    val XPATH = XPATH_FACTORY.newXPath();
-
-    private fun findCorrectVersionRelease(metadataPath: String, repoUrl: String): String? {
-        val XPATHS = listOf(
-                XPATH.compile("/metadata/version"),
-                XPATH.compile("/metadata/versioning/latest"),
-                XPATH.compile("/metadata/versioning/release"))
-        // No version in this dependency, find out the most recent one by parsing maven-metadata.xml, if it exists
-        val url = repoUrl + metadataPath
-        try {
-            val doc = parseXml(url)
-            arrayListOf(XPATHS.forEach {
-                val result = it.evaluate(doc, XPathConstants.STRING) as String
-                if (! result.isEmpty()) {
-                    return result
-                }
-            })
-        } catch(ex: Exception) {
-            log(2, "Couldn't find metadata at $url: ${ex.message}")
-        }
-        return null
-    }
-
-    fun findRangedVersion(dep: SimpleDep, repoUrl: String): Version? {
-        val l = listOf(dep.groupId.replace(".", "/"), dep.artifactId.replace(".", "/"), "maven-metadata.xml")
-        var metadataPath =  l.joinToString("/")
-
-        val versionsXpath = XPATH.compile("/metadata/versioning/versions/version")
-
-        // No version in this dependency, find out the most recent one by parsing maven-metadata.xml, if it exists
-        val url = repoUrl + metadataPath
-        try {
-            val doc = parseXml(url)
-            val version = Version.of(dep.version)
-            if(version.isRangedVersion()) {
-                val versions = (versionsXpath.evaluate(doc, XPathConstants.NODESET) as NodeList)
-                        .asElementList().map { Version.of(it.textContent) }
-                return version.select(versions)
-            } else {
-                return Version.of(XPATH.compile("/metadata/versioning/versions/version/$version")
-                        .evaluate(doc, XPathConstants.STRING) as String)
-            }
-        } catch(ex: Exception) {
-            log(2, "Couldn't find metadata at ${url}")
-        }
-        return null
-    }
-
-    fun findSnapshotVersion(metadataPath: String, repoUrl: String, snapshotVersion: String): Version? {
-        val timestamp = XPATH.compile("/metadata/versioning/snapshot/timestamp")
-        val buildNumber = XPATH.compile("/metadata/versioning/snapshot/buildNumber")
-        // No version in this dependency, find out the most recent one by parsing maven-metadata.xml, if it exists
-        val url = repoUrl + metadataPath
-        try {
-            val doc = parseXml(url)
-            val ts = timestamp.evaluate(doc, XPathConstants.STRING)
-            val bn = buildNumber.evaluate(doc, XPathConstants.STRING)
-            if (! ts.toString().isEmpty() && ! bn.toString().isEmpty()) {
-                return Version(snapshotVersion, ts.toString() + "-" + bn.toString())
-            } else {
-                val lastUpdated = XPATH.compile("/metadata/versioning/lastUpdated")
-                if (! lastUpdated.toString().isEmpty()) {
-                    return Version.of(lastUpdated.toString())
-                }
-
-            }
-        } catch(ex: Exception) {
-            log(2, "Couldn't find metadata at $url")
-        }
-        return null
-    }
-
-}

modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt

@@ -5,6 +5,8 @@ import com.beust.kobalt.api.IClasspathDependency
 import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.internal.KobaltSettings
 import com.beust.kobalt.maven.CompletedFuture
+import com.beust.kobalt.maven.MavenId
+import com.beust.kobalt.misc.KobaltLogger
 import com.beust.kobalt.misc.Versions
 import com.beust.kobalt.misc.log
 import com.beust.kobalt.misc.warn
@@ -35,7 +37,7 @@ class KobaltAether @Inject constructor (val settings: KobaltSettings) {
      */
     fun create(id: String): IClasspathDependency {
         val aether = Aether(localRepo)
-        val cr = aether.transitiveDependencies(DefaultArtifact(id))
+        val cr = aether.transitiveDependencies(DefaultArtifact(MavenId.toKobaltId(id)))
         return if (cr != null) AetherDependency(cr.root.artifact)
             else throw KobaltException("Couldn't resolve $id")
     }
@@ -46,7 +48,7 @@ class KobaltAether @Inject constructor (val settings: KobaltSettings) {
         }
 
     fun resolve(id: String): DependencyResult {
-        val results = Aether(localRepo).resolve(DefaultArtifact(id))
+        val results = Aether(localRepo).resolve(DefaultArtifact(MavenId.toKobaltId(id)))
         if (results != null && results.size > 0) {
             return DependencyResult(AetherDependency(results[0].artifact), results[0].repository.toString())
         } else {
@@ -219,10 +221,9 @@ class AetherDependency(val artifact: Artifact): IClasspathDependency, Comparable
     override fun toString() = id
 }
 
-//fun main(argv: Array<String>) {
+fun main(argv: Array<String>) {
-//    KobaltLogger.LOG_LEVEL = 2
+    KobaltLogger.LOG_LEVEL = 2
-//    val aether = Aether()
+    val d = org.eclipse.aether.artifact.DefaultArtifact("org.testng:testng:6.9")
-//    val latestResult = aether.latestArtifact("org.testng", "testng")
+
-//    val latest = latestResult.artifact
+    println("Artifact: " + d)
-//    println("Latest: " + latest.version + " " + latest.file)
+}
-//}

src/main/kotlin/com/beust/kobalt/app/MainModule.kt

@@ -3,7 +3,10 @@ package com.beust.kobalt.app
 import com.beust.kobalt.Args
 import com.beust.kobalt.internal.KobaltSettings
 import com.beust.kobalt.internal.PluginInfo
-import com.beust.kobalt.maven.*
+import com.beust.kobalt.maven.ArtifactFetcher
+import com.beust.kobalt.maven.LocalRepo
+import com.beust.kobalt.maven.Pom
+import com.beust.kobalt.maven.PomGenerator
 import com.beust.kobalt.misc.DependencyExecutor
 import com.beust.kobalt.misc.KobaltExecutors
 import com.beust.kobalt.plugin.publish.BintrayApi
@@ -30,8 +33,7 @@ public open class MainModule(val args: Args, val settings: KobaltSettings) : Abs
                 BintrayApi.IFactory::class.java,
                 Pom.IFactory::class.java,
                 BuildFileCompiler.IFactory::class.java,
-                ArtifactFetcher.IFactory::class.java,
+                ArtifactFetcher.IFactory::class.java)
-                RepoFinderCallable.IFactory::class.java)
             .forEach {
                 install(builder.build(it))
             }

src/test/kotlin/com/beust/kobalt/maven/DownloadTest.kt

@@ -164,16 +164,5 @@ class DownloadTest @Inject constructor(
         val d = closure.filter { it.id.contains("eclipse-collections-api")}
         Assert.assertEquals(d.size, 1)
     }
-
-    @Test
-    fun containerPom() {
-        val repoResult = RepoFinderCallable("org.jetbrains.kotlin:kotlin-project:1.0.0",
-                HostConfig("http://repo1.maven.org/maven2/"),
-                localRepo, pomFactory, dependencyManager).call()
-        val rr = repoResult[0]
-        Assert.assertTrue(rr.found)
-        Assert.assertTrue(rr.localPath != null && rr.localPath!!.startsWith("junit/junit"))
-        Assert.assertEquals(rr.version.toString(), "4.12")
-    }
 }
 

src/test/kotlin/com/beust/kobalt/maven/MavenIdTest.kt

@@ -9,13 +9,13 @@ class MavenIdTest {
     @DataProvider
     fun dp() : Array<Array<out Any?>> {
         return arrayOf(
-            arrayOf("javax.inject:javax.inject:", "javax.inject", "javax.inject", null, null, null),
+            arrayOf("javax.inject:javax.inject:", "javax.inject", "javax.inject", "(0,]", "jar", null),
             arrayOf("org.jetbrains.kotlin:kotlin-compiler-embeddable:1.0.0-beta-1038",
                     "org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.0.0-beta-1038",
-                    null, null),
+                    "jar", null),
-            arrayOf("com.google.inject:guice:4.0:no_aop",
+            arrayOf("com.google.inject:guice::no_aop:4.0",
-                    "com.google.inject", "guice", "4.0", null, "no_aop"),
+                    "com.google.inject", "guice", "4.0", "jar", "no_aop"),
-            arrayOf("com.android.support:appcompat-v7:22.2.1@aar",
+            arrayOf("com.android.support:appcompat-v7:aar:22.2.1",
                     "com.android.support", "appcompat-v7", "22.2.1", "aar", null)
         )
     }

src/test/kotlin/com/beust/kobalt/maven/RemoteRepoTest.kt

@@ -1,42 +0,0 @@
-package com.beust.kobalt.maven
-
-import com.beust.kobalt.TestModule
-import org.testng.Assert
-import org.testng.annotations.Test
-import javax.inject.Inject
-
-@Test
-@org.testng.annotations.Guice(modules = arrayOf(TestModule::class))
-class RemoteRepoTest @Inject constructor(val repoFinder: RepoFinder, val dependencyManager: DependencyManager){
-
-    @Test
-    fun mavenMetadata() {
-        val dep = dependencyManager.create("org.codehaus.groovy:groovy-all:")
-        // Note: this test might fail if a new version of Groovy gets uploaded, need
-        // to find a stable (i.e. abandoned) package
-        with(dep.id.split(":")[2]) {
-            Assert.assertTrue(this == "2.4.5" || this == "2.4.6")
-        }
-    }
-
-    @Test(enabled = false)
-    fun metadataForSnapshots() {
-        val jar = dependencyManager.create("org.apache.maven.wagon:wagon-provider-test:2.10-SNAPSHOT")
-        Assert.assertTrue(jar.jarFile.get().exists())
-    }
-
-    fun resolveAarWithVersion() {
-        val repoResult = repoFinder.findCorrectRepo("com.jakewharton.timber:timber:4.1.0")
-        with(repoResult) {
-            Assert.assertEquals(path, "com/jakewharton/timber/timber/4.1.0/timber-4.1.0.aar")
-        }
-    }
-
-    @Test(groups = arrayOf("broken"), enabled = false)
-    fun resolveAarWithoutVersion() {
-        val repoResult = repoFinder.findCorrectRepo("com.jakewharton.timber:timber:")
-        with(repoResult) {
-            Assert.assertEquals(path, "com/jakewharton/timber/timber/4.1.0/timber-4.1.0.aar")
-        }
-    }
-}