Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use transitive dependencies for build, removed jars from lib

  • Loading branch information...
commit 0df1cbcbb80f552121e3d97d52f766d5a8edbec3 1 parent 000eb1e
@graemerocher graemerocher authored
Showing with 104 additions and 6 deletions.
  1. +103 −5 build.gradle
  2. BIN  lib/ant-1.7.1.jar
  3. BIN  lib/ant-junit-1.7.1.jar
  4. BIN  lib/ant-launcher-1.7.1.jar
  5. BIN  lib/ant-nodeps-1.7.1.jar
  6. BIN  lib/ant-trax-1.7.1.jar
  7. BIN  lib/antlr-2.7.6.jar
  8. BIN  lib/aopalliance-1.0.jar
  9. BIN  lib/aspectjrt-1.6.8.jar
  10. BIN  lib/aspectjweaver-1.6.8.jar
  11. BIN  lib/cglib-nodep-2.1_3.jar
  12. BIN  lib/commons-beanutils-1.8.0.jar
  13. BIN  lib/commons-cli-1.0.jar
  14. BIN  lib/commons-codec-1.4.jar
  15. BIN  lib/commons-collections-3.2.1.jar
  16. BIN  lib/commons-dbcp-1.3.jar
  17. BIN  lib/commons-el-1.0.jar
  18. BIN  lib/commons-fileupload-1.2.1.jar
  19. BIN  lib/commons-io-1.4.jar
  20. BIN  lib/commons-lang-2.4.jar
  21. BIN  lib/commons-pool-1.5.5.jar
  22. BIN  lib/commons-validator-1.3.1.jar
  23. BIN  lib/concurrentlinkedhashmap-lru-1.0_jdk5.jar
  24. BIN  lib/core-renderer-R8.jar
  25. BIN  lib/dom4j-1.6.1.jar
  26. BIN  lib/ehcache-core-1.7.1.jar
  27. BIN  lib/ejb3-persistence-1.0.2.GA.jar
  28. BIN  lib/gpars-0.9.jar
  29. BIN  lib/groovy-all-1.8.0-beta-4.jar
  30. BIN  lib/h2-1.2.144.jar
  31. BIN  lib/hibernate-annotations-3.4.0.GA.jar
  32. BIN  lib/hibernate-commons-annotations-3.1.0.GA.jar
  33. BIN  lib/hibernate-core-3.3.1.GA.jar
  34. BIN  lib/hibernate-ehcache-3.3.1.GA.jar
  35. BIN  lib/hibernate-validator-3.1.0.GA.jar
  36. BIN  lib/hsqldb-1.8.0.10.jar
  37. BIN  lib/itext-2.0.8.jar
  38. BIN  lib/ivy-2.2.0.jar
  39. BIN  lib/jansi-1.2.1.jar
  40. BIN  lib/javassist-3.11.0.GA.jar
  41. BIN  lib/jcl-over-slf4j-1.5.8.jar
  42. BIN  lib/jline-0.9.94.jar
  43. BIN  lib/jsp-api-2.0.jar
  44. BIN  lib/jsp-api-2.1.jar
  45. BIN  lib/jsr107cache-1.0.jar
  46. BIN  lib/jsr166y-070108.jar
  47. BIN  lib/jstl-1.1.2.jar
  48. BIN  lib/jta-1.1.jar
  49. BIN  lib/jul-to-slf4j-1.5.8.jar
  50. BIN  lib/junit-4.8.1.jar
  51. BIN  lib/log4j-1.2.16.jar
  52. BIN  lib/ognl-2.7.3.jar
  53. BIN  lib/org.springframework.aop-3.0.3.RELEASE.jar
  54. BIN  lib/org.springframework.asm-3.0.3.RELEASE.jar
  55. BIN  lib/org.springframework.aspects-3.0.3.RELEASE.jar
  56. BIN  lib/org.springframework.beans-3.0.3.RELEASE.jar
  57. BIN  lib/org.springframework.binding-2.0.8.RELEASE.jar
  58. BIN  lib/org.springframework.context-3.0.3.RELEASE.jar
  59. BIN  lib/org.springframework.context.support-3.0.3.RELEASE.jar
  60. BIN  lib/org.springframework.core-3.0.3.RELEASE.jar
  61. BIN  lib/org.springframework.expression-3.0.3.RELEASE.jar
  62. BIN  lib/org.springframework.instrument-3.0.3.RELEASE.jar
  63. BIN  lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar
  64. BIN  lib/org.springframework.jdbc-3.0.3.RELEASE.jar
  65. BIN  lib/org.springframework.jms-3.0.3.RELEASE.jar
  66. BIN  lib/org.springframework.js-2.0.8.RELEASE.jar
  67. BIN  lib/org.springframework.orm-3.0.3.RELEASE.jar
  68. BIN  lib/org.springframework.oxm-3.0.3.RELEASE.jar
  69. BIN  lib/org.springframework.test-3.0.3.RELEASE.jar
  70. BIN  lib/org.springframework.transaction-3.0.3.RELEASE.jar
  71. BIN  lib/org.springframework.web-3.0.3.RELEASE.jar
  72. BIN  lib/org.springframework.web.servlet-3.0.3.RELEASE.jar
  73. BIN  lib/org.springframework.webflow-2.0.8.RELEASE.jar
  74. BIN  lib/oro-2.0.8.jar
  75. BIN  lib/serializer-2.7.1.jar
  76. BIN  lib/servlet-api-2.5.jar
  77. BIN  lib/sitemesh-2.4.jar
  78. BIN  lib/slf4j-api-1.5.8.jar
  79. BIN  lib/slf4j-log4j12-1.5.8.jar
  80. BIN  lib/standard-1.1.2.jar
  81. BIN  lib/svnkit-1.3.1.jar
  82. BIN  lib/xpp3_min-1.1.3.4.O.jar
  83. +1 −1  src/java/org/codehaus/groovy/grails/web/servlet/GrailsDispatcherServlet.java
