Browse files

upgrade to Spring 3 RC3 and fix for GRAILS-4589

  • Loading branch information...
1 parent 09dfbe2 commit b06d4e04debd563d18cd585722907b3ac4d15773 @graemerocher graemerocher committed Dec 1, 2009
Showing with 146 additions and 96 deletions.
  1. +16 −16 .classpath
  2. +1 −1 build.properties
  3. +4 −4 dependencies.txt
  4. +37 −39 grails.ipr
  5. BIN lib/{org.springframework.aop-3.0.0.RC2.jar → org.springframework.aop-3.0.0.RC3.jar}
  6. BIN lib/{org.springframework.asm-3.0.0.RC2.jar → org.springframework.asm-3.0.0.RC3.jar}
  7. BIN lib/org.springframework.aspects-3.0.0.RC2.jar
  8. BIN lib/org.springframework.aspects-3.0.0.RC3.jar
  9. BIN lib/{org.springframework.beans-3.0.0.RC2.jar → org.springframework.beans-3.0.0.RC3.jar}
  10. BIN lib/{org.springframework.context-3.0.0.RC2.jar → org.springframework.context-3.0.0.RC3.jar}
  11. BIN ...pringframework.context.support-3.0.0.RC2.jar → org.springframework.context.support-3.0.0.RC3.jar}
  12. BIN lib/{org.springframework.core-3.0.0.RC2.jar → org.springframework.core-3.0.0.RC3.jar}
  13. BIN lib/{org.springframework.expression-3.0.0.RC2.jar → org.springframework.expression-3.0.0.RC3.jar}
  14. BIN lib/org.springframework.instrument-3.0.0.RC2.jar
  15. BIN lib/org.springframework.instrument-3.0.0.RC3.jar
  16. BIN lib/{org.springframework.jdbc-3.0.0.RC2.jar → org.springframework.jdbc-3.0.0.RC3.jar}
  17. BIN lib/{org.springframework.jms-3.0.0.RC2.jar → org.springframework.jms-3.0.0.RC3.jar}
  18. BIN lib/{org.springframework.orm-3.0.0.RC2.jar → org.springframework.orm-3.0.0.RC3.jar}
  19. BIN lib/{org.springframework.oxm-3.0.0.RC2.jar → org.springframework.oxm-3.0.0.RC3.jar}
  20. BIN lib/{org.springframework.test-3.0.0.RC2.jar → org.springframework.test-3.0.0.RC3.jar}
  21. BIN lib/{org.springframework.transaction-3.0.0.RC2.jar → org.springframework.transaction-3.0.0.RC3.jar}
  22. BIN lib/{org.springframework.web-3.0.0.RC2.jar → org.springframework.web-3.0.0.RC3.jar}
  23. BIN lib/{org.springframework.web.servlet-3.0.0.RC2.jar → org.springframework.web.servlet-3.0.0.RC3.jar}
  24. +17 −17 maven/grails.pom.in
  25. +18 −18 src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
  26. +1 −1 src/java/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java
  27. +52 −0 src/test/org/codehaus/groovy/grails/orm/hibernate/binding/DataBindingAutoCreationTests.groovy
