Merge branch '1.3.x' of github.com:grails/grails-core into 1.3.x

grails · Dec 13, 2010 · 45d4a33 · 45d4a33
2 parents 5761ea8 + 1c7a042
commit 45d4a33
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/.classpath b/.classpath
@@ -77,6 +77,17 @@
 	<classpathentry kind="lib" path="lib/svnkit-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/xpp3_min-1.1.3.4.O.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
+	<classpathentry kind="lib" path="lib/aopalliance-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/radeox-1.0-b2.jar"/>
+	<classpathentry kind="lib" path="lib/javassist-3.11.0.GA.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate-annotations-3.4.0.GA.jar"/>
+	<classpathentry kind="lib" path="lib/hibernate-commons-annotations-3.1.0.GA.jar"/>
+	<classpathentry kind="lib" path="lib/jline-0.9.94.jar"/>
+	<classpathentry kind="lib" path="lib/ivy-2.2.0.jar"/>
+	<classpathentry kind="lib" path="lib/gpars-0.9.jar"/>
+	<classpathentry kind="lib" path="lib/ehcache-core-1.7.1.jar"/>
+	<classpathentry kind="lib" path="lib/core-renderer-R8.jar"/>
 	<classpathentry kind="var" path="ASPECTJRT_LIB"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry kind="output" path="target/eclipse/bin-output"/>

diff --git a/conf/groovy-starter.conf b/conf/groovy-starter.conf
@@ -12,7 +12,7 @@
     load ${grails.home}/dist/grails-bootstrap-${grails.version}.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/ivy-2.2.0.jar
     load ${grails.home}/lib/gant_groovy1.7-1.9.2.jar
     load ${grails.home}/lib/ant-1.7.1.jar
     load ${tools.jar}
diff --git a/lib/ivy-2.1.0.jar → lib/ivy-2.2.0.jar b/lib/ivy-2.1.0.jar → lib/ivy-2.2.0.jar
diff --git a/maven/grails-bootstrap.pom.in b/maven/grails-bootstrap.pom.in
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>org.apache.ivy</groupId>
             <artifactId>ivy</artifactId>
-            <version>2.1.0</version>
+            <version>2.2.0</version>
         </dependency>
 
         <dependency>

diff --git a/src/java/org/codehaus/groovy/grails/plugins/orm/hibernate/HibernatePluginSupport.groovy b/src/java/org/codehaus/groovy/grails/plugins/orm/hibernate/HibernatePluginSupport.groovy
@@ -478,13 +478,7 @@ Using Grails' default naming strategy: '${GrailsDomainBinder.namingStrategy.getC
         Validator validator = ctx.containsBean("${dc.fullName}Validator") ? ctx.getBean("${dc.fullName}Validator") : null
         def validateMethod = new ValidatePersistentMethod(sessionFactory, application.classLoader, application,validator)
         metaClass.validate = {->
-            try {
-                validateMethod.invoke(delegate, "validate", [] as Object[])
-            }
-            catch (Throwable e) {
-                e.printStackTrace()
-                throw e
-            }
+            validateMethod.invoke(delegate, "validate", [] as Object[])
         }
         metaClass.validate = {Map args ->
             validateMethod.invoke(delegate, "validate", [args] as Object[])

diff --git a/src/java/org/codehaus/groovy/grails/resolve/GrailsRepoResolver.java b/src/java/org/codehaus/groovy/grails/resolve/GrailsRepoResolver.java
@@ -61,7 +61,7 @@ protected ResolvedResource findResourceUsingPattern(ModuleRevisionId mrid, Strin
     }
 
     private void installIvyAuth() {
-        java.net.Authenticator.setDefault(IvyAuthenticator.INSTANCE);
+        IvyAuthenticator.install();
     }
 
     public String transformGrailsRepositoryPattern(ModuleRevisionId mrid, String pattern) {