Merge branch '1.2.x' of github.com:grails/grails-core into 1.2.x

Author: graemerocher

scripts/Console.groovy

@@ -32,11 +32,7 @@ target ('default': "Load the Grails interactive Swing console") {
 }            
 
 target(console:"The console implementation target") {
-
-//    classLoader = new URLClassLoader([classesDir.toURI().toURL()] as URL[], rootLoader)
-//    Thread.currentThread().setContextClassLoader(classLoader)
-	loadApp()
-	configureApp()
+    depends(loadApp, configureApp)
 
     try {
         def console = createConsole()
@@ -55,7 +51,7 @@ target(console:"The console implementation target") {
             println "Exiting console"
             console.exit()
             String scriptText = console.inputArea.text
-            createConsole()
+            console = createConsole()
             println "Restarting console"
             console.run()
             console.inputArea.addFocusListener(new ConsoleFocusListener(text:scriptText))

scripts/_GrailsBootstrap.groovy

@@ -26,6 +26,8 @@ import org.springframework.core.io.FileSystemResourceLoader
 import org.springframework.mock.web.MockServletContext
 import org.springframework.web.context.WebApplicationContext
 import org.springframework.mock.jndi.SimpleNamingContextBuilder
+import org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean
+import org.springframework.core.io.FileSystemResource
 
 
 /**
@@ -51,6 +53,12 @@ target(loadApp:"Loads the Grails application object") {
 				grailsResourceHolder = resourceHolder
 			}
 			grailsApplication(org.codehaus.groovy.grails.commons.DefaultGrailsApplication, ref("grailsResourceLoader"))
+			
+			// There is a pluginManager variable in the binding
+			delegate."pluginManager"(GrailsPluginManagerFactoryBean) {
+				application = grailsApplication
+				grailsDescriptor = new FileSystemResource("web-app/WEB-INF/grails.xml")
+			}
 		}
 	}
 

src/java/org/codehaus/groovy/grails/web/json/JSONObject.java

@@ -1157,11 +1157,11 @@ public boolean isEmpty() {
     }
 
     public boolean containsKey(Object o) {
-        return false;
+        return myHashMap.containsKey(o);
     }
 
     public boolean containsValue(Object o) {
-        return this.myHashMap.containsKey(o);
+        return this.myHashMap.containsValue(o);
     }
 
     public Object get(Object o) {

src/test/org/codehaus/groovy/grails/web/json/JSONObjectTests.groovy

@@ -0,0 +1,22 @@
+package org.codehaus.groovy.grails.web.json
+
+/**
+ * @author Graeme Rocher
+ * @since 1.0
+ */
+class JSONObjectTests extends GroovyTestCase {
+
+
+    void testContainsKey() {
+        JSONObject j = new JSONObject();
+        j.put('test', 1)
+        assert j.containsKey('test')
+    }
+
+    void testContainsValue() {
+        JSONObject j = new JSONObject();
+        j.put('test', 1)
+        assert j.containsValue(1)
+
+    }
+}