Skip to content
This repository has been archived by the owner on Sep 16, 2022. It is now read-only.

Commit

Permalink
Fixed a bug where war explosion was skipped when uploading with warDi…
Browse files Browse the repository at this point in the history
…r specified causing build to fail
  • Loading branch information
erdi committed Jul 12, 2012
1 parent a75a9f1 commit a89ea34
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/main/groovy/org/gradle/api/plugins/gae/GaePlugin.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -210,9 +210,6 @@ class GaePlugin implements Plugin<Project> {
gaeExplodeWarTask.description = 'Explodes WAR archive into directory.'
gaeExplodeWarTask.group = GAE_GROUP

// If WAR directory gets set we assume we have a fully functional web application, WAR creation/explosion is skipped
gaeExplodeWarTask.onlyIf { !gaePluginConvention.warDir }

project.afterEvaluate {
if(isWarOptimizationAllowed(project, gaePluginConvention)) {
gaeExplodeWarTask.dependsOn project.slimWar
Expand Down Expand Up @@ -242,7 +239,11 @@ class GaePlugin implements Plugin<Project> {
gaeRunTask.description = 'Starts up a local App Engine development server.'
gaeRunTask.group = GAE_GROUP

gaeRunTask.dependsOn project.tasks.getByName(GAE_EXPLODE_WAR)
GaeExplodeWarTask gaeExplodeWarTask = project.tasks.getByName(GAE_EXPLODE_WAR)
gaeRunTask.dependsOn gaeExplodeWarTask

// If WAR directory gets set we assume we have a fully functional web application, WAR creation/explosion is skipped
gaeExplodeWarTask.onlyIf { !gaePluginConvention.warDir || !project.gradle.taskGraph.hasTask(gaeRunTask) }
}

private void configureGaeStop(Project project, GaePluginConvention gaePluginConvention) {
Expand Down

0 comments on commit a89ea34

Please sign in to comment.