From 444cbbeb3725ab257b4633bed4380f54db519ab8 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Wed, 22 Jun 2011 19:17:10 -0400
Subject: [PATCH] reintegrate a dependency-management test

---
 .../pom-packaging/project/PomTest.scala       | 24 +++++++++++++++++++
 .../pom-packaging/project/build.properties    |  2 --
 .../pom-packaging/project/build/PomTest.scala | 21 ----------------
 .../dependency-management/pom-packaging/test  |  3 ---
 4 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala
 delete mode 100644 sbt/src/sbt-test/dependency-management/pom-packaging/project/build.properties
 delete mode 100644 sbt/src/sbt-test/dependency-management/pom-packaging/project/build/PomTest.scala

diff --git a/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala b/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala
new file mode 100644
index 000000000..6e420d780
--- /dev/null
+++ b/sbt/src/sbt-test/dependency-management/pom-packaging/project/PomTest.scala
@@ -0,0 +1,24 @@
+import sbt._
+import Keys._
+
+object PomTest extends Build
+{
+	override def settings = super.settings :+ (TaskKey[Unit]("check-pom") <<= checkPom)
+
+	lazy val subJar = Project("Sub Jar", file("subJar"))
+	lazy val subWar = Project("Sub War", file("subWar")) settings( warArtifact)
+	lazy val subParent = Project("Sub Parent", file("subParent")) settings( publishArtifact in Compile := false )
+
+	def art(p: ProjectReference) = makePom in p
+	def checkPom = (art(subJar), art(subWar), art(subParent)) map { (jar, war, pom) =>
+		checkPackaging(jar, "jar")
+		checkPackaging(war, "war")
+		checkPackaging(pom, "pom")
+	}
+	def checkPackaging(pom: File, expected: String) =
+	{
+		val packaging = (xml.XML.loadFile(pom) \\ "packaging").text
+		if(packaging != expected) error("Incorrect packaging for '" + pom + "'.  Expected '" + expected + "', but got '" + packaging + "'")
+	}
+	def warArtifact = artifact in (Compile, packageBin) ~= { _.copy(`type` = "war", extension = "war") }
+}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/pom-packaging/project/build.properties b/sbt/src/sbt-test/dependency-management/pom-packaging/project/build.properties
deleted file mode 100644
index 1dde45e89..000000000
--- a/sbt/src/sbt-test/dependency-management/pom-packaging/project/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-project.name=Pom Test
-project.version=1.0
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/pom-packaging/project/build/PomTest.scala b/sbt/src/sbt-test/dependency-management/pom-packaging/project/build/PomTest.scala
deleted file mode 100644
index c3bdaec5c..000000000
--- a/sbt/src/sbt-test/dependency-management/pom-packaging/project/build/PomTest.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-import sbt._
-
-class PomTest(info: ProjectInfo) extends ParentProject(info) with BasicManagedProject
-{
-	val subJar = project("subJar", "Sub Jar", new DefaultProject(_))
-	val subWar = project("subWar", "Sub War", new DefaultWebProject(_))
-	val subParent = project("subParent", "Sub Parent", i => new ParentProject(i) with BasicManagedProject)
-
-	def readPom(path: Path) = xml.XML.loadFile(path.asFile)
-	lazy val checkPom = task {
-		checkPackaging(subJar.pomPath, "jar") orElse
-		checkPackaging(subWar.pomPath, "war") orElse
-		checkPackaging(subParent.pomPath, "pom") orElse
-		checkPackaging(pomPath, "pom")
-	}
-	def checkPackaging(pom: Path, expected: String) =
-	{
-		val packaging = (readPom(pom) \\ "packaging").text
-		if(packaging == expected) None else Some("Incorrect packaging for '" + pom + "'.  Expected '" + expected + "', but got '" + packaging + "'")
-	}
-}
\ No newline at end of file
diff --git a/sbt/src/sbt-test/dependency-management/pom-packaging/test b/sbt/src/sbt-test/dependency-management/pom-packaging/test
index 11e80e7a3..c8edbfbcd 100644
--- a/sbt/src/sbt-test/dependency-management/pom-packaging/test
+++ b/sbt/src/sbt-test/dependency-management/pom-packaging/test
@@ -1,4 +1 @@
--> check-pom
-> package
-> make-pom
 > check-pom
\ No newline at end of file