fix for GRAILS-2217

git-svn-id: https://svn.codehaus.org/grails/trunk@6515 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d
grails · Jan 18, 2008 · d5cfdd0 · d5cfdd0
1 parent ff93c0d
commit d5cfdd0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 46 deletions.
diff --git a/scripts/War.groovy b/scripts/War.groovy
@@ -83,6 +83,11 @@ DEFAULT_DEPS = [
     "xpp3_min-1.1.3.4.O.jar"
 ]
 
+DEFAULT_J5_DEPS = [
+    "hibernate-annotations.jar",
+    "ejb3-persistence.jar",
+]
+
 target (war: "The implementation target") {
 	depends( clean,  packageApp)
 
@@ -170,8 +175,9 @@ target (war: "The implementation target") {
                     for(d in deps) {
 	                    include(name:d)
 	                }
-	                if(antProject.properties."ant.java.version" == "1.5") {
-	                    for(d in config.grails.war.java5.dependencies) {
+	                if(antProject.properties."ant.java.version" != "1.4") {
+                        deps = config.grails.war.java5.dependencies ?: DEFAULT_J5_DEPS
+                        for(d in deps) {
 	                        include(name:d)
 	                    }
 	                }

diff --git a/src/grails/grails-app/conf/Config.groovy b/src/grails/grails-app/conf/Config.groovy
@@ -59,48 +59,4 @@ log4j {
     additivity.StackTrace=false
 }
 
-// WAR dependency config
-grails.war.dependencies = [
-    "ant.jar",
-    "ant-launcher.jar",
-    "hibernate3.jar",
-    "jdbc2_0-stdext.jar",
-    "jta.jar",
-    "groovy-all-*.jar",
-    "springmodules-sandbox.jar",
-    "standard-${servletVersion}.jar",
-    "jstl-${servletVersion}.jar",
-    "antlr-*.jar",
-    "cglib-*.jar",
-    "dom4j-*.jar",
-    "ehcache-*.jar",
-    "junit-*.jar",
-    "commons-logging-*.jar",
-    "sitemesh-*.jar",
-    "spring-*.jar",
-    "log4j-*.jar",
-    "ognl-*.jar",
-    "hsqldb-*.jar",
-    "commons-lang-*.jar",
-    "commons-collections-*.jar",
-    "commons-beanutils-*.jar",
-    "commons-pool-*.jar",
-    "commons-dbcp-*.jar",
-    "commons-cli-*.jar",
-    "commons-validator-*.jar",
-    "commons-fileupload-*.jar",
-    "commons-io-*.jar",
-    "commons-io-*.jar",
-    "*oro-*.jar",
-    "jaxen-*.jar",
-    "xercesImpl.jar",
-    "xstream-1.2.1.jar",
-    "xpp3_min-1.1.3.4.O.jar"
-]
-
-grails.war.java5.dependencies = [
-    "hibernate-annotations.jar",
-    "ejb3-persistence.jar",
-]
-