Don't early init logging, causing main class discovery to fail

Author: graemerocher

grails-core/src/main/groovy/grails/boot/config/GrailsAutoConfiguration.groovy

@@ -20,7 +20,6 @@ import grails.core.GrailsApplication
 import grails.boot.config.tools.ClassPathScanner
 import grails.core.GrailsApplicationClass
 import groovy.transform.CompileStatic
-import groovy.util.logging.Slf4j
 import org.grails.compiler.injection.AbstractGrailsArtefactTransformer
 import org.grails.spring.aop.autoproxy.GroovyAwareAspectJAwareAdvisorAutoProxyCreator
 import org.springframework.aop.config.AopConfigUtils
@@ -39,20 +38,20 @@ import java.lang.reflect.Field
  *
  */
 @CompileStatic
-@Slf4j
+// WARNING: Never add logging to the source of this class, early initialization causes problems
 class GrailsAutoConfiguration implements GrailsApplicationClass, ApplicationContextAware {
 
-    private static final String APC_PRIORITY_LIST_FIELD = "APC_PRIORITY_LIST";
+    private static final String APC_PRIORITY_LIST_FIELD = "APC_PRIORITY_LIST"
 
     static {
         try {
             // patch AopConfigUtils if possible
-            Field field = AopConfigUtils.class.getDeclaredField(APC_PRIORITY_LIST_FIELD);
+            Field field = AopConfigUtils.class.getDeclaredField(APC_PRIORITY_LIST_FIELD)
             if(field != null) {
-                field.setAccessible(true);
-                Object obj = field.get(null);
-                List<Class<?>> list = (List<Class<?>>) obj;
-                list.add(GroovyAwareAspectJAwareAdvisorAutoProxyCreator.class);
+                field.setAccessible(true)
+                Object obj = field.get(null)
+                List<Class<?>> list = (List<Class<?>>) obj
+                list.add(GroovyAwareAspectJAwareAdvisorAutoProxyCreator.class)
             }
         } catch (Throwable e) {
             // ignore

grails-core/src/main/groovy/org/grails/compiler/injection/ApplicationClassInjector.groovy

@@ -34,13 +34,14 @@ import org.codehaus.groovy.ast.stmt.BlockStatement
 import org.codehaus.groovy.ast.stmt.ExpressionStatement
 import org.codehaus.groovy.ast.stmt.ReturnStatement
 import org.codehaus.groovy.ast.stmt.Statement
+import org.codehaus.groovy.ast.tools.GeneralUtils
 import org.codehaus.groovy.classgen.GeneratorContext
 import org.codehaus.groovy.control.SourceUnit
 import org.grails.core.artefact.ApplicationArtefactHandler
 import org.grails.io.support.GrailsResourceUtils
 import org.grails.io.support.UrlResource
 import org.springframework.util.ClassUtils
-
+import static org.codehaus.groovy.ast.tools.GeneralUtils.*
 import java.lang.reflect.Modifier
 /**
  * Injector for the 'Application' class
@@ -86,8 +87,11 @@ class ApplicationClassInjector implements GrailsArtefactClassInjector {
                 def enableAgentMethodCall = new MethodCallExpression(new ClassExpression(ClassHelper.make(Support)), "enableAgentIfNotPresent", arguments)
                 def methodCallStatement = new ExpressionStatement(enableAgentMethodCall)
 
-                List<Statement> statements = [ methodCallStatement ]
-                classNode.addStaticInitializerStatements(statements, false)
+                List<Statement> statements = [
+                        stmt( callX(classX(System), "setProperty", args(  propX( classX(BuildSettings), "MAIN_CLASS_NAME"), constX(classNode.name) )) ),
+                        methodCallStatement
+                ]
+                classNode.addStaticInitializerStatements(statements, true)
 
                 def packageNamesMethod = classNode.getMethod('packageNames', GrailsASTUtils.ZERO_PARAMETERS)