Permalink
Browse files

Merge branch '2.2.x'

  • Loading branch information...
2 parents e8793e9 + 21c5144 commit eac1d854d729974344cba5af0eaab8ef3b862711 @jeffbrown jeffbrown committed Nov 18, 2012
@@ -94,7 +94,7 @@ task pluginsFromRepo {
tomcat: grailsVersion,
resources: "1.1.6",
webxml: "1.4.1",
- jquery: "1.8.2",
+ jquery: "1.8.3",
'database-migration': "1.2",
cache: "1.0.1"
]
@@ -114,8 +114,13 @@ class InteractiveMode {
}
else if ("quit".equals(trimmed)) {
goodbye()
- }
- else if (("exit".equals(trimmed)) || ("stop-app".equals(trimmed))) {
+ } else if('stop-app'.equals(trimmed)) {
+ if(settings.forkSettings?.get('run')) {
+ parseAndExecute 'stop-app'
+ } else {
+ stopApp()
+ }
+ } else if ("exit".equals(trimmed)) {
exit()
}
else if (scriptName.startsWith("open ")) {
@@ -175,7 +180,7 @@ class InteractiveMode {
System.exit(0)
}
- protected void exit() {
+ protected void stopApp() {
if (grailsServer) {
try {
updateStatus "Stopping Grails server"
@@ -187,6 +192,12 @@ class InteractiveMode {
grailsServer = null
}
}
+ }
+
+ protected void exit() {
+ if (grailsServer) {
+ stopApp()
+ }
else {
goodbye()
}
@@ -45,7 +45,7 @@ grails.project.dependency.resolution = {
plugins {
runtime ":hibernate:$grailsVersion"
- runtime ":jquery:1.8.2"
+ runtime ":jquery:1.8.3"
runtime ":resources:1.1.6"
// Uncomment these (or add new ones) to enable additional resources capabilities
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.grails.plugins</groupId>
<artifactId>jquery</artifactId>
- <version>1.8.2</version>
+ <version>1.8.3</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

0 comments on commit eac1d85

Please sign in to comment.