From 68719cf9d79df74e595b57eb74d58eaaa86a57e7 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Tue, 14 Jun 2011 19:32:36 -0400
Subject: [PATCH] cleaning up artifact configurations

---
 ivy/IvyInterface.scala | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/ivy/IvyInterface.scala b/ivy/IvyInterface.scala
index 6d4ccacb9..2d0a3e54f 100644
--- a/ivy/IvyInterface.scala
+++ b/ivy/IvyInterface.scala
@@ -290,8 +290,9 @@ object Configurations
 {
 	def config(name: String) = new Configuration(name)
 	def default: Seq[Configuration] = defaultMavenConfigurations
-	def defaultMavenConfigurations: Seq[Configuration] = Compile :: Runtime :: Test :: Provided :: Optional :: Nil
-	def defaultInternal: Seq[Configuration] = CompileInternal :: RuntimeInternal :: TestInternal :: Nil
+	def defaultMavenConfigurations: Seq[Configuration] = Seq(Compile, Runtime, Test, Provided, Optional)
+	def defaultInternal: Seq[Configuration] = Seq(CompileInternal, RuntimeInternal, TestInternal)
+	def auxiliary: Seq[Configuration] = Seq(Sources, Docs, Pom)
 
 	lazy val RuntimeInternal = optionalInternal(Runtime)
 	lazy val TestInternal = fullInternal(Test)
@@ -314,12 +315,13 @@ object Configurations
 	lazy val Compile = config("compile")
 	lazy val IntegrationTest = config("it") extend(Runtime)
 	lazy val Provided = config("provided") intransitive ;
-	lazy val Javadoc = config("javadoc")
+	lazy val Docs = config("docs")
 	lazy val Runtime = config("runtime") extend(Compile)
 	lazy val Test = config("test") extend(Runtime)
 	lazy val Sources = config("sources")
 	lazy val System = config("system")
 	lazy val Optional = config("optional")
+	lazy val Pom = config("pom")
 
 	lazy val CompilerPlugin = config("plugin") hide
 
@@ -347,6 +349,9 @@ final case class Artifact(name: String, `type`: String, extension: String, class
 {
 	def extra(attributes: (String,String)*) = Artifact(name, `type`, extension, classifier, configurations, url, extraAttributes ++ ModuleID.checkE(attributes))
 }
+
+		import Configurations.{config, Docs, Optional, Pom, Sources}
+
 object Artifact
 {
 	def apply(name: String): Artifact = Artifact(name, defaultType, defaultExtension, None, Nil, None)
@@ -357,12 +362,18 @@ object Artifact
 	def apply(name: String, url: URL): Artifact =Artifact(name, extract(url, defaultType), extract(url, defaultExtension), None, Nil, Some(url))
 	def apply(name: String, `type`: String, extension: String, classifier: Option[String], configurations: Iterable[Configuration], url: Option[URL]): Artifact =
 		Artifact(name, `type`, extension, classifier, configurations, url, Map.empty)
+
 	val defaultExtension = "jar"
 	val defaultType = "jar"
+
 	def sources(name: String) = classified(name, SourceClassifier)
 	def javadoc(name: String) = classified(name, DocClassifier)
+	def pom(name: String) =  Artifact(name, PomType, PomType, None, Pom :: Nil, None)
+
 	val DocClassifier = "javadoc"
 	val SourceClassifier = "sources"
+	val PomType = "pom"
+
 	def extract(url: URL, default: String): String = extract(url.toString, default)
 	def extract(name: String, default: String): String =
 	{
@@ -388,9 +399,12 @@ object Artifact
 	}
 	def cross(enable: Boolean, scalaVersion: String): String = if(enable) "_" + scalaVersion else ""
 
-	val classifierTypeMap = Map("sources" -> "src", "javadoc" -> "doc")
+	val classifierConfMap = Map(SourceClassifier -> Sources, DocClassifier -> Docs)
+	val classifierTypeMap = Map(SourceClassifier -> "src", DocClassifier -> "doc")
+	def classifierConf(classifier: String): Configuration = classifierConfMap.getOrElse(classifier, Optional)	
 	def classifierType(classifier: String): String = classifierTypeMap.getOrElse(classifier, defaultType)
-	def classified(name: String, classifier: String): Artifact = Artifact(name, classifierType(classifier), defaultExtension, classifier)
+	def classified(name: String, classifier: String): Artifact =
+		Artifact(name, classifierType(classifier), defaultExtension, Some(classifier), classifierConf(classifier) :: Nil, None)
 }
 final case class ModuleConfiguration(organization: String, name: String, revision: String, resolver: Resolver)
 object ModuleConfiguration