Various changes:

- Fix for GRAILS-10411 (super dispatchers)
- Better forked JVM test harness
- Work in progress on improved logging/explain mode
This commit is contained in:
Andrew Clement
2014-01-31 13:22:49 -08:00
parent 64cd7e84dc
commit 2337f84fdd
53 changed files with 915 additions and 235 deletions

View File

@@ -1,7 +1,7 @@
package executor;
@SuppressWarnings("unused")
public class B2 {
// annotation removed

View File

@@ -0,0 +1,9 @@
package foo;
public class Controller extends grails.Top {
public void foo() {
super.foo();
System.out.println("Controller.foo() running");
}
}

View File

@@ -0,0 +1,9 @@
package foo;
public class Controller2 extends grails.Top {
public void foo() {
super.foo();
System.out.println("Controller.foo() running again!");
}
}

View File

@@ -0,0 +1,9 @@
package foo;
public class ControllerB extends grails.TopB {
public void foo() {
super.foo();
System.out.println("ControllerB.foo() running");
}
}

View File

@@ -0,0 +1,9 @@
package foo;
public class ControllerB2 extends grails.TopB {
public void foo() {
super.foo();
System.out.println("ControllerB.foo() running again!");
}
}

View File

@@ -0,0 +1,9 @@
package foo;
public class ControllerC extends grails.TopC {
public void foo() {
super.foo();
System.out.println("ControllerC.foo() running");
}
}

View File

@@ -0,0 +1,9 @@
package foo;
public class ControllerC2 extends grails.TopC {
public void foo() {
super.foo();
System.out.println("ControllerC.foo() running again!");
}
}

View File

@@ -0,0 +1,13 @@
package foo;
public class ControllerD extends grails.TopD {
public void foo() {
super.foo();
System.out.println(getMessage());
}
private String getMessage() {
return "ControllerD.foo() running";
}
}

View File

@@ -0,0 +1,13 @@
package foo;
public class ControllerD2 extends grails.TopD {
public void foo() {
super.foo();
System.out.println(getMessage());
}
private String getMessage() {
return "ControllerD.foo() running again!";
}
}

View File

@@ -0,0 +1,9 @@
package foo;
public class SubControllerB extends ControllerB {
public void foo() {
super.foo();
System.out.println("SubControllerB.foo() running");
}
}

View File

@@ -0,0 +1,9 @@
package foo;
public class SubControllerB2 extends ControllerB {
public void foo() {
super.foo();
System.out.println("SubControllerB.foo() running again!");
}
}

View File

@@ -0,0 +1,8 @@
package grails;
public class Top {
public void foo() {
System.out.println("Top.foo() running");
}
}

View File

@@ -0,0 +1,8 @@
package grails;
public class TopB {
protected void foo() {
System.out.println("TopB.foo() running");
}
}

View File

@@ -0,0 +1,8 @@
package grails;
public class TopC {
public void foo() {
System.out.println("TopC.foo() running");
}
}

View File

@@ -0,0 +1,8 @@
package grails;
public class TopD {
protected void foo() {
System.out.println("TopD.foo() running");
}
}

View File

@@ -1,6 +1,10 @@
package jvmtwo;
public class Runner {
public static void main(String[] argv) {
run();
}
public static void run() {
System.out.print("jvmtwo.Runner.run() running");

View File

@@ -4,7 +4,6 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
@SuppressWarnings({ "unchecked" })
public class FieldInvoker {
public static boolean callEquals(Field thiz, Object a0) {

View File

@@ -4,7 +4,7 @@ import reflection.AnnoT;
import reflection.AnnoT2;
import reflection.AnnoT3;
@SuppressWarnings("unused")
public class ClassTarget {
@AnnoT3("field")

View File

@@ -3,6 +3,6 @@ package remote;
public class One {
public void run() {
System.out.print("first load");
System.out.print("first");
}
}

View File

@@ -3,6 +3,6 @@ package remote;
public class One2 {
public void run() {
System.out.print("second load");
System.out.print("second");
}
}