Index: /Users/bguan/grails-TRUNK/scripts/Init.groovy
===================================================================
--- /Users/bguan/grails-TRUNK/scripts/Init.groovy	(revision 5345)
+++ /Users/bguan/grails-TRUNK/scripts/Init.groovy	(working copy)
@@ -38,6 +38,7 @@
 serverPort = System.getProperty('server.port') ? System.getProperty('server.port').toInteger() : 8080   
 serverPortHttps = System.getProperty('server.port.https') ? System.getProperty('server.port.https').toInteger() : 8443
 serverHost = System.getProperty('server.host') ? System.getProperty('server.host') : null
+enableJndi = System.getProperty('enable.jndi') == "true" ? true : false
 basedir = System.getProperty("base.dir") 
 baseFile = new File(basedir)
 baseName = baseFile.name      
Index: /Users/bguan/grails-TRUNK/scripts/RunApp.groovy
===================================================================
--- /Users/bguan/grails-TRUNK/scripts/RunApp.groovy	(revision 5345)
+++ /Users/bguan/grails-TRUNK/scripts/RunApp.groovy	(working copy)
@@ -27,6 +27,8 @@
 import org.mortbay.jetty.nio.*
 import org.mortbay.jetty.handler.*
 import org.mortbay.jetty.webapp.*
+import org.mortbay.jetty.plus.naming.*
+import javax.naming.*
 
 import org.codehaus.groovy.tools.RootLoader
 
@@ -114,6 +116,14 @@
     connectors[0].setPort(serverPort)
     server.setConnectors( (Connector [])connectors )
     webContext = new WebAppContext("${basedir}/web-app", "/${grailsAppName}")
+    if (enableJndi) { 
+        def confClassList = ["org.mortbay.jetty.webapp.WebInfConfiguration", 
+                             "org.mortbay.jetty.plus.webapp.EnvConfiguration", 
+                             "org.mortbay.jetty.plus.webapp.Configuration", 
+                             "org.mortbay.jetty.webapp.JettyWebXmlConfiguration", 
+                             "org.mortbay.jetty.webapp.TagLibConfiguration"] 
+        webContext.setConfigurationClasses((String[])confClassList ) 
+    }
     webContext.setDefaultsDescriptor("${grailsHome}/conf/webdefault.xml")
     webContext.setClassLoader(classLoader)
     webContext.setDescriptor(webXmlFile.absolutePath)
Index: /Users/bguan/grails-TRUNK/.classpath
===================================================================
--- /Users/bguan/grails-TRUNK/.classpath	(revision 5345)
+++ /Users/bguan/grails-TRUNK/.classpath	(working copy)
@@ -45,6 +45,8 @@
   <classpathentry kind="lib" path="lib/jdbc2_0-stdext.jar" />
   <classpathentry kind="lib" path="lib/jetty-6.1.4.jar" />
   <classpathentry kind="lib" path="lib/jetty-util-6.1.4.jar" />
+  <classpathentry kind="lib" path="lib/jetty-naming-6.1.4.jar" />
+  <classpathentry kind="lib" path="lib/jetty-plus-6.1.4.jar" />
   <classpathentry kind="lib" path="lib/jsp-api-2.0.jar" />
   <classpathentry kind="lib" path="lib/jstl-2.3.jar" />
   <classpathentry kind="lib" path="lib/jstl-2.4.jar" />
Index: /Users/bguan/grails-TRUNK/lib/ivy-1.4.1.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: /Users/bguan/grails-TRUNK/lib/ivy-1.4.1.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: /Users/bguan/grails-TRUNK/lib/jetty-naming-6.1.4.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: /Users/bguan/grails-TRUNK/lib/jetty-naming-6.1.4.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: /Users/bguan/grails-TRUNK/lib/jetty-plus-6.1.4.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: /Users/bguan/grails-TRUNK/lib/jetty-plus-6.1.4.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream