Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: tombujok/grails-core
...
head fork: tombujok/grails-core
Checking mergeability… Don’t worry, you can still create the pull request.
Commits on Jan 21, 2013
@chanwit chanwit Fixed for GRAILS-9778 - Cygwin shows empty path df8367e
Commits on Sep 09, 2013
@jeffbrown jeffbrown version 2.4.0.BUILD-SNAPSHOT 4c32db9
Commits on Sep 11, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 1af3dc6
Commits on Sep 15, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 33548f4
Commits on Sep 16, 2013
@jeffbrown jeffbrown GRAILS-10448 - use spring 4.0.0.BUILD-SNAPSHOT 0955568
@jeffbrown jeffbrown GRAILS-10448 - temporarily use http://repo.springsource.org/libs-mile… 79cad91
@jeffbrown jeffbrown GRAILS-10448 - get a clean compile
All of these changes are temporary and need to be addressed individually.  This is just a step to get the code base compiling against Spring 4 so I can move forward with some specific relevant work.  The changes in this commit will be addressed later.
cde69d8
@jeffbrown jeffbrown GRAILS-5779 - start removing bean builder code
Use the corresponding library provided by Spring 4
b6a3701
@jeffbrown jeffbrown GRAILS-5779 - grails-core depends on spring-lang-groovy for bean builder
classes
2cc0bc6
@jeffbrown jeffbrown GRAILS-10448 - introduce our own ExpressionEvaluationUtils for now 1be0fd3
@jeffbrown jeffbrown GRAILS-10448 - replace WebUtils.exposeForwardRequestAttributes which …
…was removed from Spring 4
4364239
@jeffbrown jeffbrown GRAILS-10448 - fix call to ClassUtils.forName 2a53acc
@jeffbrown jeffbrown GRAILS-10448 - use our temporary ExpressionEvaluationUtils 3b5f770
@jeffbrown jeffbrown GRAILS-10448 - imported the wrong Assert a664e2f
@jeffbrown jeffbrown GRAILS-5779 - fix WebBeanBuilder to use WebRuntimeSpringConfiguration e2731c3
Commits on Sep 17, 2013
@jeffbrown jeffbrown GRAILS-10448 - fix failing test
DriverManagerDataSource no longer accepts the driver name as a constructor argument
e20eb51
@jeffbrown jeffbrown GRAILS-10448 - fix failing test
processAction now expects the http method to be supplied as an argument
ab44185
@jeffbrown jeffbrown GRAILS-10448 - Remove JdkVersion.isAtLeastJava15() check
pre 1.5 is no longer supported
1ed1a5a
@jeffbrown jeffbrown GRAILS-10448 - fix failing tests
Refresh the app context
49cfac7
@jeffbrown jeffbrown GRAILS-10448 - comment out failing assertion
Pending investigation.
652ef69
@jeffbrown jeffbrown Merge branch '2.3.x' 8514682
@jeffbrown jeffbrown GRAILS-10449 - use groovy 2.2.0-beta-2 13fb1aa
@graemerocher graemerocher fixed incorrect assumption d7a976d
@jeffbrown jeffbrown Merge branch '2.3.x' c7b8d16
@jeffbrown jeffbrown Merge branch 'spring_4' 85a1812
@jeffbrown jeffbrown GRAILS-5779 - restore the original bean builder
The bean builder work isn't complete but all of the code is working for
me locally. spring-lang-groovy hasn't been published to any public repo yet so I am rolling this back until that is available.  I want to get the rest of the Spring 4 code pushed out and running in the mean time so we can work through issues.
b27ddf8
@jeffbrown jeffbrown GRAILS-10448 - fix singleton property access in the bean builder
The bean builder supports a syntax that allows the "singleton" property of the bean configuration to be assigned a boolean. Prior to Spring 4 this worked because AbstractBeanDefinition.setSingleton() existed. That method has been removed in Spring 4 so we need special handling to support the same syntax in the bean builder.