View
108 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 {
View
BIN  lib/ant-1.7.1.jar
Binary file not shown
View
BIN  lib/ant-junit-1.7.1.jar
Binary file not shown
View
BIN  lib/ant-launcher-1.7.1.jar
Binary file not shown
View
BIN  lib/ant-nodeps-1.7.1.jar
Binary file not shown
View
BIN  lib/ant-trax-1.7.1.jar
Binary file not shown
View
BIN  lib/antlr-2.7.6.jar
Binary file not shown
View
BIN  lib/aopalliance-1.0.jar
Binary file not shown
View
BIN  lib/aspectjrt-1.6.8.jar
Binary file not shown
View
BIN  lib/aspectjweaver-1.6.8.jar
Binary file not shown
View
BIN  lib/cglib-nodep-2.1_3.jar
Binary file not shown
View
BIN  lib/commons-beanutils-1.8.0.jar
Binary file not shown
View
BIN  lib/commons-cli-1.0.jar
Binary file not shown
View
BIN  lib/commons-codec-1.4.jar
Binary file not shown
View
BIN  lib/commons-collections-3.2.1.jar
Binary file not shown
View
BIN  lib/commons-dbcp-1.3.jar
Binary file not shown
View
BIN  lib/commons-el-1.0.jar
Binary file not shown
View
BIN  lib/commons-fileupload-1.2.1.jar
Binary file not shown
View
BIN  lib/commons-io-1.4.jar
Binary file not shown
View
BIN  lib/commons-lang-2.4.jar
Binary file not shown
View
BIN  lib/commons-pool-1.5.5.jar
Binary file not shown
View
BIN  lib/commons-validator-1.3.1.jar
Binary file not shown
View
BIN  lib/concurrentlinkedhashmap-lru-1.0_jdk5.jar
Binary file not shown
View
BIN  lib/core-renderer-R8.jar
Binary file not shown
View
BIN  lib/dom4j-1.6.1.jar
Binary file not shown
View
BIN  lib/ehcache-core-1.7.1.jar
Binary file not shown
View
BIN  lib/ejb3-persistence-1.0.2.GA.jar
Binary file not shown
View
BIN  lib/gpars-0.9.jar
Binary file not shown
View
BIN  lib/groovy-all-1.8.0-beta-4.jar
Binary file not shown
View
BIN  lib/h2-1.2.144.jar
Binary file not shown
View
BIN  lib/hibernate-annotations-3.4.0.GA.jar
Binary file not shown
View
BIN  lib/hibernate-commons-annotations-3.1.0.GA.jar
Binary file not shown
View
BIN  lib/hibernate-core-3.3.1.GA.jar
Binary file not shown
View
BIN  lib/hibernate-ehcache-3.3.1.GA.jar
Binary file not shown
View
BIN  lib/hibernate-validator-3.1.0.GA.jar
Binary file not shown
View
BIN  lib/hsqldb-1.8.0.10.jar
Binary file not shown
View
BIN  lib/itext-2.0.8.jar
Binary file not shown
View
BIN  lib/ivy-2.2.0.jar
Binary file not shown
View
BIN  lib/jansi-1.2.1.jar
Binary file not shown
View
BIN  lib/javassist-3.11.0.GA.jar
Binary file not shown
View
BIN  lib/jcl-over-slf4j-1.5.8.jar
Binary file not shown
View
BIN  lib/jline-0.9.94.jar
Binary file not shown
View
BIN  lib/jsp-api-2.0.jar
Binary file not shown
View
BIN  lib/jsp-api-2.1.jar
Binary file not shown
View
BIN  lib/jsr107cache-1.0.jar
Binary file not shown
View
BIN  lib/jsr166y-070108.jar
Binary file not shown
View
BIN  lib/jstl-1.1.2.jar
Binary file not shown
View
BIN  lib/jta-1.1.jar
Binary file not shown
View
BIN  lib/jul-to-slf4j-1.5.8.jar
Binary file not shown
View
BIN  lib/junit-4.8.1.jar
Binary file not shown
View
BIN  lib/log4j-1.2.16.jar
Binary file not shown
View
BIN  lib/ognl-2.7.3.jar
Binary file not shown
View
BIN  lib/org.springframework.aop-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.asm-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.aspects-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.beans-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.binding-2.0.8.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.context-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.context.support-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.core-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.expression-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.instrument-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.instrument.tomcat-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.jdbc-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.jms-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.js-2.0.8.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.orm-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.oxm-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.test-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.transaction-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.web-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.web.servlet-3.0.3.RELEASE.jar
Binary file not shown
View
BIN  lib/org.springframework.webflow-2.0.8.RELEASE.jar
Binary file not shown
View
BIN  lib/oro-2.0.8.jar
Binary file not shown
View
BIN  lib/serializer-2.7.1.jar
Binary file not shown
View
BIN  lib/servlet-api-2.5.jar
Binary file not shown
View
BIN  lib/sitemesh-2.4.jar
Binary file not shown
View
BIN  lib/slf4j-api-1.5.8.jar
Binary file not shown
View
BIN  lib/slf4j-log4j12-1.5.8.jar
Binary file not shown
View
BIN  lib/standard-1.1.2.jar
Binary file not shown
View
BIN  lib/svnkit-1.3.1.jar
Binary file not shown
View
BIN  lib/xpp3_min-1.1.3.4.O.jar
Binary file not shown
View
2  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 + "]");
Please sign in to comment.
Something went wrong with that request. Please try again.