A better way of changing Config.groovy.

Author: Daniel Henrique Alves Lima

hibernate-spatial-hdb/HibernateSpatialHdbGrailsPlugin.groovy

@@ -18,7 +18,7 @@
  * @author Daniel Henrique Alves Lima
  */
 class HibernateSpatialHdbGrailsPlugin {
-    def version = "0.0.3"
+    def version = "0.0.4"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "1.2.0 > *"
     // the other plugins this plugin depends on

hibernate-spatial-hdb/application.properties

@@ -1,8 +1,8 @@
-#Grails Metadata file
-#Mon Sep 26 14:35:27 BRT 2011
-app.grails.version=1.3.7
-app.name=hibernate-spatial-hdb
-plugins.hibernate=1.3.7
-plugins.hibernate-spatial=0.0.3
-plugins.plugin-config=0.1.5
-plugins.tomcat=1.3.7
+#Grails Metadata file
+#Tue Sep 27 19:46:22 BRT 2011
+app.grails.version=1.3.7
+app.name=hibernate-spatial-hdb
+plugins.hibernate=1.3.7
+plugins.hibernate-spatial=0.0.4
+plugins.plugin-config=0.1.5
+plugins.tomcat=1.3.7

hibernate-spatial-mysql/HibernateSpatialMysqlGrailsPlugin.groovy

@@ -19,7 +19,7 @@
  */
 class HibernateSpatialMysqlGrailsPlugin {
     // the plugin version
-    def version = "0.0.3"
+    def version = "0.0.4"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "1.2.0 > *"
     // the other plugins this plugin depends on

hibernate-spatial-mysql/application.properties

@@ -1,8 +1,8 @@
-#Grails Metadata file
-#Mon Sep 26 14:37:32 BRT 2011
-app.grails.version=1.3.7
-app.name=hibernate-spatial-mysql
-plugins.hibernate=1.3.7
-plugins.hibernate-spatial=0.0.3
-plugins.plugin-config=0.1.5
-plugins.tomcat=1.3.7
+#Grails Metadata file
+#Tue Sep 27 20:18:55 BRT 2011
+app.grails.version=1.3.7
+app.name=hibernate-spatial-mysql
+plugins.hibernate=1.3.7
+plugins.hibernate-spatial=0.0.4
+plugins.plugin-config=0.1.5
+plugins.tomcat=1.3.7

hibernate-spatial-oracle/HibernateSpatialOracleGrailsPlugin.groovy

@@ -19,7 +19,7 @@
  */
 class HibernateSpatialOracleGrailsPlugin {
     // the plugin version
-    def version = "0.0.3"
+    def version = "0.0.4"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "1.2.0 > *"
     // the other plugins this plugin depends on

hibernate-spatial-oracle/application.properties

@@ -1,8 +1,8 @@
-#Grails Metadata file
-#Mon Sep 26 14:38:40 BRT 2011
-app.grails.version=1.3.7
-app.name=hibernate-spatial-oracle
-plugins.hibernate=1.3.7
-plugins.hibernate-spatial=0.0.3
-plugins.plugin-config=0.1.5
-plugins.tomcat=1.3.7
+#Grails Metadata file
+#Tue Sep 27 20:19:05 BRT 2011
+app.grails.version=1.3.7
+app.name=hibernate-spatial-oracle
+plugins.hibernate=1.3.7
+plugins.hibernate-spatial=0.0.4
+plugins.plugin-config=0.1.5
+plugins.tomcat=1.3.7

hibernate-spatial-postgresql/HibernateSpatialPostgresqlGrailsPlugin.groovy

@@ -19,7 +19,7 @@
  */
 class HibernateSpatialPostgresqlGrailsPlugin {
     // the plugin version
-    def version = "0.0.3"
+    def version = "0.0.4"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "1.2.0 > *"
     // the other plugins this plugin depends on

hibernate-spatial-postgresql/application.properties

@@ -1,8 +1,8 @@
-#Grails Metadata file
-#Mon Sep 26 14:03:47 BRT 2011
-app.grails.version=1.3.7
-app.name=hibernate-spatial-postgresql
-plugins.hibernate=1.3.7
-plugins.hibernate-spatial=0.0.3
-plugins.plugin-config=0.1.5
-plugins.tomcat=1.3.7
+#Grails Metadata file
+#Tue Sep 27 20:19:24 BRT 2011
+app.grails.version=1.3.7
+app.name=hibernate-spatial-postgresql
+plugins.hibernate=1.3.7
+plugins.hibernate-spatial=0.0.4
+plugins.plugin-config=0.1.5
+plugins.tomcat=1.3.7

hibernate-spatial-sqlserver/HibernateSpatialSqlserverGrailsPlugin.groovy

@@ -19,7 +19,7 @@
  */
 class HibernateSpatialSqlserverGrailsPlugin {
     // the plugin version
-    def version = "0.0.3"
+    def version = "0.0.4"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "1.2.0 > *"
     // the other plugins this plugin depends on

hibernate-spatial-sqlserver/application.properties

@@ -1,8 +1,8 @@
-#Grails Metadata file
-#Mon Sep 26 14:41:20 BRT 2011
-app.grails.version=1.3.7
-app.name=hibernate-spatial-sqlserver
-plugins.hibernate=1.3.7
-plugins.hibernate-spatial=0.0.3
-plugins.plugin-config=0.1.5
-plugins.tomcat=1.3.7
+#Grails Metadata file
+#Tue Sep 27 20:20:15 BRT 2011
+app.grails.version=1.3.7
+app.name=hibernate-spatial-sqlserver
+plugins.hibernate=1.3.7
+plugins.hibernate-spatial=0.0.4
+plugins.plugin-config=0.1.5
+plugins.tomcat=1.3.7

hibernate-spatial/HibernateSpatialGrailsPlugin.groovy

@@ -19,7 +19,7 @@
  */
 class HibernateSpatialGrailsPlugin {
     // the plugin version
-    def version = "0.0.3"
+    def version = "0.0.4"
     // the version or versions of Grails the plugin is designed for
     def grailsVersion = "1.2.0 > *"
     // the other plugins this plugin depends on

hibernate-spatial/scripts/_HibernateSpatialInstall.groovy

@@ -35,14 +35,20 @@ _hibernateSpatialUpdateConfig = {Map dataSourceOptions = [:] ->
     File configDir = new File(grailsSettings.baseDir, '/grails-app/conf/')
     File configFile = new File(configDir, 'Config.groovy')
 
+    Set geometryClasses = new LinkedHashSet()
+    for (geometry in ['Geometry',
+        'GeometryCollection', 'LineString', 'Point', 'Polygon',
+        'MultiLineString', 'MultiPoint', 'MultiPolygon',
+        'LinearRing', 'Puntal', 'Lineal', 'Polygonal']) {    
+        geometryClasses << "com.vividsolutions.jts.geom.${geometry}".toString()
+    }
+    
+    
     if (configFile.exists()) {
         try {
             Closure printUserTypes = {writer, String indentation = '' ->
-                for (geometry in ['Geometry', 
-                        'GeometryCollection', 'LineString', 'Point', 'Polygon', 
-                        'MultiLineString', 'MultiPoint', 'MultiPolygon', 
-                        'LinearRing', 'Puntal', 'Lineal', 'Polygonal']) {                
-                    writer.println("${indentation}\'user-type\'(type:org.hibernatespatial.GeometryUserType, class:com.vividsolutions.jts.geom.${geometry})")
+                for (geometryClass in geometryClasses) {                
+                    writer.println("${indentation}\'user-type\'(type:org.hibernatespatial.GeometryUserType, class:${geometryClass})")
                 }
             }
 
@@ -53,30 +59,58 @@ _hibernateSpatialUpdateConfig = {Map dataSourceOptions = [:] ->
             boolean fileChanged = false
 
             Pattern userTypePattern = Pattern.compile('.*["\']user-type["\'].*')
-            Pattern geometryTypePattern = Pattern.compile('.*\\W*GeometryUserType\\W*.*')
-            newConfigFile.withPrintWriter {writer ->
-                configFile.eachLine {line -> 
-                    if (userTypePattern.matcher(line).matches()) {
-                        foundDefaultMapping = foundDefaultMapping || true
-                        if (!foundGeometryType) {
-                            if (!geometryTypePattern.matcher(line).matches()) {
-                                writer.println('   /* Added by the Hibernate Spatial Plugin. */')
-                                printUserTypes(writer, '   ')
-                                fileChanged = true
+            Pattern geometryTypePattern = Pattern.compile('.*class\\s*:\\s*([A-Za-z\\.]+).*')
+            List userTypeLines = []
+            
+            newConfigFile.withPrintWriter {writer ->                
+                configFile.withReader {reader ->
+                    String line = null
+
+                    while ((line = reader.readLine()) != null) {
+                        if (!foundDefaultMapping) {
+                            while (line != null && userTypePattern.matcher(line).matches()) {
+                                userTypeLines << line
+                                line = reader.readLine()
                             }
-                            foundGeometryType = true 
-                        }                                           
-                    } 
-                    writer.println(line)
-                }
-                
-                if (!foundDefaultMapping) {
-                    writer.println('/* Added by the Hibernate Spatial Plugin. */')
-                    writer.println('grails.gorm.default.mapping = {')
-                    printUserTypes(writer, '   ')
-                    writer.println('}')
-                    fileChanged = true
-                }
+
+                            if (userTypeLines.size() > 0) {
+                                for (userTypeLine in userTypeLines) {                                    
+                                    Matcher matcher = geometryTypePattern.matcher(userTypeLine)
+                                    if (matcher.matches()) {
+                                        String geometryClass = matcher.replaceAll('$1')
+                                        //println "geometryClass ${geometryClass}"
+                                        geometryClasses.remove(geometryClass)
+                                        
+                                    }
+                                }
+
+                                println "geometryClasses ${geometryClasses}"
+                                if (geometryClasses.size() > 0) {
+                                    writer.println('   /* Added by the Hibernate Spatial Plugin. */')
+                                    printUserTypes(writer, '   ')
+
+                                    for (userTypeLine in userTypeLines) {
+                                        writer.println(userTypeLine)
+                                    }
+                                    userTypeLines.clear()
+                                    fileChanged = true
+                                }
+                                
+                                foundDefaultMapping = true
+                            }
+                        }
+
+                        writer.println(line)
+                    }
+
+                    if (!foundDefaultMapping) {
+                        writer.println('/* Added by the Hibernate Spatial Plugin. */')
+                        writer.println('grails.gorm.default.mapping = {')
+                        printUserTypes(writer, '   ')
+                        writer.println('}')
+                        fileChanged = true
+                    }
+                }                                            
             }
 
             if (!fileChanged) {