The version of the bean builder that we are working on for inclusion in Spring 4 also contains this commit will be irrelevant once we get to that point.
9396711
@jeffbrown jeffbrown GRAILS-10448 - Remove GrailsContextLoader
With Spring 2.3 we had a GrailsContextLoaderListener which would create a GrailsContextLoader.  Spring 2.4 removes the createContextLoader() listener as ContextLoaderListener extends ContextLoader so the listener _is_ a loader.
ad65397
Commits on Sep 18, 2013
@jeffbrown jeffbrown GRAILS-9999 - supply type information to help @CompileStatic e95b273
@jeffbrown jeffbrown Merge branch '2.3.x' ce44424
@jeffbrown jeffbrown Merge branch '2.3.x' dee4c28
Commits on Sep 19, 2013
@jchharris jchharris GRAILS-9814 -Prevent all of ${basedir}/src folder from being packaged…
… as part of a binary plugin. Only src/groovy src/java if includeSource is enabled
406bb15
@graemerocher graemerocher Merge pull request #401 from jchharris/master
GRAILS-9814 -Prevent all of ${basedir}/src folder from being packaged with a binary plugin
b9c953e
@jeffbrown jeffbrown Merge branch '2.3.x' c8fe333
@jeffbrown jeffbrown Merge branch '2.3.x' 3b33ef1
@jeffbrown jeffbrown Merge branch '2.3.x' 2a644f1
@jeffbrown jeffbrown Merge branch '2.3.x' 61e972d
Commits on Sep 20, 2013
@jeffbrown jeffbrown GRAILS-9251 - improve controller compiler
The compiler was issuing a warning about non validate able command objects if the command object type wasn't being compiled as part of this project.  This was causing unnecessary warnings when using validate able objects that are provided by plugins or libraries.
a2b7feb
@jeffbrown jeffbrown Merge branch '2.3.x' 0bcad96
Commits on Sep 22, 2013
@jeffbrown jeffbrown upgrade to aspectj 1.8.0.M1 6a7e7ab
Commits on Sep 23, 2013
@jeffbrown jeffbrown GRAILS-10448 - remove WebUtils.exposeForwardRequestAttributes 5a41fa4
@jeffbrown jeffbrown Merge branch '2.3.x' 176bcb0
@jeffbrown jeffbrown remove repo.springsource.org/libs-milestone
This has been added as a remote at repo.grails.org for now
ba6025f
@jeffbrown jeffbrown Use setMethodTarget to optimize call to getExceptionHandlerMethodFor …
…in controller actions
a42f9df
Commits on Sep 26, 2013
@pledbrook pledbrook Merge branch '2.3.x' f296925
@pledbrook pledbrook Merge branch '2.3.x' 3076ba6
Commits on Sep 27, 2013
@pledbrook pledbrook Merge branch '2.3.x' f889d69
Commits on Sep 28, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 75b7eb3
Commits on Sep 30, 2013
@jeffbrown jeffbrown GRAILS-10448 - remove ExpressionEvaluationUtils 4de34b7
@jeffbrown jeffbrown deprecate JspRenderInputTag and JspInvokeGrailsTagLibTag 08f4dc3
Commits on Oct 08, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 2622b28
Commits on Oct 09, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 6e939dd
@jeffbrown jeffbrown Merge branch '2.3.x' b8cfb86
Commits on Oct 10, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 0fc4e9f
Commits on Oct 12, 2013
@pledbrook pledbrook Merge branch '2.3.x' 0121e2e
Commits on Oct 13, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 584c367
Commits on Oct 14, 2013
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
3a5c7a2
@jeffbrown jeffbrown Merge branch '2.3.x' 4eacbc2
@jeffbrown jeffbrown Merge branch '2.3.x' 234b986
@jeffbrown jeffbrown Merge branch '2.3.x' c7e0fe9
Commits on Oct 15, 2013
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
8c6ce62
@graemerocher graemerocher Merge branch '2.2.x'
Conflicts:
	grails-plugin-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/filter/UrlMappingsFilter.java
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/ErrorHandlingServlet.java
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/util/WebUtils.java
0e1b880
Commits on Oct 16, 2013
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	grails-plugin-url-mappings/src/main/groovy/org/codehaus/groovy/grails/web/mapping/filter/UrlMappingsFilter.java
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/ErrorHandlingServlet.java
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/util/WebUtils.java
76a0691
@jeffbrown jeffbrown fix problem with previous merge ad19eb8
@jeffbrown jeffbrown Merge branch '2.3.x' 4dd930c
Commits on Oct 17, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 3ab484c
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
d0e14f1
Commits on Oct 18, 2013
@lhotari lhotari Merge branch '2.3.x'
Conflicts:
	build.gradle
	build.properties
	grails-core/src/main/groovy/org/codehaus/groovy/grails/compiler/injection/AbstractGrailsArtefactTransformer.java
	grails-plugin-controllers/src/main/groovy/org/codehaus/groovy/grails/compiler/web/ControllerActionTransformer.java
	grails-plugin-mimetypes/src/main/groovy/org/codehaus/groovy/grails/compiler/web/MimeTypesTransformer.java
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
d78906f
Commits on Oct 19, 2013
@jmacnish jmacnish Update HalJsonRenderer.groovy
Fixes 3 problems:  
- Java Enums were written out with extra quotes around the "\"ACTIVE\""
- Java dates written out with extra quotes, and also as a date toString() -- some way to force ISO8601?
- GSON "Dangling name" issue due to trying to skip objects that were already written.
b17e936
Commits on Oct 21, 2013
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
860bb63
Commits on Oct 23, 2013
@jmacnish jmacnish - Bug fix: duplicate elements causing GSON errors (due to starting ob…
…ject, then continuing). Keep track if we've written object.

