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.
  • 3 commits
  • 13 files changed
  • 0 commit comments
  • 1 contributor
View
2  bin/startGrails
@@ -114,7 +114,7 @@ fi
if [ -z "$GROOVY_CONF" ]; then
GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
fi
-STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.4.jar:$GRAILS_HOME/dist/grails-bootstrap-1.3.5.BUILD-SNAPSHOT.jar"
+STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.5.jar:$GRAILS_HOME/dist/grails-bootstrap-1.3.5.BUILD-SNAPSHOT.jar"
# Allow access to Cocoa classes on OS X
if $darwin; then
View
2  bin/startGrails.bat
@@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
-set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.4.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.3.5.BUILD-SNAPSHOT.jar
+set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.5.jar;%GRAILS_HOME%\dist\grails-bootstrap-1.3.5.BUILD-SNAPSHOT.jar
if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
View
2  build.gradle
@@ -23,7 +23,7 @@ configurations {
dependencies {
lib = "$projectDir/lib"
groovy files(fileTree(dir: lib as File, includes: ['groovy-all-1.7.*.jar']))
- compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.7.4.jar']), "${System.getenv('JAVA_HOME')}/lib/tools.jar")
+ compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.7.5.jar']), "${System.getenv('JAVA_HOME')}/lib/tools.jar")
jsp21 files("$lib/jsp-api-2.1.jar")
}
View
2  build.properties
@@ -16,7 +16,7 @@ bundlor.servlet.version=2.5.0
bundlor.jndi.version=1.2.0
bundlor.servlet.jsp.version=2.1.0
bundlor.radeox.version=1.0.0.b2
-bundlor.groovy.version=1.7.4
+bundlor.groovy.version=1.7.5
bundlor.spring.version=3.0.3.RELEASE
bundlor.ant.version=1.7.1
bundlor.ivy.version=2.0.0
View
2  conf/groovy-starter.conf
@@ -10,7 +10,7 @@
##
# Load required libraries
load ${grails.home}/dist/grails-bootstrap-${grails.version}.jar
- load ${grails.home}/lib/groovy-all-1.7.4.jar
+ load ${grails.home}/lib/groovy-all-1.7.5.jar
load ${grails.home}/lib/gpars-0.9.jar
load ${grails.home}/lib/ivy-2.1.0.jar
load ${grails.home}/lib/gant_groovy1.7-1.9.2.jar
View
4 dependencies.txt
@@ -88,8 +88,8 @@ The following libraries are included in Grails because they are required either
- Gant 1.9.2 (http://gant.codehaus.org) Apache 2.0 License
- required for the command line tools (Gant)
-* groovy-all-1.7.4.jar
-- Groovy 1.7.4 (http://groovy.codehaus.org) Apache 2.0 License
+* groovy-all-1.7.5.jar
+- Groovy 1.7.5 (http://groovy.codehaus.org) Apache 2.0 License
- required for the command line tools (Gant)
- required for building Grails core
- required for running Grails applications
View
BIN  lib/groovy-all-1.7.4.jar → lib/groovy-all-1.7.5.jar
Binary file not shown
View
2  maven/grails-docs.pom.in
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.7.4</version>
+ <version>1.7.5</version>
<exclusions>
<exclusion>
<groupId>jline</groupId>
View
2  maven/grails.pom.in
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>1.7.4</version>
+ <version>1.7.5</version>
<exclusions>
<exclusion>
<groupId>jline</groupId>
View
2  src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -249,7 +249,7 @@ class IvyDependencyManager extends AbstractIvyDependencyManager implements Depen
"javax.servlet:jsp-api:2.1"
// dependencies needed for compilation
- "${compileTimeDependenciesMethod}"("org.codehaus.groovy:groovy-all:1.7.4") {
+ "${compileTimeDependenciesMethod}"("org.codehaus.groovy:groovy-all:1.7.5") {
excludes 'jline'
}
View
2  src/resources/bash/startGrails
@@ -114,7 +114,7 @@ fi
if [ -z "$GROOVY_CONF" ]; then
GROOVY_CONF="$GRAILS_HOME/conf/groovy-starter.conf"
fi
-STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.4.jar:$GRAILS_HOME/dist/grails-bootstrap-@grails.version@.jar"
+STARTER_CLASSPATH="$GRAILS_HOME/lib/groovy-all-1.7.5.jar:$GRAILS_HOME/dist/grails-bootstrap-@grails.version@.jar"
# Allow access to Cocoa classes on OS X
if $darwin; then
View
2  src/resources/bash/startGrails.bat
@@ -106,7 +106,7 @@ set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
-set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.4.jar;%GRAILS_HOME%\dist\grails-bootstrap-@grails.version@.jar
+set STARTER_CLASSPATH=%GRAILS_HOME%\lib\groovy-all-1.7.5.jar;%GRAILS_HOME%\dist\grails-bootstrap-@grails.version@.jar
if exist "%USERPROFILE%/.groovy/init.bat" call "%USERPROFILE%/.groovy/init.bat"
View
29 src/test/org/codehaus/groovy/grails/plugins/services/ScopedProxyAndServiceClassTests.groovy
@@ -1,36 +1,30 @@
package org.codehaus.groovy.grails.plugins.services
import org.codehaus.groovy.grails.commons.test.AbstractGrailsMockTests
-import grails.spring.BeanBuilder
+import grails.spring.WebBeanBuilder
import org.springframework.web.context.support.WebApplicationContextUtils
import grails.util.GrailsWebUtil
import org.springframework.web.context.request.RequestContextHolder
import org.codehaus.groovy.grails.aop.framework.autoproxy.GroovyAwareAspectJAwareAdvisorAutoProxyCreator
-/**
- */
class ScopedProxyAndServiceClassTests extends AbstractGrailsMockTests {
-
// test for http://jira.codehaus.org/browse/GRAILS-6278
void testScopedProxy() {
- if(notYetImplemented()) return
-
- def bb = new BeanBuilder()
+ def bb = new WebBeanBuilder()
GrailsWebUtil.bindMockWebRequest()
bb.beans {
- WebApplicationContextUtils.registerWebApplicationScopes(springConfig.beanFactory);
"org.springframework.aop.config.internalAutoProxyCreator"(GroovyAwareAspectJAwareAdvisorAutoProxyCreator)
testService(TestService) { bean ->
bean.scope = "session"
}
- testScopeProxy(org.springframework.aop.scope.ScopedProxyFactoryBean){
- targetBeanName="testService"
- proxyTargetClass=true
- }
+ testScopeProxy(org.springframework.aop.scope.ScopedProxyFactoryBean){
+ targetBeanName="testService"
+ proxyTargetClass=true
+ }
}
@@ -46,18 +40,21 @@ class ScopedProxyAndServiceClassTests extends AbstractGrailsMockTests {
RequestContextHolder.setRequestAttributes null
}
}
+
class TestService {
+ def myProperty = "foo"
- def myProperty = "foo"
def serviceMethod() {
- 'bar'
+ 'bar'
}
def indirectServiceMethod() {
- serviceMethod()
- }
+ serviceMethod()
+ }
+// - This was the workaround for the bug -
+//
// private MetaClass metaClass
//
// TestService() {

No commit comments for this range

Something went wrong with that request. Please try again.