View
32 .classpath
@@ -5,22 +5,22 @@
<classpathentry kind="src" output="target/eclipse/test-output" path="src/test"/>
<classpathentry kind="src" path="src/jar"/>
<classpathentry kind="lib" path="lib/hibernate-core-3.3.1.GA.jar" sourcepath="/HIBERNATE_HOME/src"/>
- <classpathentry kind="lib" path="lib/org.springframework.aop-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.aop-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.asm-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.asm-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.aspects-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.beans-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.beans-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.context-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.context-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.context.support-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.core-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.core-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.expression-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.expression-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.instrument-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.jdbc-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.jms-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.jms-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.orm-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.orm-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.test-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.test-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.transaction-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.web-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.web-sources-3.0.0.RC2.jar"/>
- <classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.0.RC2.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC2/src/org.springframework.web.servlet-sources-3.0.0.RC2.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.aop-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.aop-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.asm-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.asm-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.aspects-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.aspects-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.beans-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.beans-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.context-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.context-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.context.support-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.core-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.core-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.expression-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.expression-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.instrument-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.instrument-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.jdbc-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.jdbc-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.jms-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.jms-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.orm-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.orm-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.test-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.test-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.transaction-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.transaction-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.web-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.web-sources-3.0.0.RC3.jar"/>
+ <classpathentry kind="lib" path="lib/org.springframework.web.servlet-3.0.0.RC3.jar" sourcepath="/Developer/springsource/spring-framework-3.0.0.RC3/src/org.springframework.web.servlet-sources-3.0.0.RC3.jar"/>
<classpathentry kind="lib" path="lib/ant-junit-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/ant-nodeps-1.7.1.jar"/>
<classpathentry kind="lib" path="lib/ant-1.7.1.jar"/>
View
2 build.properties
@@ -15,7 +15,7 @@ bundlor.svnkit.version=1.3.1
bundlor.servlet.version=2.5.0
bundlor.radeox.version=1.0.0.b2
bundlor.groovy.version=1.6.6
-bundlor.spring.version=3.0.0.RC2
+bundlor.spring.version=3.0.0.RC3
bundlor.ant.version=1.7.1
bundlor.ivy.version=2.0.0
bundlor.gant.version=1.6.0
View
8 dependencies.txt
@@ -147,14 +147,14 @@ The following libraries are included in Grails because they are required either
- required for building Grails core
- required for running Grails applications
-* spring-2.5.6.jar, spring-test-2.5.6.jar, spring-webmvc-2.5.6.jar
-- Spring Framework 2.5.6 (http://www.springframework.org) Apache 2.0 License
+* org.springframework.*.jar
+- Spring Framework 3.0.0.RC2 (http://www.springframework.org) Apache 2.0 License
- required for building Grails core
- required for the command line tools (Gant)
- required for running Grails applications
-* org.springframework.webflow-2.0.3.RELEASE.jar, org.springframework.binding-2.0.3.RELEASE.jar, org.springframework.js-2.0.3.RELEASE.jar
-- Spring Web Flow 2.0.3 (http://www.springframework.org) Apache 2.0 License
+* org.springframework.webflow-2.0.8.RELEASE.jar, org.springframework.binding-2.0.8.RELEASE.jar, org.springframework.js-2.0.8.RELEASE.jar
+- Spring Web Flow 2.0.8 (http://www.springframework.org) Apache 2.0 License
- required for building Grails core
- required for running Grails applications (When using Web flows)
View
76 grails.ipr
@@ -528,54 +528,52 @@
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/aopalliance-1.0.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/org.springframework.webflow-2.0.8.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/aspectjweaver-1.6.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/aspectjrt-1.6.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.aop-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.context-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.aspects-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.orm-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.transaction-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.test-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.context.support-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.oxm-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.web.servlet-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.jdbc-3.0.0.RC2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/org.springframework.js-2.0.8.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.jms-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.beans-3.0.0.RC2.jar!/" />
<root url="jar://$PROJECT_DIR$/lib/org.springframework.binding-2.0.8.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.expression-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.web-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.core-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/lib/org.springframework.asm-3.0.0.RC2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.context.support-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.transaction-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.test-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.jms-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.context-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.instrument-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.core-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.aspects-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.oxm-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.aop-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.jdbc-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.expression-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.asm-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.web-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.orm-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.beans-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lib/org.springframework.web.servlet-3.0.0.RC3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$PROJECT_DIR$/../../../../springsource/spring-webflow-2.0.8.RELEASE/src/org.springframework.faces-sources-2.0.8.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/../../../../springsource/spring-webflow-2.0.8.RELEASE/src/org.springframework.webflow-sources-2.0.8.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/../../../../springsource/spring-webflow-2.0.8.RELEASE/src/org.springframework.js-sources-2.0.8.RELEASE.jar!/" />
<root url="jar://$PROJECT_DIR$/../../../../springsource/spring-webflow-2.0.8.RELEASE/src/org.springframework.binding-sources-2.0.8.RELEASE.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.expression-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.test-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.instrument-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.transaction-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.beans-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.aspects-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.web.servlet-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.oxm-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.core-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.aop-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.web-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.web.portlet-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.jdbc-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.context.support-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.web.struts-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.orm-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.asm-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.instrument.tomcat-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.jms-sources-3.0.0.RC2.jar!/" />
- <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC2/src/org.springframework.context-sources-3.0.0.RC2.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.expression-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.web-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.aop-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.beans-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.oxm-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.orm-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.test-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.jdbc-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.instrument.tomcat-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.context.support-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.web.servlet-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.web.portlet-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.instrument-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.transaction-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.web.struts-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.jms-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.asm-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.aspects-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.core-sources-3.0.0.RC3.jar!/" />
+ <root url="jar://$PROJECT_DIR$/../../../../springsource/spring-framework-3.0.0.RC3/src/org.springframework.context-sources-3.0.0.RC3.jar!/" />
</SOURCES>
</library>
<library name="javax.servlet">
View
BIN lib/org.springframework.aop-3.0.0.RC2.jar → lib/org.springframework.aop-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.asm-3.0.0.RC2.jar → lib/org.springframework.asm-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.aspects-3.0.0.RC2.jar
Binary file not shown.
View
BIN lib/org.springframework.aspects-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.beans-3.0.0.RC2.jar → lib/org.springframework.beans-3.0.0.RC3.jar
Binary file not shown.
View
BIN ...org.springframework.context-3.0.0.RC2.jar → ...org.springframework.context-3.0.0.RC3.jar
Binary file not shown.
View
BIN ...ngframework.context.support-3.0.0.RC2.jar → ...ngframework.context.support-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.core-3.0.0.RC2.jar → lib/org.springframework.core-3.0.0.RC3.jar
Binary file not shown.
View
BIN ....springframework.expression-3.0.0.RC2.jar → ....springframework.expression-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.instrument-3.0.0.RC2.jar
Binary file not shown.
View
BIN lib/org.springframework.instrument-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.jdbc-3.0.0.RC2.jar → lib/org.springframework.jdbc-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.jms-3.0.0.RC2.jar → lib/org.springframework.jms-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.orm-3.0.0.RC2.jar → lib/org.springframework.orm-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.oxm-3.0.0.RC2.jar → lib/org.springframework.oxm-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.test-3.0.0.RC2.jar → lib/org.springframework.test-3.0.0.RC3.jar
Binary file not shown.
View
BIN ...springframework.transaction-3.0.0.RC2.jar → ...springframework.transaction-3.0.0.RC3.jar
Binary file not shown.
View
BIN lib/org.springframework.web-3.0.0.RC2.jar → lib/org.springframework.web-3.0.0.RC3.jar
Binary file not shown.
View
BIN ...springframework.web.servlet-3.0.0.RC2.jar → ...springframework.web.servlet-3.0.0.RC3.jar
Binary file not shown.
View
34 maven/grails.pom.in
@@ -94,7 +94,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -108,7 +108,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-asm</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aspects</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -136,7 +136,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -164,7 +164,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -178,7 +178,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -192,7 +192,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -206,7 +206,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-instrument</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -220,7 +220,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -234,7 +234,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -248,7 +248,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -262,7 +262,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -277,7 +277,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -291,7 +291,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -305,7 +305,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
@@ -319,7 +319,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>3.0.0.RC2</version>
+ <version>3.0.0.RC3</version>
<scope>runtime</scope>
<exclusions>
<!-- We have JCL-over-SLF4J instead. -->
View
36 src/java/org/codehaus/groovy/grails/resolve/IvyDependencyManager.groovy
@@ -252,7 +252,7 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
"org.grails:grails-web:$grailsVersion",
"org.slf4j:slf4j-api:1.5.8",
"org.slf4j:slf4j-log4j12:1.5.8",
- "org.springframework:org.springframework.test:3.0.0.RC2"
+ "org.springframework:org.springframework.test:3.0.0.RC3"
// dependencies needed during development, but not for deployment
provided "javax.servlet:servlet-api:2.5",
@@ -284,22 +284,22 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
"org.grails:grails-resources:$grailsVersion",
"org.grails:grails-spring:$grailsVersion",
"org.grails:grails-web:$grailsVersion",
- "org.springframework:org.springframework.core:3.0.0.RC2",
- "org.springframework:org.springframework.aop:3.0.0.RC2",
- "org.springframework:org.springframework.aspects:3.0.0.RC2",
- "org.springframework:org.springframework.asm:3.0.0.RC2",
- "org.springframework:org.springframework.beans:3.0.0.RC2",
- "org.springframework:org.springframework.context:3.0.0.RC2",
- "org.springframework:org.springframework.context.support:3.0.0.RC2",
- "org.springframework:org.springframework.expression:3.0.0.RC2",
- "org.springframework:org.springframework.instrument:3.0.0.RC2",
- "org.springframework:org.springframework.jdbc:3.0.0.RC2",
- "org.springframework:org.springframework.jms:3.0.0.RC2",
- "org.springframework:org.springframework.orm:3.0.0.RC2",
- "org.springframework:org.springframework.oxm:3.0.0.RC2",
- "org.springframework:org.springframework.transaction:3.0.0.RC2",
- "org.springframework:org.springframework.web:3.0.0.RC2",
- "org.springframework:org.springframework.web.servlet:3.0.0.RC2",
+ "org.springframework:org.springframework.core:3.0.0.RC3",
+ "org.springframework:org.springframework.aop:3.0.0.RC3",
+ "org.springframework:org.springframework.aspects:3.0.0.RC3",
+ "org.springframework:org.springframework.asm:3.0.0.RC3",
+ "org.springframework:org.springframework.beans:3.0.0.RC3",
+ "org.springframework:org.springframework.context:3.0.0.RC3",
+ "org.springframework:org.springframework.context.support:3.0.0.RC3",
+ "org.springframework:org.springframework.expression:3.0.0.RC3",
+ "org.springframework:org.springframework.instrument:3.0.0.RC3",
+ "org.springframework:org.springframework.jdbc:3.0.0.RC3",
+ "org.springframework:org.springframework.jms:3.0.0.RC3",
+ "org.springframework:org.springframework.orm:3.0.0.RC3",
+ "org.springframework:org.springframework.oxm:3.0.0.RC3",
+ "org.springframework:org.springframework.transaction:3.0.0.RC3",
+ "org.springframework:org.springframework.web:3.0.0.RC3",
+ "org.springframework:org.springframework.web.servlet:3.0.0.RC3",
"org.slf4j:slf4j-api:1.5.8") {
transitive = false
}
@@ -308,7 +308,7 @@ public class IvyDependencyManager implements DependencyResolver, DependencyDefin
// dependencies needed for running tests
test "junit:junit:3.8.2",
"org.grails:grails-test:$grailsVersion",
- "org.springframework:org.springframework.test:3.0.0.RC2"
+ "org.springframework:org.springframework.test:3.0.0.RC3"
// dependencies needed at runtime only
runtime "org.aspectj:aspectjweaver:1.6.6",
View
2 src/java/org/codehaus/groovy/grails/web/binding/GrailsDataBinder.java
@@ -107,6 +107,7 @@
public GrailsDataBinder(Object target, String objectName) {
super(target, objectName);
+ setAutoGrowNestedPaths(false);
bean = (BeanWrapper)((BeanPropertyBindingResult)super.getBindingResult()).getPropertyAccessor();
Object tmpTransients = GrailsClassUtils.getStaticPropertyValue(bean.getWrappedClass(), GrailsDomainClassProperty.TRANSIENT);
@@ -130,7 +131,6 @@ else if (target instanceof GroovyObject) {
setDisallowedFields(disallowed);
setAllowedFields(ALL_OTHER_FIELDS_ALLOWED_BY_DEFAULT);
setIgnoreInvalidFields(true);
-
}
/**
View
52 ...test/org/codehaus/groovy/grails/orm/hibernate/binding/DataBindingAutoCreationTests.groovy
@@ -0,0 +1,52 @@
+package org.codehaus.groovy.grails.orm.hibernate.binding
+
+import org.codehaus.groovy.grails.orm.hibernate.AbstractGrailsHibernateTests
+
+/**
+ * @author Graeme Rocher
+ * @since 1.1
+ */
+
+public class DataBindingAutoCreationTests extends AbstractGrailsHibernateTests{
+
+ protected void onSetUp() {
+ gcl.parseClass('''
+import grails.persistence.*
+
+@Entity
+class Author {
+ String name
+}
+
+@Entity
+class Book {
+ String title
+ Author author
+
+ static constraints = {
+ author(nullable:true)
+ }
+}
+
+
+''')
+ }
+
+
+ void testBindToNullIfNullable() {
+ def Author = ga.getDomainClass("Author").clazz
+ def Book = ga.getDomainClass("Book").clazz
+
+ def a = Author.newInstance(name:"Stephen King")
+ assert a.save(flush:true) : 'should have saved author'
+
+ session.clear()
+
+ // should bind to null
+ def params = [title:"It", 'author.id':'']
+
+ def b1 = Book.newInstance(params)
+
+ assert b1.save(flush:true) : "should have saved book"
+ }
+}

0 comments on commit b06d4e0

Please sign in to comment.