Changeset 876 for branches/features

Timestamp:

Mar 21, 2011, 5:07:36 PM (14 years ago)

Author:

gav

Message:

Upgrade branches/features/grailsUpgrade to Grails-1.3.5, including plugin upgrades and some todo removals.

Location:

branches/features/grailsUpgrade

Files:

• application.properties (modified) (1 diff)
• grails-app/conf/BootStrap.groovy (modified) (2 diffs)
• grails-app/conf/BuildConfig.groovy (modified) (3 diffs)
• web-app/WEB-INF/tld/grails.tld (modified) (1 diff)

branches/features/grailsUpgrade/application.properties

@@ -1 +1 @@
 #Grails Metadata file
 #Thu Jan 27 17:24:52 EST 2011
-app.grails.version=1.2.2
+app.grails.version=1.3.5
 app.name=gnuMims
 app.servlet.version=2.4
 app.vcsRevision=$Rev$
 app.version=
-plugins.acegi=0.5.2
-plugins.class-diagram=0.5.1
-plugins.export=0.6
-plugins.filterpane=0.6.8
-plugins.help-balloons=1.3
-plugins.hibernate=1.2.2
-plugins.jasper=0.9.7
+plugins.acegi=0.5.3
+plugins.class-diagram=0.5.2
+plugins.export=0.7
+plugins.filterpane=0.7
+plugins.help-balloons=1.4
+plugins.hibernate=1.3.5
+plugins.jasper=1.1.3
 plugins.navigation=1.1.1
 plugins.quartz=0.4.2
 plugins.richui=0.8
-plugins.searchable=0.5.5
-plugins.tomcat=1.2.2
+plugins.searchable=0.6-SNAPSHOT
+plugins.tomcat=1.3.5

branches/features/grailsUpgrade/grails-app/conf/BootStrap.groovy

@@ -1 +1 @@
 class BootStrap
 {
-
-    def sessionFactory // used by isDirty().
-    def grailsApplication // used by isDirty().
     def createDataService
 
     def init = { servletContext ->
-
-        /** Add isDirty() to domainClasses.
-        * @todo remove after upgrading to Grails-1.3 >.
-        * See: http://grails.1312388.n4.nabble.com/beforeUpdate-Compare-with-previous-set-value-isDirty-not-working-in-Events-td1695661.html
-        */
-        addDirtyCheckMethods()
 
         /** Environment specific settings.
@@ -46 +37 @@
     }
 
-   private void addDirtyCheckMethods() {
-      for (dc in grailsApplication.domainClasses) {
-         addDirtyCheckMethods dc.clazz.metaClass
-      }
-   }
-
-    private void addDirtyCheckMethods(metaClass) {
-      metaClass.isDirty = { ->
-         def session = sessionFactory.currentSession
-         def entry = findEntityEntry(delegate, session)
-         if (!entry) {
-            return false
-         }
-
-         Object[] values = entry.persister.getPropertyValues(delegate, session.entityMode)
-         def dirtyProperties = entry.persister.findDirty(values, entry.loadedState, delegate, session)
-         return dirtyProperties != null
-      }
-
-      metaClass.isDirty = { String fieldName ->
-         def session = sessionFactory.currentSession
-         def entry = findEntityEntry(delegate, session)
-         if (!entry) {
-            return false
-         }
-
-         Object[] values = entry.persister.getPropertyValues(delegate, session.entityMode)
-         int[] dirtyProperties = entry.persister.findDirty(values, entry.loadedState, delegate, session)
-         int fieldIndex = entry.persister.propertyNames.findIndexOf { fieldName == it }
-         return fieldIndex in dirtyProperties
-      }
-
-      metaClass.getDirtyPropertyNames = { ->
-         def session = sessionFactory.currentSession
-         def entry = findEntityEntry(delegate, session)
-         if (!entry) {
-            return []
-         }
-
-         Object[] values = entry.persister.getPropertyValues(delegate, session.entityMode)
-         int[] dirtyProperties = entry.persister.findDirty(values, entry.loadedState, delegate, session)
-         def names = []
-         for (index in dirtyProperties) {
-            names << entry.persister.propertyNames[index]
-         }
-         names
-      }
-
-      metaClass.getPersistentValue = { String fieldName ->
-         def session = sessionFactory.currentSession
-         def entry = findEntityEntry(delegate, session, false)
-         if (!entry) {
-            return null
-         }
-
-         int fieldIndex = entry.persister.propertyNames.findIndexOf { fieldName == it }
-         return fieldIndex == -1 ? null : entry.loadedState[fieldIndex]
-      }
-   }
-
-   private findEntityEntry(instance, session, boolean forDirtyCheck = true) {
-      def entry = session.persistenceContext.getEntry(instance)
-      if (!entry) {
-         return null
-      }
-
-      if (forDirtyCheck && !entry.requiresDirtyCheck(instance) && entry.loadedState) {
-         return null
-      }
-
-      entry
-   }
-
 } // end class

branches/features/grailsUpgrade/grails-app/conf/BuildConfig.groovy

@@ -29 +29 @@
     delete file: "${stagingDir}/WEB-INF/lib/poi-3.0.2-FINAL-20080204.jar"
     delete file: "${stagingDir}/WEB-INF/lib/facebook-2.0.4.jar"
-    // Included by searchable plugin.
-    delete file: "${stagingDir}/WEB-INF/lib/compass-2.1.0.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/compass-2.1.0-src.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-core.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-analyzers.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-highlighter.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-queries.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-snowball.jar"
-    delete file: "${stagingDir}/WEB-INF/lib/lucene-spellchecker.jar"
 }
 
@@ -51 +42 @@
 
     repositories {
+        grailsHome()
         grailsPlugins()
-        grailsHome()
+        grailsCentral()
 
         // uncomment the below to enable remote dependency resolution
@@ -77 +69 @@
         }
 
-        runtime ('org.compass-project:compass:2.1.4')
-        runtime ('org.apache.lucene:lucene-core:2.4.1')
-        runtime ('org.apache.lucene:lucene-analyzers:2.4.1')
-        runtime ('org.apache.lucene:lucene-highlighter:2.4.1')
-        runtime ('org.apache.lucene:lucene-queries:2.4.1')
-        runtime ('org.apache.lucene:lucene-snowball:2.4.1')
-        runtime ('org.apache.lucene:lucene-spellchecker:2.4.1')
-
         runtime ('org.apache.ant:ant:1.7.1')
         runtime ('org.apache.ant:ant-launcher:1.7.1')

branches/features/grailsUpgrade/web-app/WEB-INF/tld/grails.tld

@@ -5 +5 @@
             http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
         version="2.0">
-    <description>The Grails (Groovy on Rails) custom tag library</description>
+    <description>The Grails custom tag library</description>
     <tlib-version>0.2</tlib-version>
     <short-name>grails</short-name>
     <uri>http://grails.codehaus.org/tags</uri>
-
 
     <tag>