Permalink
Browse files

Merge branch 'master' of github.com:grails/grails-core

  • Loading branch information...
2 parents 8350ed8 + 9e4bd83 commit 4fe2b65254e41f8e27cec4c4f7bb3604c413f00a @graemerocher graemerocher committed Apr 27, 2011
View
2 ...-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
@@ -130,7 +130,7 @@ public Object doCall() {
// dependencies needed at compile time
ModuleRevisionId[] groovyDependencies = {
- ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "1.8.0-rc-1")
+ ModuleRevisionId.newInstance("org.codehaus.groovy", "groovy-all", "1.8.0-rc-4")
};
registerDependencies(dependencyManager, compileTimeDependenciesMethod, groovyDependencies, "jline");
View
10 ...lers/src/main/groovy/org/codehaus/groovy/grails/compiler/web/MethodActionTransformer.java
@@ -96,17 +96,15 @@ def someAction(){
public class MethodActionTransformer implements GrailsArtefactClassInjector {
private static final AnnotationNode ACTION_ANNOTATION_NODE = new AnnotationNode(new ClassNode(Action.class));
- private static final Parameter[] EMPTY_PARAMS = new Parameter[0];
private static final String ACTION_MEMBER_TARGET = "commandObjects";
- private static final ClassNode[] EMPTY_EXCEPTIONS = new ClassNode[0];
private static final VariableExpression THIS_EXPRESSION = new VariableExpression("this");
private static final VariableExpression PARAMS_EXPRESSION = new VariableExpression("params");
private static final TupleExpression EMPTY_TUPLE = new TupleExpression();
private Boolean converterEnabled;
public MethodActionTransformer() {
- converterEnabled = Boolean.parseBoolean(System.getProperties().getProperty(BuildSettings.CONVERT_CLOSURES_KEY));
+ converterEnabled = Boolean.parseBoolean(System.getProperty(BuildSettings.CONVERT_CLOSURES_KEY));
}
public String getArtefactType() {
@@ -122,7 +120,7 @@ public void performInjection(SourceUnit source, GeneratorContext context, ClassN
private void annotateCandidateActionMethods(ClassNode classNode) {
for (MethodNode method : classNode.getMethods()) {
- if (!method.isStatic() &&
+ if (!method.isStatic() && method.isPublic() &&
method.getAnnotations(ACTION_ANNOTATION_NODE.getClassNode()).isEmpty() &&
method.getLineNumber() >= 0
) {
@@ -150,7 +148,7 @@ private void convertToMethodAction(MethodNode method) {
} else {
method.addAnnotation(ACTION_ANNOTATION_NODE);
}
- method.setParameters(EMPTY_PARAMS);
+ method.setParameters(ZERO_PARAMETERS);
}
//See WebMetaUtils#isCommandObjectAction
@@ -177,7 +175,7 @@ private void transformClosuresToMethods(ClassNode classNode) {
property.getName(),
Modifier.PUBLIC, property.getType(),
closureAction.getParameters(),
- EMPTY_EXCEPTIONS,
+ EMPTY_CLASS_ARRAY,
bodyCode(closureAction.getParameters(), closureAction.getCode())
);
View
2 ...gging/src/main/groovy/org/codehaus/groovy/grails/compiler/logging/LoggingTransformer.java
@@ -45,7 +45,7 @@
public void performInjection(SourceUnit source, GeneratorContext context, ClassNode classNode) {
final FieldNode existingField = classNode.getField(LOG_PROPERTY);
- if(existingField == null) {
+ if(existingField == null && !classNode.isInterface()) {
final String path = source.getName();
String artefactType = path != null ? GrailsResourceUtils.getArtefactDirectory(path) : null;

0 comments on commit 4fe2b65

Please sign in to comment.