fix for memory leak when doing grails run-app (GRAILS-1550)

git-svn-id: https://svn.codehaus.org/grails/trunk@5754 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

scripts/Init.groovy

@@ -389,35 +389,36 @@ target(classpath:"Sets the Grails classpath") {
     setClasspath()
 }
 
-void setClasspath() {
-    if (classpathSet) return
-
-    def grailsDir = resolveResources("file:${basedir}/grails-app/*")
-	def pluginLibs = resolveResources("file:${basedir}/plugins/*/lib")
-
-	Ant.path(id:"grails.classpath")  {       
+grailsClasspath = { pluginLibs, grailsDir ->
 		pathelement(location:"${classesDir.absolutePath}")
 		pathelement(location:"${basedir}")
 		pathelement(location:"${basedir}/test/unit")
-		pathelement(location:"${basedir}/test/integration")		
+		pathelement(location:"${basedir}/test/integration")
 		pathelement(location:"${basedir}/web-app")
 		pathelement(location:"${basedir}/web-app/WEB-INF")
 		pathelement(location:"${basedir}/web-app/WEB-INF/classes")
-		for(pluginLib in pluginLibs) {                      
+		for(pluginLib in pluginLibs) {
 			fileset(dir:pluginLib.file.absolutePath)
 		}
 		if (new File("${basedir}/web-app/WEB-INF/lib").exists()) {
 		    fileset(dir:"${basedir}/web-app/WEB-INF/lib")
 		}
 		fileset(dir:"${grailsHome}/lib")
-		fileset(dir:"${grailsHome}/dist") 
+		fileset(dir:"${grailsHome}/dist")
 		if(new File("${basedir}/lib").exists()) {
 			fileset(dir:"${basedir}/lib")
 		}
 		for(d in grailsDir) {
 			pathelement(location:"${d.file.absolutePath}")
 		}
-	}
+}
+void setClasspath() {
+    if (classpathSet) return
+
+    def grailsDir = resolveResources("file:${basedir}/grails-app/*")
+	def pluginLibs = resolveResources("file:${basedir}/plugins/*/lib")
+
+	Ant.path(id:"grails.classpath",grailsClasspath.curry(pluginLibs, grailsDir))
     StringBuffer cpath = new StringBuffer("")
 
     def jarFiles = getJarFiles()

scripts/RunApp.groovy

@@ -68,15 +68,21 @@ target( watchContext: "Watches the WEB-INF/classes directory for changes and res
     long lastModified = classesDir.lastModified()
     while(true && autoRecompile) {
         try {
-	        Ant.groovyc(destdir:classesDirPath,
+            def ant = new AntBuilder()
+            ant.taskdef ( 	name : 'groovyc' ,
+				            classname : 'org.codehaus.groovy.grails.compiler.GrailsCompiler' )
+            def grailsDir = resolveResources("file:${basedir}/grails-app/*")
+            def pluginLibs = resolveResources("file:${basedir}/plugins/*/lib")
+            ant.path(id:"grails.classpath",grailsClasspath.curry(pluginLibs, grailsDir))				            
+            ant.groovyc(destdir:classesDirPath,
 	                    classpathref:"grails.classpath",
 					    resourcePattern:"file:${basedir}/**/grails-app/**/*.groovy",
 						projectName:baseName) {
 						src(path:"${basedir}/src/java")
 						src(path:"${basedir}/src/groovy")
 						src(path:"${basedir}/grails-app/domain")
 					}
-
+            ant = null
 		}
         catch(Exception e) {
             compilationError = true
@@ -105,7 +111,7 @@ target( watchContext: "Watches the WEB-INF/classes directory for changes and res
                lastModified = classesDir.lastModified()
             }
         }
-        sleep(2500)
+        sleep(5)
     }
 }