Changed to jQuery-version 1.4.2

Applied GRAILSPLUGINS-2056 Applied GRAILSPLUGINS-1919
gpc · May 1, 2010 · 26658b0 · 26658b0
1 parent 489e6de
commit 26658b0
Show file tree

Hide file tree

Showing 97 changed files with 12,086 additions and 43 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
diff --git a/.project b/.project
diff --git a/.settings/org.codehaus.groovy.eclipse.preferences.prefs b/.settings/org.codehaus.groovy.eclipse.preferences.prefs
diff --git a/JqueryGrailsPlugin.groovy b/JqueryGrailsPlugin.groovy
@@ -22,7 +22,7 @@ import org.codehaus.groovy.grails.plugins.jquery.JQueryProvider
 import org.codehaus.groovy.grails.commons.ConfigurationHolder
 
 class JqueryGrailsPlugin {
-    def version = "1.4.1.1"
+    def version = "1.4.2.1"
     def dependsOn = [:]
     def author = "Sergey Nebolsin, Craig Jones and Finn Herpich"
     def authorEmail = "nebolsin@gmail.com, craigjones@maximsc.com and finn.herpich@marfinn-software.de"
@@ -33,6 +33,7 @@ class JqueryGrailsPlugin {
     GroovyClassLoader classLoader = new GroovyClassLoader(getClass().getClassLoader())
 
     ConfigObject config = new ConfigSlurper().parse(classLoader.loadClass('JQueryConfig'))
+                              .merge(new ConfigSlurper().parse(classLoader.loadClass('Config')))
 
     def jQueryVersion = config.jquery.version
     def jQuerySources = config.jquery.sources

diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/application.properties b/application.properties
@@ -1,6 +1,6 @@
 #Grails Metadata file
-#Sat Jan 16 11:45:45 CET 2010
-app.grails.version=1.2.0
+#Sat May 01 15:46:37 CEST 2010
+app.grails.version=1.2.2
 app.name=grails-jquery
-plugins.hibernate=1.2.0
-plugins.tomcat=1.2.0
+plugins.hibernate=1.2.2
+plugins.tomcat=1.2.2
diff --git a/docs/gapi/DefaultPackage/JqueryGrailsPlugin.html b/docs/gapi/DefaultPackage/JqueryGrailsPlugin.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:16 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:53:00 CET 2010 -->
 <title>JqueryGrailsPlugin (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">

diff --git a/docs/gapi/DefaultPackage/package-frame.html b/docs/gapi/DefaultPackage/package-frame.html
diff --git a/docs/gapi/DefaultPackage/package-summary.html b/docs/gapi/DefaultPackage/package-summary.html
diff --git a/docs/gapi/allclasses-frame.html b/docs/gapi/allclasses-frame.html
diff --git a/docs/gapi/deprecated-list.html b/docs/gapi/deprecated-list.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 <!-- Generated by groovydoc (1.6.7-SNAPSHOT) on  -->
 <title>Deprecated API (grails-jquery)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link href="groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="groovy.ico" type="image/x-icon" rel="icon">

diff --git a/docs/gapi/grails-app/conf/JQueryConfig.html b/docs/gapi/grails-app/conf/JQueryConfig.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:15 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:58 CET 2010 -->
 <title>JQueryConfig (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/gapi/grails-app/conf/package-frame.html b/docs/gapi/grails-app/conf/package-frame.html
diff --git a/docs/gapi/grails-app/conf/package-summary.html b/docs/gapi/grails-app/conf/package-summary.html
diff --git a/docs/gapi/grails-app/services/JQueryService.html b/docs/gapi/grails-app/services/JQueryService.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:16 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:59 CET 2010 -->
 <title>JQueryService (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/gapi/grails-app/services/package-frame.html b/docs/gapi/grails-app/services/package-frame.html
diff --git a/docs/gapi/grails-app/services/package-summary.html b/docs/gapi/grails-app/services/package-summary.html
diff --git a/docs/gapi/grails-app/taglib/JQueryResourceTagLib.html b/docs/gapi/grails-app/taglib/JQueryResourceTagLib.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:16 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:58 CET 2010 -->
 <title>JQueryResourceTagLib (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/gapi/grails-app/taglib/JQueryTagLib.html b/docs/gapi/grails-app/taglib/JQueryTagLib.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:16 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:59 CET 2010 -->
 <title>JQueryTagLib (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/gapi/grails-app/taglib/package-frame.html b/docs/gapi/grails-app/taglib/package-frame.html
diff --git a/docs/gapi/grails-app/taglib/package-summary.html b/docs/gapi/grails-app/taglib/package-summary.html
diff --git a/docs/gapi/groovy.ico b/docs/gapi/groovy.ico
diff --git a/docs/gapi/help-doc.html b/docs/gapi/help-doc.html
@@ -7,7 +7,7 @@
 <title>API Help (grails-jquery)</title>
 <link href="groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="groovy.ico" type="image/x-icon" rel="icon">
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 
 <script type="text/javascript">

diff --git a/docs/gapi/index-all.html b/docs/gapi/index-all.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
 <!-- Generated by groovydoc (1.6.7-SNAPSHOT) on  -->
 <title>Index (grails-jquery)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link href="groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="groovy.ico" type="image/x-icon" rel="icon">

diff --git a/docs/gapi/index.html b/docs/gapi/index.html
diff --git a/docs/gapi/inherit.gif b/docs/gapi/inherit.gif
diff --git a/docs/gapi/overview-frame.html b/docs/gapi/overview-frame.html
diff --git a/docs/gapi/overview-summary.html b/docs/gapi/overview-summary.html
diff --git a/docs/gapi/package-list b/docs/gapi/package-list
diff --git a/docs/gapi/scripts/_Install.html b/docs/gapi/scripts/_Install.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:17 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:53:00 CET 2010 -->
 <title>_Install (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">

diff --git a/docs/gapi/scripts/_Uninstall.html b/docs/gapi/scripts/_Uninstall.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:17 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:53:00 CET 2010 -->
 <title>_Uninstall (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">

diff --git a/docs/gapi/scripts/_Upgrade.html b/docs/gapi/scripts/_Upgrade.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:17 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:53:00 CET 2010 -->
 <title>_Upgrade (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">

diff --git a/docs/gapi/scripts/package-frame.html b/docs/gapi/scripts/package-frame.html
diff --git a/docs/gapi/scripts/package-summary.html b/docs/gapi/scripts/package-summary.html
diff --git a/docs/gapi/src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryConfig.html b/docs/gapi/src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryConfig.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:15 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:58 CET 2010 -->
 <title>JQueryConfig (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../../../../../../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../../../../../../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">

diff --git a/docs/gapi/src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryProvider.html b/docs/gapi/src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryProvider.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:15 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:58 CET 2010 -->
 <title>JQueryProvider (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../../../../../../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../../../../../../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">

diff --git a/docs/gapi/src/groovy/org/codehaus/groovy/grails/plugins/jquery/package-frame.html b/docs/gapi/src/groovy/org/codehaus/groovy/grails/plugins/jquery/package-frame.html
diff --git a/docs/gapi/src/groovy/org/codehaus/groovy/grails/plugins/jquery/package-summary.html b/docs/gapi/src/groovy/org/codehaus/groovy/grails/plugins/jquery/package-summary.html
diff --git a/docs/gapi/stylesheet.css b/docs/gapi/stylesheet.css
diff --git a/docs/gapi/test/unit/JQTagLibTests.html b/docs/gapi/test/unit/JQTagLibTests.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:15 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:58 CET 2010 -->
 <title>JQTagLibTests (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/gapi/test/unit/JQueryResourceTagLibTests.html b/docs/gapi/test/unit/JQueryResourceTagLibTests.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:16 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:59 CET 2010 -->
 <title>JQueryResourceTagLibTests (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/gapi/test/unit/JQueryServiceTests.html b/docs/gapi/test/unit/JQueryServiceTests.html
@@ -6,9 +6,9 @@
 
 <html>
 <head>
-<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Tue Jan 26 14:09:16 CET 2010 -->
+<!-- Generated by groovydoc (1.6.7-SNAPSHOT) on Sun Jan 31 19:52:59 CET 2010 -->
 <title>JQueryServiceTests (Groovy Documentation)</title>
-<meta name="date" content="2010-01-26">
+<meta name="date" content="2010-01-31">
 <link href="../../groovy.ico" type="image/x-icon" rel="shortcut icon">
 <link href="../../groovy.ico" type="image/x-icon" rel="icon">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">

diff --git a/docs/gapi/test/unit/package-frame.html b/docs/gapi/test/unit/package-frame.html
diff --git a/docs/gapi/test/unit/package-summary.html b/docs/gapi/test/unit/package-summary.html
diff --git a/grails-app/conf/JQueryConfig.groovy b/grails-app/conf/JQueryConfig.groovy
@@ -1,4 +1,4 @@
 jquery {
     sources = 'jquery' // Holds the value where to store jQuery-js files /web-app/js/
-    version = '1.4.1' // The jQuery version in use
+    version = '1.4.2' // The jQuery version in use
 }
diff --git a/grails-app/conf/UrlMappings.groovy b/grails-app/conf/UrlMappings.groovy
@@ -0,0 +1,11 @@
+class UrlMappings {
+    static mappings = {
+      "/$controller/$action?/$id?"{
+	      constraints {
+			 // apply constraints here
+		  }
+	  }
+      "/"(view:"/index")
+	  "500"(view:'/error')
+	}
+}
diff --git a/grails-app/i18n/messages.properties b/grails-app/i18n/messages.properties
diff --git a/grails-app/services/JQueryService.groovy b/grails-app/services/JQueryService.groovy
diff --git a/grails-app/taglib/JQueryResourceTagLib.groovy b/grails-app/taglib/JQueryResourceTagLib.groovy
diff --git a/grails-app/taglib/JQueryTagLib.groovy b/grails-app/taglib/JQueryTagLib.groovy
diff --git a/grails-jquery-1.4.0.0.zip b/grails-jquery-1.4.0.0.zip
diff --git a/grails-jquery-1.4.0.1.zip b/grails-jquery-1.4.0.1.zip
diff --git a/grails-jquery-1.4.1.1.zip b/grails-jquery-1.4.1.1.zip
diff --git a/grails-jquery-grailsPlugins.iml b/grails-jquery-grailsPlugins.iml
@@ -2,20 +2,20 @@
 <module type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
-    <content url="file://$MODULE_DIR$/../../../.grails/1.2.0/projects/grails-jquery/plugins/tomcat-1.2.0">
-      <sourceFolder url="file://$MODULE_DIR$/../../../.grails/1.2.0/projects/grails-jquery/plugins/tomcat-1.2.0/src/groovy" isTestSource="false" />
+    <content url="file://$USER_HOME_GRAILS$/1.2.2/projects/grails-jquery/plugins/tomcat-1.2.2">
+      <sourceFolder url="file://$USER_HOME_GRAILS$/1.2.2/projects/grails-jquery/plugins/tomcat-1.2.2/src/groovy" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Grails 1.2" level="application" />
+    <orderEntry type="library" name="Grails 1.2.2" level="application" />
     <orderEntry type="module-library" exported="">
       <library name="Grails User Library">
         <CLASSES>
-          <root url="file://$MODULE_DIR$/../../../.grails/1.2.0/projects/grails-jquery/plugins/tomcat-1.2.0/lib" />
+          <root url="file://$USER_HOME_GRAILS$/1.2.2/projects/grails-jquery/plugins/tomcat-1.2.2/lib" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
-        <jarDirectory url="file://$MODULE_DIR$/../../../.grails/1.2.0/projects/grails-jquery/plugins/tomcat-1.2.0/lib" recursive="false" />
+        <jarDirectory url="file://$USER_HOME_GRAILS$/1.2.2/projects/grails-jquery/plugins/tomcat-1.2.2/lib" recursive="false" />
       </library>
     </orderEntry>
   </component>

diff --git a/grails-jquery.iml b/grails-jquery.iml
@@ -9,11 +9,19 @@
         <sourceRoots />
       </configuration>
     </facet>
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="Grails" name="Grails" removed="false">
+          <file>file://$MODULE_DIR$/web-app/WEB-INF/applicationContext.xml</file>
+        </fileset>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/grails-app/utils" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/groovy" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/grails-app/controllers" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/grails-app/domain" isTestSource="false" />
@@ -24,7 +32,7 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Grails 1.2" level="application" />
+    <orderEntry type="library" name="Grails 1.2.2" level="application" />
     <orderEntry type="module-library">
       <library name="Grails User Library">
         <CLASSES>

diff --git a/plugin.xml b/plugin.xml
diff --git a/scripts/_Install.groovy b/scripts/_Install.groovy
@@ -32,7 +32,7 @@ checkVersion()
 configureProxy()
 
 // Hard coded for installation purpose
-def jQueryVersion = '1.4.1'
+def jQueryVersion = '1.4.2'
 def jQuerySources = 'jquery'
 
 Ant.sequential {

diff --git a/scripts/_Uninstall.groovy b/scripts/_Uninstall.groovy
diff --git a/scripts/_Upgrade.groovy b/scripts/_Upgrade.groovy
diff --git a/src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryConfig.groovy b/src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryConfig.groovy
diff --git a/src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryProvider.groovy b/src/groovy/org/codehaus/groovy/grails/plugins/jquery/JQueryProvider.groovy
@@ -150,7 +150,7 @@ class JQueryProvider implements JavascriptProvider {
 
                 if (attrs.update instanceof Map) {
                     if (attrs.update?.failure) {
-                        out << "jQuery('#${attrs.update?.failure}').html(textStatus);"
+                        out << "jQuery('#${attrs.update?.failure}').html(XMLHttpRequest.responseText);"
                     }
                 }
 

diff --git a/test/unit/JQTagLibTests.groovy b/test/unit/JQTagLibTests.groovy
diff --git a/test/unit/JQueryResourceTagLibTests.groovy b/test/unit/JQueryResourceTagLibTests.groovy
diff --git a/test/unit/JQueryServiceTests.groovy b/test/unit/JQueryServiceTests.groovy