From df6d83911a4deb3b048fbcd80cbef2b5ed9ea505 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 13 Mar 2010 19:33:58 -0500
Subject: [PATCH] tests for javac argument file and unmanaged webapp

---
 src/sbt-test/java/argfile/project/build.properties         | 2 ++
 src/sbt-test/java/argfile/project/build/A.scala            | 7 +++++++
 src/sbt-test/java/argfile/src/ java test /a/A.java         | 3 +++
 src/sbt-test/java/argfile/src/ scala test /Test s.scala    | 7 +++++++
 src/sbt-test/java/argfile/test                             | 1 +
 src/sbt-test/web/unmanaged/project/build.properties        | 2 ++
 .../web/unmanaged/project/build/UnmanagedTest.scala        | 7 +++++++
 src/sbt-test/web/unmanaged/test                            | 6 ++++++
 8 files changed, 35 insertions(+)
 create mode 100644 src/sbt-test/java/argfile/project/build.properties
 create mode 100644 src/sbt-test/java/argfile/project/build/A.scala
 create mode 100644 src/sbt-test/java/argfile/src/ java test /a/A.java
 create mode 100644 src/sbt-test/java/argfile/src/ scala test /Test s.scala
 create mode 100644 src/sbt-test/java/argfile/test
 create mode 100644 src/sbt-test/web/unmanaged/project/build.properties
 create mode 100644 src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
 create mode 100644 src/sbt-test/web/unmanaged/test

diff --git a/src/sbt-test/java/argfile/project/build.properties b/src/sbt-test/java/argfile/project/build.properties
new file mode 100644
index 000000000..f176ee56f
--- /dev/null
+++ b/src/sbt-test/java/argfile/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Arg File Test
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/java/argfile/project/build/A.scala b/src/sbt-test/java/argfile/project/build/A.scala
new file mode 100644
index 000000000..af3ae5f5a
--- /dev/null
+++ b/src/sbt-test/java/argfile/project/build/A.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class A(info: ProjectInfo) extends DefaultProject(info)
+{
+	override def mainScalaSourcePath = sourcePath / " scala test "
+	override def mainJavaSourcePath = sourcePath / " java test "
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/argfile/src/ java test /a/A.java b/src/sbt-test/java/argfile/src/ java test /a/A.java
new file mode 100644
index 000000000..7e84311b2
--- /dev/null
+++ b/src/sbt-test/java/argfile/src/ java test /a/A.java	
@@ -0,0 +1,3 @@
+package a;
+public class A {
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/argfile/src/ scala test /Test s.scala b/src/sbt-test/java/argfile/src/ scala test /Test s.scala
new file mode 100644
index 000000000..16e70b30e
--- /dev/null
+++ b/src/sbt-test/java/argfile/src/ scala test /Test s.scala	
@@ -0,0 +1,7 @@
+object Test
+{
+	def main(args: Array[String])
+	{
+		println(new a.A)
+	}
+}
\ No newline at end of file
diff --git a/src/sbt-test/java/argfile/test b/src/sbt-test/java/argfile/test
new file mode 100644
index 000000000..9e4c2371c
--- /dev/null
+++ b/src/sbt-test/java/argfile/test
@@ -0,0 +1 @@
+> run
\ No newline at end of file
diff --git a/src/sbt-test/web/unmanaged/project/build.properties b/src/sbt-test/web/unmanaged/project/build.properties
new file mode 100644
index 000000000..1a56e136a
--- /dev/null
+++ b/src/sbt-test/web/unmanaged/project/build.properties
@@ -0,0 +1,2 @@
+project.name=Webapp Unmanaged
+project.version=1.0
\ No newline at end of file
diff --git a/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala b/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
new file mode 100644
index 000000000..f675a295d
--- /dev/null
+++ b/src/sbt-test/web/unmanaged/project/build/UnmanagedTest.scala
@@ -0,0 +1,7 @@
+import sbt._
+
+class UnmanagedTest(info: ProjectInfo) extends DefaultWebProject(info)
+{
+	override def disableCrossPaths = true
+	override def webappUnmanaged = temporaryWarPath / "WEB-INF" / "appengine-generated" ***
+}
\ No newline at end of file
diff --git a/src/sbt-test/web/unmanaged/test b/src/sbt-test/web/unmanaged/test
new file mode 100644
index 000000000..2826c6833
--- /dev/null
+++ b/src/sbt-test/web/unmanaged/test
@@ -0,0 +1,6 @@
+> prepare-webapp
+$ touch target/webapp/WEB-INF/appengine-generated/test-keep
+$ touch target/webapp/WEB-INF/other/test-remove
+> prepare-webapp
+$ exists target/webapp/WEB-INF/appengine-generated/test-keep
+$ absent target/webapp/WEB-INF/other/test-remove
\ No newline at end of file