luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for Ivy interface component

This commit is contained in:
Mark Harrah 2010-01-10 16:47:38 -05:00
parent 2d9a7b12cc
commit 6c132165d6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ivy/Ivy.scala
View File

@ -192,6 +192,7 @@ private object IvySbt
manager.setChangingMatcher(PatternMatcher.REGEXP); manager.setChangingMatcher(PatternMatcher.REGEXP);
manager.setChangingPattern(".*-SNAPSHOT"); manager.setChangingPattern(".*-SNAPSHOT");
settings.setDefaultRepositoryCacheManager(manager) settings.setDefaultRepositoryCacheManager(manager)
dir.foreach(dir => settings.setDefaultResolutionCacheBasedir(dir.getAbsolutePath))
} }
def toIvyConfiguration(configuration: Configuration) = def toIvyConfiguration(configuration: Configuration) =
{ {
@ -224,7 +225,7 @@ private object IvySbt
private def extra(artifact: Artifact) = private def extra(artifact: Artifact) =
{ {
val ea = artifact.classifier match { case Some(c) => artifact.extra("e:classifier" -> c); case None => artifact } val ea = artifact.classifier match { case Some(c) => artifact.extra("e:classifier" -> c); case None => artifact }
javaMap(artifact.extraAttributes) javaMap(ea.extraAttributes)
} }
private def javaMap(map: Map[String,String]) = private def javaMap(map: Map[String,String]) =
if(map.isEmpty) null if(map.isEmpty) null

6
ivy/IvyInterface.scala
View File

@ -257,7 +257,7 @@ object Resolver
def defaultFileConfiguration = FileConfiguration(true, None) def defaultFileConfiguration = FileConfiguration(true, None)
def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true) def mavenStylePatterns = Patterns(Nil, mavenStyleBasePattern :: Nil, true)
def ivyStylePatterns = Patterns(Nil, Nil, false) def ivyStylePatterns = defaultIvyPatterns//Patterns(Nil, Nil, false)
def defaultPatterns = mavenStylePatterns def defaultPatterns = mavenStylePatterns
def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" def mavenStyleBasePattern = "[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"
@ -354,7 +354,7 @@ object ModuleConfiguration
def apply(org: String, resolver: Resolver): ModuleConfiguration = apply(org, "*", "*", resolver) def apply(org: String, resolver: Resolver): ModuleConfiguration = apply(org, "*", "*", resolver)
def apply(org: String, name: String, resolver: Resolver): ModuleConfiguration = ModuleConfiguration(org, name, "*", resolver) def apply(org: String, name: String, resolver: Resolver): ModuleConfiguration = ModuleConfiguration(org, name, "*", resolver)
} }
/*
object Credentials object Credentials
{ {
/** Add the provided credentials to Ivy's credentials cache.*/ /** Add the provided credentials to Ivy's credentials cache.*/
@ -390,4 +390,4 @@ object Credentials
private[this] val HostKeys = List("host", "hostname") private[this] val HostKeys = List("host", "hostname")
private[this] val UserKeys = List("user", "user.name", "username") private[this] val UserKeys = List("user", "user.name", "username")
private[this] val PasswordKeys = List("password", "pwd", "pass", "passwd") private[this] val PasswordKeys = List("password", "pwd", "pass", "passwd")
}*/ }