- Bug fix: Enum and Date types written with quotes and bad formatting.
- Feature: elideDuplicates flag allows control over skipping elements or not
- Feature: dateToStringConverter allows writing dates in custom format
- Add tests.
44bdf8a
Commits on Oct 24, 2013
@kgeis kgeis Fix typos in JavaDoc for JSON converter 8d47316
@bobbywarner bobbywarner Merge pull request #416 from UCB-RAC/master
Fix typos in JavaDoc for JSON converter
f65aabb
@bobbywarner bobbywarner Updated Groovy to 2.2.0-rc-1 82940f8
@graemerocher graemerocher Merge pull request #417 from jmacnish/master
GRAILS-10672 : fix enums, dates, and repeated elements in HAL JSON rendering
b202762
@burtbeckwith burtbeckwith cleanup, whitespace dc9e98b
Commits on Oct 29, 2013
@lhotari lhotari Revert "cleanup, whitespace"
This reverts commit dc9e98b.
3802127
Commits on Oct 30, 2013
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
	grails-bootstrap/src/main/groovy/org/codehaus/groovy/grails/resolve/GrailsCoreDependencies.java
	grails-plugin-rest/src/main/groovy/grails/rest/render/hal/HalJsonRenderer.groovy
	grails-plugin-rest/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalJsonRendererSpec.groovy
6395c21
@jeffbrown jeffbrown Merge branch '2.3.x' 500fe5a
Commits on Oct 31, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 78fad94
@jeffbrown jeffbrown Merge branch '2.3.x' 860ff9d
Commits on Nov 04, 2013
@lhotari lhotari Merge branch '2.3.x' 7540709
@jeffbrown jeffbrown fix failing tests c57bc1a
Commits on Nov 05, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' db866a0
@jeffbrown jeffbrown fix failing test 8ed2d41
@zyro23 zyro23 - fixed build on windows (remove deprecated useAnt gradle groovy options
and updated jansi for compatibility with jline)

- prevent DefaultGrailsApplication.setMainContext invoking getBean() on
an unrefreshed context during app start
7f970ef
@burtbeckwith burtbeckwith Merge pull request #421 from zyro23/2.4-windows
make current BUILD-SNAPSHOT build and run under windows
3eee6e1
Commits on Nov 06, 2013
@jeffbrown jeffbrown GRAILS-10448 - revert Spring 4 upgrade code for now
This is a temporary measure to get the Spring 4 variable out of the
equation while build problems are being resolved.
ddf4160
@jeffbrown jeffbrown Partially Revert "- fixed build on windows (remove deprecated useAnt …
…gradle groovy options"

Fixing failing tests.  This reverts part of commit 7f970ef.  It isn't clear yet why this is happening but it appears to be a problem with the way that the classes are being compiled.  Pending further investigation.
a22e020
@jeffbrown jeffbrown Merge branch '2.3.x' d099452
@jeffbrown jeffbrown Merge branch '2.3.x' 6783640
@jeffbrown jeffbrown Merge branch '2.3.x' 6732a0d
@jeffbrown jeffbrown Merge branch '2.3.x' cdc7628
@jeffbrown jeffbrown Merge branch '2.3.x' ff7df0f
@jeffbrown jeffbrown GRAILS-10449 - use Groovy 2.2.0-rc3 ea152c3
@jeffbrown jeffbrown Merge branch '2.3.x' b58dc3a
@jeffbrown jeffbrown Revert "GRAILS-10448 - revert Spring 4 upgrade code for now"
This reverts commit ddf4160.
d0b67f5
@jeffbrown jeffbrown use Spring 4.0.0.RC1 e2f41ea
@jeffbrown jeffbrown GRAILS-10448 - ignore test temporarily
Something is going wrong with dependency injecting the UrlMappings object into the VideController.  If the @Autowired annotation which is added at https://github.com/grails/grails-core/blob/2c0024e86c7a552951eba7195dfc4b814238fac8/grails-plugin-rest/src/main/groovy/org/grails/plugins/web/rest/transform/ResourceTransform.groovy#L188 is removed the test passes.

