Use transitive dependencies for build, removed jars from lib

grails · Feb 15, 2011 · 0df1cbc · 0df1cbc
1 parent 000eb1e
commit 0df1cbc
Show file tree

Hide file tree

Showing 83 changed files with 104 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,6 +8,7 @@ buildscript {
 }
 
 apply plugin: 'groovy'
+apply plugin: 'eclipse'
 
 version = '1.4.0.BUILD-SNAPSHOT'
 
@@ -16,15 +17,112 @@ targetCompatibility = "1.5"
 archivesBaseName = 'grails'
 
 configurations {
-    compile.transitive = true
+    compile.transitive = false
     jsp21.extendsFrom compile
 }
 
+repositories {
+	mavenRepo urls:"http://maven.springframework.org/release"
+}
 dependencies {
-    lib = "$projectDir/lib"
-    groovy files(fileTree(dir: lib as File, includes: ['groovy-all-*.jar']))
-    compile files(fileTree(dir: lib as File, includes: ['*.jar'], excludes: ['jsp-api-2.1.jar', 'groovy-all-1.8.0-beta-4.jar']), "${System.getenv('JAVA_HOME')}/lib/tools.jar")
-    jsp21 files("$lib/jsp-api-2.1.jar")
+	// Jars in lib
+	compile files(fileTree(dir:"$projectDir/lib" as File))
+
+	// Ant
+	def antVersion = "1.7.1"
+	compile "org.apache.ant:ant:${antVersion}",
+ 			"org.apache.ant:ant-launcher:${antVersion}",
+			"org.apache.ant:ant-junit:${antVersion}",	
+			"org.apache.ant:ant-nodeps:${antVersion}",			
+			"org.apache.ant:ant-trax:${antVersion}",
+			"org.apache.ivy:ivy:2.2.0"
+
+	// Apache Commons
+	compile 'commons-beanutils:commons-beanutils:1.8.0'	,
+			'commons-cli:commons-cli:1.0',
+			'commons-codec:commons-codec:1.4',
+			'commons-collections:commons-collections:3.2.1',
+			'commons-dbcp:commons-dbcp:1.3',
+			'commons-el:commons-el:1.0',
+			'commons-fileupload:commons-fileupload:1.2.1',
+			'commons-io:commons-io:1.4',
+			'commons-lang:commons-lang:2.4',
+			'commons-pool:commons-pool:1.5.5',
+			'commons-validator:commons-validator:1.3.1'
+
+	// Others
+	compile( 'cglib:cglib-nodep:2.1_3',
+			 'org.fusesource.jansi:jansi:1.2.1',
+			 'oro:oro:2.0.8',
+			 'com.h2database:h2:1.2.147',
+			 'com.lowagie:itext:2.1.7',
+			 'org.xhtmlrenderer:core-renderer:R8pre2',
+			 'jline:jline:0.9.94',
+			 'opensymphony:sitemesh:2.4',
+			 'org.tmatesoft.svnkit:svnkit:1.3.4',
+			 'ognl:ognl:2.7.3',
+			 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.1_jdk5') 
+
+	// Testing
+	compile 'junit:junit:4.8.1'
+
+	// XML
+	compile 'xpp3:xpp3_min:1.1.4c'
+	compile 'xalan:serializer:2.7.1'
+
+	// Logging
+	compile 'org.slf4j:slf4j-log4j12:1.6.1'
+	compile 'org.slf4j:slf4j-api:1.6.1'
+	compile 'org.slf4j:jcl-over-slf4j:1.6.1'
+	compile 'org.slf4j:jul-to-slf4j:1.6.1'	
+	compile 'log4j:log4j:1.2.16'
+
+	// Specs
+	compile 'javax.servlet:jsp-api:2.0'
+	compile 'javax.servlet:servlet-api:2.5'
+	compile 'jstl:jstl:1.1.2'
+	compile 'net.sf.jsr107cache:jsr107cache:1.0'
+	compile 'javax.transaction:jta:1.1'
+	compile 'javax.persistence:persistence-api:1.0'
+
+	// Hibernate related
+	compile 'org.hibernate:hibernate-annotations:3.4.0.GA',
+			'org.hibernate:hibernate-commons-annotations:3.1.0.GA',
+			'org.hibernate:hibernate-core:3.3.1.GA',
+			'org.hibernate:hibernate-validator:3.1.0.GA',
+			'org.hibernate:hibernate-ehcache:3.3.1.GA',
+			'javassist:javassist:3.12.0.GA',
+			'antlr:antlr:2.7.6'
+
+	// Spring
+	def springVersion = "3.0.3.RELEASE"
+	compile "org.springframework:spring-aop:${springVersion}",
+			"org.springframework:spring-asm:${springVersion}",
+			"org.springframework:spring-aspects:${springVersion}",
+			"org.springframework:spring-beans:${springVersion}",
+			"org.springframework:spring-context:${springVersion}",
+			"org.springframework:spring-core:${springVersion}",					
+			"org.springframework:spring-expression:${springVersion}",								
+			"org.springframework:spring-instrument:${springVersion}",								
+			"org.springframework:spring-jdbc:${springVersion}",					
+			"org.springframework:spring-jms:${springVersion}",					
+			"org.springframework:spring-orm:${springVersion}",					
+			"org.springframework:spring-test:${springVersion}",					
+			"org.springframework:spring-tx:${springVersion}",
+			"org.springframework:spring-web:${springVersion}",
+			"org.springframework:spring-webmvc:${springVersion}"
+
+
+	// Spring Web Flow
+	compile "org.springframework.webflow:spring-binding:2.0.8.RELEASE",
+	 		"org.springframework.webflow:spring-js:2.0.8.RELEASE",
+			"org.springframework.webflow:spring-webflow:2.0.8.RELEASE"		
+
+	// Groovy
+    groovy "org.codehaus.groovy:groovy-all:1.8.0-beta-4"
+	compile 'org.codehaus.gpars:gpars:0.9'
+
+    jsp21 'javax.servlet:jsp-api:2.1'
 }
 
 sourceSets {

diff --git a/lib/ant-1.7.1.jar b/lib/ant-1.7.1.jar
diff --git a/lib/ant-junit-1.7.1.jar b/lib/ant-junit-1.7.1.jar
diff --git a/lib/ant-launcher-1.7.1.jar b/lib/ant-launcher-1.7.1.jar
diff --git a/lib/ant-nodeps-1.7.1.jar b/lib/ant-nodeps-1.7.1.jar
diff --git a/lib/ant-trax-1.7.1.jar b/lib/ant-trax-1.7.1.jar
diff --git a/lib/antlr-2.7.6.jar b/lib/antlr-2.7.6.jar
diff --git a/lib/aopalliance-1.0.jar b/lib/aopalliance-1.0.jar
diff --git a/lib/aspectjrt-1.6.8.jar b/lib/aspectjrt-1.6.8.jar
diff --git a/lib/aspectjweaver-1.6.8.jar b/lib/aspectjweaver-1.6.8.jar
diff --git a/lib/cglib-nodep-2.1_3.jar b/lib/cglib-nodep-2.1_3.jar
diff --git a/lib/commons-beanutils-1.8.0.jar b/lib/commons-beanutils-1.8.0.jar
diff --git a/lib/commons-cli-1.0.jar b/lib/commons-cli-1.0.jar
diff --git a/lib/commons-codec-1.4.jar b/lib/commons-codec-1.4.jar
diff --git a/lib/commons-collections-3.2.1.jar b/lib/commons-collections-3.2.1.jar
diff --git a/lib/commons-dbcp-1.3.jar b/lib/commons-dbcp-1.3.jar
diff --git a/lib/commons-el-1.0.jar b/lib/commons-el-1.0.jar
diff --git a/lib/commons-fileupload-1.2.1.jar b/lib/commons-fileupload-1.2.1.jar
diff --git a/lib/commons-io-1.4.jar b/lib/commons-io-1.4.jar
diff --git a/lib/commons-lang-2.4.jar b/lib/commons-lang-2.4.jar
diff --git a/lib/commons-pool-1.5.5.jar b/lib/commons-pool-1.5.5.jar
diff --git a/lib/commons-validator-1.3.1.jar b/lib/commons-validator-1.3.1.jar
diff --git a/lib/concurrentlinkedhashmap-lru-1.0_jdk5.jar b/lib/concurrentlinkedhashmap-lru-1.0_jdk5.jar
diff --git a/lib/core-renderer-R8.jar b/lib/core-renderer-R8.jar
diff --git a/lib/dom4j-1.6.1.jar b/lib/dom4j-1.6.1.jar
diff --git a/lib/ehcache-core-1.7.1.jar b/lib/ehcache-core-1.7.1.jar
diff --git a/lib/ejb3-persistence-1.0.2.GA.jar b/lib/ejb3-persistence-1.0.2.GA.jar
diff --git a/lib/gpars-0.9.jar b/lib/gpars-0.9.jar
diff --git a/lib/groovy-all-1.8.0-beta-4.jar b/lib/groovy-all-1.8.0-beta-4.jar
diff --git a/lib/h2-1.2.144.jar b/lib/h2-1.2.144.jar
diff --git a/lib/hibernate-annotations-3.4.0.GA.jar b/lib/hibernate-annotations-3.4.0.GA.jar
diff --git a/lib/hibernate-commons-annotations-3.1.0.GA.jar b/lib/hibernate-commons-annotations-3.1.0.GA.jar
diff --git a/lib/hibernate-core-3.3.1.GA.jar b/lib/hibernate-core-3.3.1.GA.jar
diff --git a/lib/hibernate-ehcache-3.3.1.GA.jar b/lib/hibernate-ehcache-3.3.1.GA.jar
diff --git a/lib/hibernate-validator-3.1.0.GA.jar b/lib/hibernate-validator-3.1.0.GA.jar
diff --git a/lib/hsqldb-1.8.0.10.jar b/lib/hsqldb-1.8.0.10.jar
diff --git a/lib/itext-2.0.8.jar b/lib/itext-2.0.8.jar
diff --git a/lib/ivy-2.2.0.jar b/lib/ivy-2.2.0.jar
diff --git a/lib/jansi-1.2.1.jar b/lib/jansi-1.2.1.jar
diff --git a/lib/javassist-3.11.0.GA.jar b/lib/javassist-3.11.0.GA.jar
diff --git a/lib/jcl-over-slf4j-1.5.8.jar b/lib/jcl-over-slf4j-1.5.8.jar
diff --git a/lib/jline-0.9.94.jar b/lib/jline-0.9.94.jar
diff --git a/lib/jsp-api-2.0.jar b/lib/jsp-api-2.0.jar
diff --git a/lib/jsp-api-2.1.jar b/lib/jsp-api-2.1.jar
diff --git a/lib/jsr107cache-1.0.jar b/lib/jsr107cache-1.0.jar
diff --git a/lib/jsr166y-070108.jar b/lib/jsr166y-070108.jar
diff --git a/lib/jstl-1.1.2.jar b/lib/jstl-1.1.2.jar
diff --git a/lib/jta-1.1.jar b/lib/jta-1.1.jar
diff --git a/lib/jul-to-slf4j-1.5.8.jar b/lib/jul-to-slf4j-1.5.8.jar
diff --git a/lib/junit-4.8.1.jar b/lib/junit-4.8.1.jar
diff --git a/lib/log4j-1.2.16.jar b/lib/log4j-1.2.16.jar
diff --git a/lib/ognl-2.7.3.jar b/lib/ognl-2.7.3.jar
diff --git a/lib/org.springframework.aop-3.0.3.RELEASE.jar b/lib/org.springframework.aop-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.asm-3.0.3.RELEASE.jar b/lib/org.springframework.asm-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.aspects-3.0.3.RELEASE.jar b/lib/org.springframework.aspects-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.beans-3.0.3.RELEASE.jar b/lib/org.springframework.beans-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.binding-2.0.8.RELEASE.jar b/lib/org.springframework.binding-2.0.8.RELEASE.jar
diff --git a/lib/org.springframework.context-3.0.3.RELEASE.jar b/lib/org.springframework.context-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.context.support-3.0.3.RELEASE.jar b/lib/org.springframework.context.support-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.core-3.0.3.RELEASE.jar b/lib/org.springframework.core-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.expression-3.0.3.RELEASE.jar b/lib/org.springframework.expression-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.instrument-3.0.3.RELEASE.jar b/lib/org.springframework.instrument-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar b/lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.jdbc-3.0.3.RELEASE.jar b/lib/org.springframework.jdbc-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.jms-3.0.3.RELEASE.jar b/lib/org.springframework.jms-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.js-2.0.8.RELEASE.jar b/lib/org.springframework.js-2.0.8.RELEASE.jar
diff --git a/lib/org.springframework.orm-3.0.3.RELEASE.jar b/lib/org.springframework.orm-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.oxm-3.0.3.RELEASE.jar b/lib/org.springframework.oxm-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.test-3.0.3.RELEASE.jar b/lib/org.springframework.test-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.transaction-3.0.3.RELEASE.jar b/lib/org.springframework.transaction-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.web-3.0.3.RELEASE.jar b/lib/org.springframework.web-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.web.servlet-3.0.3.RELEASE.jar b/lib/org.springframework.web.servlet-3.0.3.RELEASE.jar
diff --git a/lib/org.springframework.webflow-2.0.8.RELEASE.jar b/lib/org.springframework.webflow-2.0.8.RELEASE.jar
diff --git a/lib/oro-2.0.8.jar b/lib/oro-2.0.8.jar
diff --git a/lib/serializer-2.7.1.jar b/lib/serializer-2.7.1.jar
diff --git a/lib/servlet-api-2.5.jar b/lib/servlet-api-2.5.jar
diff --git a/lib/sitemesh-2.4.jar b/lib/sitemesh-2.4.jar
diff --git a/lib/slf4j-api-1.5.8.jar b/lib/slf4j-api-1.5.8.jar
diff --git a/lib/slf4j-log4j12-1.5.8.jar b/lib/slf4j-log4j12-1.5.8.jar
diff --git a/lib/standard-1.1.2.jar b/lib/standard-1.1.2.jar
diff --git a/lib/svnkit-1.3.1.jar b/lib/svnkit-1.3.1.jar
diff --git a/lib/xpp3_min-1.1.3.4.O.jar b/lib/xpp3_min-1.1.3.4.O.jar
diff --git a/src/java/org/codehaus/groovy/grails/web/servlet/GrailsDispatcherServlet.java b/src/java/org/codehaus/groovy/grails/web/servlet/GrailsDispatcherServlet.java
@@ -130,7 +130,7 @@ private void initLocaleResolver(ApplicationContext context) {
         }
         catch (NoSuchBeanDefinitionException ex) {
             // We need to use the default.
-            localeResolver = getDefaultStrategy(context, LocaleResolver.class);
+            localeResolver = (LocaleResolver) getDefaultStrategy(context, LocaleResolver.class);
             if (logger.isDebugEnabled()) {
                 logger.debug("Unable to locate LocaleResolver with name '" + LOCALE_RESOLVER_BEAN_NAME +
                         "': using default [" + localeResolver + "]");