From 90b379c277e1c4e90e60602a4ce2427c4a1d0e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladimi=CC=81r=20Orany=CC=81?= Date: Tue, 8 Apr 2014 08:03:10 +0200 Subject: [PATCH] gaelyk 2.1.1 --- build.gradle | 2 +- common.gradle | 2 +- .../src/main/groovyx/gaelyk/GaelykServlet.groovy | 14 ++++++-------- .../groovyx/gaelyk/GaelykTemplateServlet.groovy | 16 ++++++++-------- .../org.codehaus.groovy.runtime.ExtensionModule | 2 +- website/war/WEB-INF/appengine-web.xml | 2 +- .../WEB-INF/pages/tutorial/templateProject.gtpl | 4 ++-- website/war/decorators/decorator.jsp | 2 +- 8 files changed, 21 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 836dd6c7..bb4f64da 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ allprojects { } - version = '2.2-SNAPSHOT' + version = '2.1.1' group = 'org.gaelyk' } diff --git a/common.gradle b/common.gradle index d8666607..95cee917 100644 --- a/common.gradle +++ b/common.gradle @@ -1,7 +1,7 @@ ext.gaelykGroovyVersion = '2.1.9' ext.gaelykSpockVersion = '0.7-groovy-2.0' ext.gaelykAppEngineVersion = '1.9.1' -ext.gaelykLatestVersion = '2.2-SNAPSHOT' +ext.gaelykLatestVersion = '2.1.1' ext.gaelykSpockLatestVersion = '0.4' ext.gaelykGradleVersion = '1.10' diff --git a/core/src/main/groovyx/gaelyk/GaelykServlet.groovy b/core/src/main/groovyx/gaelyk/GaelykServlet.groovy index dc12953e..fa837c8f 100644 --- a/core/src/main/groovyx/gaelyk/GaelykServlet.groovy +++ b/core/src/main/groovyx/gaelyk/GaelykServlet.groovy @@ -133,17 +133,10 @@ class GaelykServlet extends GroovyServlet { StringWriter sw = [] PrintWriter pw = [sw] - if (logErrors) { - pw.print("GaelykServlet Error: ") - pw.print(" script: '") - pw.print(scriptUri) - getLog(request).warning(sw.toString()) - } - /* * Resource not found. */ - if (e instanceof ResourceException) { + if (e instanceof ResourceException || e instanceof ClassNotFoundException || e instanceof FileNotFoundException) { if (logErrors) { pw.println("': ") e.printStackTrace(pw) @@ -151,6 +144,11 @@ class GaelykServlet extends GroovyServlet { } response.sendError(HttpServletResponse.SC_NOT_FOUND) return + } else if (logErrors) { + pw.print("GaelykServlet Error: ") + pw.print(" script: '") + pw.print(scriptUri) + getLog(request).warning(sw.toString()) } throw e // Let propogate out the filter chain and container handle the exception. } diff --git a/core/src/main/groovyx/gaelyk/GaelykTemplateServlet.groovy b/core/src/main/groovyx/gaelyk/GaelykTemplateServlet.groovy index 0e20e06e..1dc58992 100644 --- a/core/src/main/groovyx/gaelyk/GaelykTemplateServlet.groovy +++ b/core/src/main/groovyx/gaelyk/GaelykTemplateServlet.groovy @@ -117,17 +117,11 @@ class GaelykTemplateServlet extends TemplateServlet { e = RoutesFilter.filterStackTrace(request, e) StringWriter sw = [] PrintWriter pw = [sw] - - if (logErrors) { - pw.print("GaelykTemplateServlet Error: ") - pw.print(" template: '") - pw.print(getScriptUri(request)) - getLog(request).warning(sw.toString()) - } + /* * Resource not found. */ - if (e instanceof ResourceException) { + if (e instanceof ResourceException || e instanceof ClassNotFoundException || e instanceof FileNotFoundException) { if (logErrors) { pw.println("': ") e.printStackTrace(pw) @@ -135,6 +129,12 @@ class GaelykTemplateServlet extends TemplateServlet { } response.sendError(HttpServletResponse.SC_NOT_FOUND) return + } else if (logErrors) { + pw.print("GaelykTemplateServlet Error: ") + pw.print(" template: '") + pw.print(getScriptUri(request)) + getLog(request).warning(sw.toString()) + } throw e // Let propagate out the filter chain and container handle the exception. } diff --git a/core/src/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule b/core/src/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule index 04212679..a7168872 100644 --- a/core/src/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule +++ b/core/src/resources/META-INF/services/org.codehaus.groovy.runtime.ExtensionModule @@ -1,4 +1,4 @@ moduleName=gaelyk-extension-module -moduleVersion=2.1 +moduleVersion=2.1.1 extensionClasses=groovy.servlet.ServletCategory,groovyx.gaelyk.extensions.ServletExtensions,groovyx.gaelyk.extensions.DatastoreExtensions,groovyx.gaelyk.extensions.MemcacheExtensions,groovyx.gaelyk.extensions.BlobstoreExtensions,groovyx.gaelyk.extensions.FilesExtensions,groovyx.gaelyk.extensions.MailExtensions,groovyx.gaelyk.extensions.TaskQueueExtensions,groovyx.gaelyk.extensions.SearchExtensions,groovyx.gaelyk.extensions.UrlFetchExtensions,groovyx.gaelyk.extensions.ChannelExtensions,groovyx.gaelyk.extensions.CapabilitiesExtensions,groovyx.gaelyk.extensions.XmppExtensions,groovyx.gaelyk.extensions.ImageExtensions,groovyx.gaelyk.extensions.BackendExtensions,groovyx.gaelyk.extensions.MiscExtensions,groovyx.gaelyk.extensions.ExpirationTimeExtensionMethods staticExtensionClasses=groovyx.gaelyk.extensions.NamespaceStaticExtensions diff --git a/website/war/WEB-INF/appengine-web.xml b/website/war/WEB-INF/appengine-web.xml index 71d8f176..6884f574 100644 --- a/website/war/WEB-INF/appengine-web.xml +++ b/website/war/WEB-INF/appengine-web.xml @@ -1,6 +1,6 @@ gaelyk - 21 + 21a true diff --git a/website/war/WEB-INF/pages/tutorial/templateProject.gtpl b/website/war/WEB-INF/pages/tutorial/templateProject.gtpl index cdfa4577..f452e70e 100644 --- a/website/war/WEB-INF/pages/tutorial/templateProject.gtpl +++ b/website/war/WEB-INF/pages/tutorial/templateProject.gtpl @@ -52,8 +52,8 @@ The Gradle build file uses the following Gradle plugins:

You'll find more information on -the gae plugin and -gaelyk plugin +the gae plugin and +gaelyk plugin on their respective project pages. The pages describe all available configuration options and tasks in detail.

diff --git a/website/war/decorators/decorator.jsp b/website/war/decorators/decorator.jsp index 2567cd83..c2d40357 100644 --- a/website/war/decorators/decorator.jsp +++ b/website/war/decorators/decorator.jsp @@ -58,7 +58,7 @@
  • Tutorial
  • Download
  • Plugins
    • -
  • Community
    • + <%--
  • Community
    • --%>
  • Search