diff --git a/sbt/src/sbt-test/web/jetty-env/conf/jetty/jetty-env.xml b/sbt/src/sbt-test/web/jetty-env/conf/jetty/jetty-env.xml
new file mode 100755
index 000000000..4bed8b7ca
--- /dev/null
+++ b/sbt/src/sbt-test/web/jetty-env/conf/jetty/jetty-env.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+ testValue
+ It works
+ true
+
+
+
+
diff --git a/sbt/src/sbt-test/web/jetty-env/project/build.properties b/sbt/src/sbt-test/web/jetty-env/project/build.properties
new file mode 100755
index 000000000..3b137cf79
--- /dev/null
+++ b/sbt/src/sbt-test/web/jetty-env/project/build.properties
@@ -0,0 +1,8 @@
+#Project properties
+#Thu Aug 12 11:18:54 CEST 2010
+project.organization=sbt
+project.name=JettyEnvTest
+sbt.version=0.7.5-SNAPSHOT
+project.version=1.0
+build.scala.versions=2.7.7
+project.initialize=false
diff --git a/sbt/src/sbt-test/web/jetty-env/project/build/JettyEnvTestProject.scala b/sbt/src/sbt-test/web/jetty-env/project/build/JettyEnvTestProject.scala
new file mode 100755
index 000000000..d4f340918
--- /dev/null
+++ b/sbt/src/sbt-test/web/jetty-env/project/build/JettyEnvTestProject.scala
@@ -0,0 +1,10 @@
+import sbt._
+import java.io.File
+import java.lang.System
+
+class JettyEnvTestProject(info: ProjectInfo) extends DefaultWebProject(info){
+ override def jettyEnvXml = Some( (info.projectPath / "conf" / "jetty" / "jetty-env.xml").asFile)
+ val jetty7WebApp = "org.eclipse.jetty" % "jetty-webapp" % "7.0.2.RC0" % "test"
+ val jetty7Plus = "org.eclipse.jetty" % "jetty-plus" % "7.0.2.RC0" % "test"
+ val servletApiDep = "javax.servlet" % "servlet-api" % "2.5" % "provided"
+}
diff --git a/sbt/src/sbt-test/web/jetty-env/src/main/scala/HelloJndi.scala b/sbt/src/sbt-test/web/jetty-env/src/main/scala/HelloJndi.scala
new file mode 100755
index 000000000..d5ea8f4ac
--- /dev/null
+++ b/sbt/src/sbt-test/web/jetty-env/src/main/scala/HelloJndi.scala
@@ -0,0 +1,14 @@
+import javax.servlet.http.{HttpServlet, HttpServletRequest => HSReq, HttpServletResponse => HSResp}
+import javax.naming.{InitialContext => IC};
+
+class HelloJndi extends HttpServlet {
+
+ val key = "java:comp/env/testValue"
+ val testValue = (new IC).lookup(key)
+
+ override def doGet(req : HSReq, resp : HSResp) =
+ resp.getWriter().print("" +
+ "Hello JNDI!" +
+ "Hello JNDI,
Value of " + key + ": " + testValue + "" +
+ "")
+}
diff --git a/sbt/src/sbt-test/web/jetty-env/src/main/webapp/WEB-INF/web.xml b/sbt/src/sbt-test/web/jetty-env/src/main/webapp/WEB-INF/web.xml
new file mode 100755
index 000000000..f02e0c1f8
--- /dev/null
+++ b/sbt/src/sbt-test/web/jetty-env/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,13 @@
+
+
+
+ helloJNDI
+ HelloJndi
+
+
+ helloJNDI
+ /
+
+