Permalink
Browse files

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

…in run-war" and removed other references to Jetty
  • Loading branch information...
1 parent 59d6caa commit 69c837625b438295e29871f385e49d7c1f5dcf96 @graemerocher graemerocher committed Sep 11, 2009
Showing with 4 additions and 7 deletions.
  1. +4 −7 scripts/_GrailsRun.groovy
View
@@ -23,7 +23,7 @@ import org.codehaus.groovy.grails.plugins.GrailsPluginUtils
/**
- * Gant script that executes Grails using an embedded Jetty server
+ * Gant script that executes Grails using an embedded server
*
* @author Graeme Rocher
*
@@ -124,9 +124,6 @@ private runInline(scheme, host, httpPort, httpsPort) {
private runWar(scheme, host, httpPort, httpsPort) {
EmbeddableServerFactory serverFactory = loadServerFactory()
grailsServer = serverFactory.createForWAR(warName, serverContextPath)
- if(serverFactory.class.name.contains("Jetty")) {
- event("ConfigureJetty", [grailsServer.grailsServer])
- }
grails.util.Metadata.getCurrent().put(grails.util.Metadata.WAR_DEPLOYED, "true")
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
// functional tests so that we can stop the servers that are
// started.
if (killFile.exists()) {
- println "Stopping Jetty server..."
+ println "Stopping server..."
grailsServer.stop()
killFile.delete()
keepRunning = false
@@ -280,15 +277,15 @@ target(keepServerAlive: "Idles the script, ensuring that the server stays runnin
// functional tests so that we can stop the servers that are
// started.
if (killFile.exists()) {
- println "Stopping Jetty server..."
+ println "Stopping server..."
grailsServer.stop()
killFile.delete()
keepRunning = false
}
}
}
-target(stopServer: "Stops the Grails Jetty server") {
+target(stopServer: "Stops the Grails servlet container") {
if (grailsServer) {
try {
grailsServer.stop()

0 comments on commit 69c8376

Please sign in to comment.