From 377e0345c7f0df7fe4f4db9025d4164f2f9ba4a9 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sun, 10 Jan 2010 19:01:16 -0500
Subject: [PATCH] Exclude Scala jars when launcher retrieves application

---
 launch/Launch.scala |  5 +++--
 launch/Update.scala | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/launch/Launch.scala b/launch/Launch.scala
index 008d3a607..e08d5bd1d 100644
--- a/launch/Launch.scala
+++ b/launch/Launch.scala
@@ -1,6 +1,7 @@
 package xsbt.boot
 
 import Pre._
+import BootConfiguration.{CompilerModuleName, LibraryModuleName}
 import java.io.File
 import java.net.URL
 
@@ -89,8 +90,8 @@ class Launch(val bootDirectory: File, repositories: List[Repository], scalaClass
 		lazy val configuration = new UpdateConfiguration(bootDirectory, version, repositories)
 		lazy val libDirectory = new File(configuration.bootDirectory, baseDirectoryName(version))
 		lazy val scalaHome = new File(libDirectory, ScalaDirectoryName)
-		def compilerJar = new File(scalaHome, "scala-compiler.jar")
-		def libraryJar = new File(scalaHome, "scala-library.jar")
+		def compilerJar = new File(scalaHome,CompilerModuleName + ".jar")
+		def libraryJar = new File(scalaHome, LibraryModuleName + ".jar")
 		override def classpath = Array(compilerJar, libraryJar)
 		def baseDirectories = List(scalaHome)
 		def testLoadClasses = TestLoadScalaClasses
diff --git a/launch/Update.scala b/launch/Update.scala
index bfb04fcc0..16f786bf4 100644
--- a/launch/Update.scala
+++ b/launch/Update.scala
@@ -11,14 +11,15 @@ import org.apache.ivy.{core, plugins, util, Ivy}
 import core.LogOptions
 import core.cache.DefaultRepositoryCacheManager
 import core.event.EventManager
-import core.module.id.ModuleRevisionId
+import core.module.id.{ArtifactId, ModuleId, ModuleRevisionId}
 import core.module.descriptor.{Configuration => IvyConfiguration, DefaultDependencyArtifactDescriptor, DefaultDependencyDescriptor, DefaultModuleDescriptor, ModuleDescriptor}
+import core.module.descriptor.{DefaultExcludeRule, ExcludeRule}
 import core.report.ResolveReport
 import core.resolve.{ResolveEngine, ResolveOptions}
 import core.retrieve.{RetrieveEngine, RetrieveOptions}
 import core.sort.SortEngine
 import core.settings.IvySettings
-import plugins.matcher.PatternMatcher
+import plugins.matcher.{ExactPatternMatcher, PatternMatcher}
 import plugins.resolver.{ChainResolver, FileSystemResolver, IBiblioResolver, URLResolver}
 import util.{DefaultMessageLogger, Message}
 
@@ -89,6 +90,7 @@ final class Update(config: UpdateConfiguration)
 				val app = u.id
 				val resolvedName = if(app.crossVersioned) app.name + "_" + scalaVersion else app.name
 				addDependency(moduleID, app.groupID, resolvedName, app.getVersion, "default(compile)", Nil)
+				excludeScala(moduleID)
 				System.out.println("Getting " + app.groupID + " " + resolvedName + " " + app.getVersion + " ...")
 		}
 		update(moduleID, target)
@@ -120,6 +122,19 @@ final class Update(config: UpdateConfiguration)
 		for(conf <- dep.getModuleConfigurations)
 			dep.addDependencyArtifact(conf, ivyArtifact)
 	}
+	private def excludeScala(module: DefaultModuleDescriptor)
+	{
+		def excludeScalaJar(name: String): Unit = module.addExcludeRule(excludeRule(ScalaOrg, name))
+		excludeScalaJar(LibraryModuleName)
+		excludeScalaJar(CompilerModuleName)
+	}
+	private def excludeRule(organization: String, name: String): ExcludeRule =
+	{
+		val artifact = new ArtifactId(ModuleId.newInstance(organization, name), "*", "*", "*")
+		val rule = new DefaultExcludeRule(artifact, ExactPatternMatcher.INSTANCE, java.util.Collections.emptyMap[AnyRef,AnyRef])
+		rule.addConfiguration(DefaultIvyConfiguration)
+		rule
+	}
 	private def resolve(eventManager: EventManager, module: ModuleDescriptor)
 	{
 		val resolveOptions = new ResolveOptions