fix for GRAILS-1519

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

Author: graeme

lib/groovy-all-1.1-beta-3-SNAPSHOT.jar

@@ -394,7 +394,8 @@ void setClasspath() {
     def grailsDir = resolveResources("file:${basedir}/grails-app/*")
 	def pluginLibs = resolveResources("file:${basedir}/plugins/*/lib")
 
-	Ant.path(id:"grails.classpath")  {
+	Ant.path(id:"grails.classpath")  {       
+		pathelement(location:"${classesDir.absolutePath}")
 		pathelement(location:"${basedir}")
 		pathelement(location:"${basedir}/test/unit")
 		pathelement(location:"${basedir}/test/integration")		

scripts/Init.groovy

@@ -69,11 +69,9 @@ task( watchContext: "Watches the WEB-INF/classes directory for changes and resta
 	        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")
-			}
+                        projectName:baseName,          
+						cleanJavaCompile:true,
+						compilerClasspath.curry(false))
 
 		}
         catch(Exception e) {

scripts/RunApp.groovy

@@ -23,7 +23,8 @@ import org.codehaus.groovy.grails.compiler.injection.*
 import org.apache.tools.ant.BuildException
 import org.codehaus.groovy.tools.javac.JavaAwareCompilationUnit
 import org.codehaus.groovy.tools.ErrorReporter
-import org.apache.tools.ant.AntClassLoader
+import org.apache.tools.ant.AntClassLoader  
+import org.apache.tools.ant.util.*
 import org.codehaus.groovy.control.*
 
 /**
@@ -47,7 +48,8 @@ class GrailsCompiler extends Groovyc {
 	def compileList = []
 
 	String resourcePattern
-	String projectName
+	String projectName  
+	boolean cleanJavaCompile = false
 
 	void resetFileLists() { compileList.clear() }
 
@@ -103,7 +105,23 @@ class GrailsCompiler extends Groovyc {
 		def resourceLoader = new GrailsResourceLoader(resources)
         GrailsResourceLoaderHolder.resourceLoader = resourceLoader
 
-		if(compileList) {
+		if(compileList) {                                      
+			// if there are Java sources do a complete re-compile
+			if(cleanJavaCompile && compileList.find { it.name.endsWith(".java") }) {
+				compileList.clear()
+			    def m = new IdentityMapper()
+        		def sfs = new SourceFileScanner(this);
+				for(srcPath in src.list()) {
+					def srcDir = getProject().resolveFile(srcPath)
+					def files = getDirectoryScanner(srcDir).getIncludedFiles()
+					files = sfs.restrictAsFiles(files, srcDir, destDir, m)					
+					for(f in files) {
+						if(f.name.endsWith(".groovy") || f.name.endsWith(".java"))
+							compileList << f
+					}
+						
+				}
+			} 
 	        println "Compiling ${compileList.size()} source file${compileList ? 's' : ''} to ${destdir}"
 
 	        if(classpath) configuration.classpath = classpath.toString()