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

Fix bug where war explosing is skipped during gaeUpload #28

Merged
merged 1 commit into from
Jul 14, 2012
Merged

Fix bug where war explosing is skipped during gaeUpload #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/main/groovy/org/gradle/api/plugins/gae/GaePlugin.groovy
View file
Open in desktop
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