Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix for GRAILS-5055 "Server parameter to eventConfigureJetty is null …

…in run-war" and removed other references to Jetty
  • Loading branch information...
commit 69c837625b438295e29871f385e49d7c1f5dcf96 1 parent 59d6caa
graemerocher graemerocher authored

Showing 1 changed file with 4 additions and 7 deletions. Show diff stats Hide diff stats

  1. +4 7 scripts/_GrailsRun.groovy
11 scripts/_GrailsRun.groovy
@@ -23,7 +23,7 @@ import org.codehaus.groovy.grails.plugins.GrailsPluginUtils
23 23
24 24
25 25 /**
26   - * Gant script that executes Grails using an embedded Jetty server
  26 + * Gant script that executes Grails using an embedded server
27 27 *
28 28 * @author Graeme Rocher
29 29 *
@@ -124,9 +124,6 @@ private runInline(scheme, host, httpPort, httpsPort) {
124 124 private runWar(scheme, host, httpPort, httpsPort) {
125 125 EmbeddableServerFactory serverFactory = loadServerFactory()
126 126 grailsServer = serverFactory.createForWAR(warName, serverContextPath)
127   - if(serverFactory.class.name.contains("Jetty")) {
128   - event("ConfigureJetty", [grailsServer.grailsServer])
129   - }
130 127
131 128 grails.util.Metadata.getCurrent().put(grails.util.Metadata.WAR_DEPLOYED, "true")
132 129 runServer server:grailsServer, host:host, httpPort:httpPort, httpsPort: httpsPort, scheme: scheme
@@ -262,7 +259,7 @@ target(watchContext: "Watches the WEB-INF/classes directory for changes and rest
262 259 // functional tests so that we can stop the servers that are
263 260 // started.
264 261 if (killFile.exists()) {
265   - println "Stopping Jetty server..."
  262 + println "Stopping server..."
266 263 grailsServer.stop()
267 264 killFile.delete()
268 265 keepRunning = false
@@ -280,7 +277,7 @@ target(keepServerAlive: "Idles the script, ensuring that the server stays runnin
280 277 // functional tests so that we can stop the servers that are
281 278 // started.
282 279 if (killFile.exists()) {
283   - println "Stopping Jetty server..."
  280 + println "Stopping server..."
284 281 grailsServer.stop()
285 282 killFile.delete()
286 283 keepRunning = false
@@ -288,7 +285,7 @@ target(keepServerAlive: "Idles the script, ensuring that the server stays runnin
288 285 }
289 286 }
290 287
291   -target(stopServer: "Stops the Grails Jetty server") {
  288 +target(stopServer: "Stops the Grails servlet container") {
292 289 if (grailsServer) {
293 290 try {
294 291 grailsServer.stop()

0 comments on commit 69c8376

Please sign in to comment.
Something went wrong with that request. Please try again.