@@ -1,7 +1,7 @@ grails.project.class.dir = "target/classes" grails.project.test.class.dir = "target/test-classes" grails.project.test.reports.dir = "target/test-reports" -grails.project.war.file = "target/${appName}-${appVersion}.war" +//grails.project.war.file = "target/${appName}-${appVersion}.war" grails.project.dependency.resolution = { inherits "global" // inherit Grails' default dependencies log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose' grails/src/grails/grails-app/conf/BuildConfig.groovy @@ -744,7 +744,11 @@ class BuildSettings { } if(!projectWarFileSet) { - projectWarFile = new File(getPropertyValue(PROJECT_WAR_FILE, props, "$baseDir/target/${metadata.getApplicationName()}-${metadata.getApplicationVersion()}.war")) + def version = metadata.getApplicationVersion() + def appName = metadata.getApplicationName() ?: baseDir.name + def warName = version ? "$baseDir/target/${appName}-${version}.war" : "$baseDir/target/${appName}.war" + + projectWarFile = new File(getPropertyValue(PROJECT_WAR_FILE, props, warName)) } if (!projectWarExplodedDirSet) { grails/src/java/grails/util/BuildSettings.groovy 13522d06062d030e33b6aa86d3ae1feded74cc80 Graeme Rocher graeme.rocher@gmail.com http://github.com/grails/grails/commit/8b7be13c1de6819c54f2c6c7467a05d929659d01 8b7be13c1de6819c54f2c6c7467a05d929659d01 2009-11-11T05:36:04-08:00 2009-11-11T05:36:04-08:00 only include version in WAR if not null 7ac0ca819c6bfc2c28297b60be52321a50d9d78e Graeme Rocher graeme.rocher@gmail.com