This is pending further investigation but a step back toward a clean build with Spring 4.0.0.RC1.
5a9f6d5
Commits on Nov 07, 2013
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
4943cfc
@jeffbrown jeffbrown resolve merge conflicts 1da314b
Commits on Nov 08, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 1456ac7
@jeffbrown jeffbrown isolate DefaultGrailsControllerClassTests
troubleshooting a test which is failing on our CI server but not failing for me locally
67a555c
@jeffbrown jeffbrown Revert "isolate DefaultGrailsControllerClassTests"
This reverts commit 67a555c.
bc01c60
@jeffbrown jeffbrown Revert "GRAILS-10448 - ignore test temporarily"
This reverts commit 5a9f6d5.
882aaca
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
868172f
Commits on Nov 11, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 6e331ee
@jeffbrown jeffbrown GRAILS-10448 - troubleshooting tests failing on the build server 77a18ce
Commits on Nov 12, 2013
@jeffbrown jeffbrown GRAILS-10448 - put Spring 4.0.0.RC1 back in place
This reverts commit 77a18ce.
70aa5fd
@jeffbrown jeffbrown GRAILS-10448 - isolating and ignoring some tests
Still troubleshooting build failures.  There appears to be something
going wrong with state surviving across tests.
dd79ae7
@jeffbrown jeffbrown Merge branch '2.3.x' f2c1007
@jeffbrown jeffbrown Merge branch '2.3.x' 8605992
@jeffbrown jeffbrown I do not think this version of BeforeValidateHelper is used anywhere … 9563bde
@jeffbrown jeffbrown Merge branch '2.3.x' 3a341bc
Commits on Nov 13, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' d977508
@pledbrook pledbrook Merge branch '2.3.x' 296b36b
@jeffbrown jeffbrown Merge branch '2.3.x' 7411cee
@jeffbrown jeffbrown GRAILS-10751 - improve how params.boolean(String) handles "on" 1f7354f
@jeffbrown jeffbrown Merge branch '2.3.x' 382053a
@Omnipresent Omnipresent Fixing the javadoc af3398b
@jeffbrown jeffbrown Merge branch '2.3.x' 31bb134
Commits on Nov 14, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 117248b
@jeffbrown jeffbrown Merge branch '2.3.x' c5b6f2a
@jeffbrown jeffbrown Merge branch '2.3.x' 19c6eb9
@jeffbrown jeffbrown Merge branch '2.3.x' 1b0c4da
Commits on Nov 15, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' eec65a7
@jeffbrown jeffbrown Merge branch '2.3.x' 5ef13d8
Commits on Nov 16, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 14c54ab
Commits on Nov 17, 2013
@alkemist alkemist Update build to Gradle 1.9-rc-3
There are some deprecations to sort out, but it appears to build without incident
d792ab1
@alkemist alkemist Don't use the deprecated groovy dependency configuration. 855e354
@alkemist alkemist Block javaee-web-api from poisoning the compile classpath for this pr…
…oject.
ebbbeb3
Commits on Nov 18, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' e386312
@bobbywarner bobbywarner Gradle 1.9-rc-4 udpate d91be50
@jeffbrown jeffbrown use Groovy 2.2.0 0d3ac2e
@jeffbrown jeffbrown regenerate gradle-wrapper.jar with 1.9-rc-4 767d084
Commits on Nov 19, 2013
@alkemist alkemist Build with Gradle 1.9 fc32942
@jeffbrown jeffbrown regenerate gradle-wrapper.jar with gradle 1.9 eec75a9
Commits on Nov 20, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' bda7fde
Commits on Nov 21, 2013
@jeffbrown jeffbrown Use Spring 4.0.0.BUILD-SNAPSHOT
I am working with a locally built version of the snapshot which I think should be close to the published snapshot.
04e2725
@jeffbrown jeffbrown implement getBeanNamesForAnnotation from the ListableBeanFactory inte…
…rface
d401a82
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
0bcd02a
Commits on Nov 22, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 9f711b7
@jeffbrown jeffbrown Merge branch '2.3.x' aa23df8
Commits on Nov 25, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' a033aee
Commits on Nov 26, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' e135199
@jeffbrown jeffbrown Merge branch '2.3.x' 486036c
@jeffbrown jeffbrown Merge branch '2.3.x' 5b3468f
@jeffbrown jeffbrown Merge branch '2.3.x' 493d2d1
@jeffbrown jeffbrown Merge branch '2.3.x' dfe1d4a
Commits on Nov 27, 2013
@bobbywarner bobbywarner Updated Groovy to 2.2.1 d6e8cf8
@jeffbrown jeffbrown Merge branch '2.3.x' 759554a
@jeffbrown jeffbrown Merge branch '2.3.x' 3f21bba
Commits on Dec 02, 2013
@graemerocher graemerocher Merge pull request #316 from chanwit/patch-1
Fixed for GRAILS-9778 - Cygwin shows empty path
2700458
@jeffbrown jeffbrown Merge branch '2.3.x' d7638fd
Commits on Dec 03, 2013
@jeffbrown jeffbrown Merge branch '2.3.x' 4a9edbb
Commits on Dec 04, 2013
@jeffbrown jeffbrown Merge branch '2.3.x'
Conflicts:
	build.gradle
	build.properties
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
92bae2e