gaelyk 2.1.1

gaelyk · Apr 8, 2014 · 90b379c · 90b379c
1 parent a563126
commit 90b379c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 23 deletions.
diff --git 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
@@ -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
@@ -133,24 +133,22 @@ 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)
                     servletContext.log(sw.toString())
                 }
                 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
@@ -117,24 +117,24 @@ 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)                
                     servletContext.log(sw.toString())
                 }
                 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
@@ -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
@@ -1,6 +1,6 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
     <application>gaelyk</application>
-    <version>21</version>
+    <version>21a</version>
     <threadsafe>true</threadsafe>
 
     <static-files>

diff --git 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:
 
 <p>
 You'll find more information on
-the <a href="https://github.com/bmuschko/gradle-gae-plugin">gae plugin</a> and
-<a href="https://github.com/bmuschko/gradle-gaelyk-plugin">gaelyk plugin</a>
+the <a href="https://github.com/GoogleCloudPlatform/gradle-appengine-plugin">gae plugin</a> and
+<a href="https://github.com/GoogleCloudPlatform/gradle-appengine-plugin">gaelyk plugin</a>
 on their respective project pages. The pages describe all available configuration options and tasks in detail.
 </p>
 

diff --git a/website/war/decorators/decorator.jsp b/website/war/decorators/decorator.jsp
@@ -58,7 +58,7 @@
                 <li><a href="/tutorial">Tutorial</a></li>
                 <li><a href="/download">Download</a></li>
                 <li><a href="/plugins">Plugins</a></li>
-                <li><a href="/community">Community</a></li>
+                <%--<li><a href="/community">Community</a></li>--%>
                 <li><a href="/search">Search</a></li>
             </ul>
         </div>