Upgraded project to Grails 2.4.4

Author: goeh

application.properties

@@ -1,4 +1,4 @@
 #Grails Metadata file
 #Sun Aug 19 16:18:43 CEST 2012
-app.grails.version=2.2.4
+app.grails.version=2.4.4
 app.name=sequence-generator

grails-app/conf/BuildConfig.groovy

@@ -4,21 +4,22 @@ grails.project.test.class.dir = "target/test-classes"
 grails.project.test.reports.dir = "target/test-reports"
 grails.project.target.level = 1.6
 
+grails.project.dependency.resolver = "maven"
 grails.project.dependency.resolution = {
     inherits("global") {}
     log "warn"
     repositories {
         grailsCentral()
-        //mavenCentral()
+        mavenCentral()
     }
     dependencies {
     }
     plugins {
-        build(":tomcat:$grailsVersion",
-              ":release:2.2.1") {
+        build(":release:3.0.1",
+                ":rest-client-builder:1.0.3") {
             export = false
         }
-        test(":hibernate:$grailsVersion") {
+        test(":hibernate4:4.3.6.1") {
             export = false
         }
     }

grails-app/conf/DataSource.groovy

@@ -1,13 +1,17 @@
 dataSource {
     pooled = true
+    jmxExport = true
     driverClassName = "org.h2.Driver"
     username = "sa"
     password = ""
 }
 hibernate {
     cache.use_second_level_cache = true
-    cache.use_query_cache = true
-    cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory'
+    cache.use_query_cache = false
+//    cache.region.factory_class = 'net.sf.ehcache.hibernate.EhCacheRegionFactory' // Hibernate 3
+    cache.region.factory_class = 'org.hibernate.cache.ehcache.EhCacheRegionFactory' // Hibernate 4
+    singleSession = true // configure OSIV singleSession mode
+    flush.mode = 'manual' // OSIV session flush mode outside of transactional context
 }
 // environment specific settings
 environments {

test/integration/grails/plugins/sequence/DefaultGeneratorTests.groovy

@@ -30,7 +30,7 @@ class DefaultGeneratorTests extends GroovyTestCase {
         sequenceGenerator.shutdown()
     }
 
-    def testSetNumber() {
+    void testSetNumber() {
         def name = "Ticket"
         def seq = sequenceGeneratorService.initSequence(name, null, null, 121001)
 
@@ -52,7 +52,7 @@ class DefaultGeneratorTests extends GroovyTestCase {
         assertEquals '131006', sequenceGeneratorService.nextNumber(name)
     }
 
-    def testThreads() {
+    void testThreads() {
         def sequenceName = 'ThreadTestDefault'
 
         final int THREADS = 100
@@ -113,7 +113,7 @@ class DefaultGeneratorTests extends GroovyTestCase {
         assertEquals 1001 + THREADS * NUMBERS, sequenceGeneratorService.nextNumberLong(sequenceName)
     }
 
-    def testShutdown() {
+    void testShutdown() {
         sequenceGeneratorService.initSequence(SequenceTestEntity, null, null, 1008, '%05d')
         assertEquals "01008", new SequenceTestEntity().getNextSequenceNumber()
         assertEquals "01009", new SequenceTestEntity().getNextSequenceNumber()
@@ -129,7 +129,7 @@ class DefaultGeneratorTests extends GroovyTestCase {
         assertTrue sequenceGenerator.keepGoing
     }
 
-    def testRefresh() {
+    void testRefresh() {
         sequenceGeneratorService.initSequence(SequenceTestEntity, null, null, 5001, '%04d')
         assertEquals "5001", new SequenceTestEntity().getNextSequenceNumber()
         assertEquals "5002", new SequenceTestEntity().getNextSequenceNumber()

test/integration/grails/plugins/sequence/SequenceServiceTests.groovy

@@ -31,7 +31,7 @@ class SequenceServiceTests extends GroovyTestCase {
         sequenceGenerator.shutdown()
     }
 
-    def testNoFormat() {
+    void testNoFormat() {
         def name = "Company"
         sequenceGeneratorService.initSequence(name, null, null, 1)
         assertEquals 1L, sequenceGeneratorService.nextNumberLong(name)
@@ -43,7 +43,7 @@ class SequenceServiceTests extends GroovyTestCase {
         assertEquals "4", sequenceGeneratorService.nextNumber(name)
     }
 
-    def testFormat() {
+    void testFormat() {
         def name = "Customer"
         sequenceGeneratorService.initSequence(name, null, null, 100, 'K-%04d')
 
@@ -60,7 +60,7 @@ class SequenceServiceTests extends GroovyTestCase {
         assertEquals 104, sequenceGeneratorService.status(name, null, null).number
     }
 
-    def testSetNumber() {
+    void testSetNumber() {
         def name = "Ticket"
         sequenceGeneratorService.initSequence(name, null, null, 121001)
 
@@ -76,7 +76,7 @@ class SequenceServiceTests extends GroovyTestCase {
         assertEquals '131003', sequenceGeneratorService.nextNumber(name)
     }
 
-    def testThreads() {
+    void testThreads() {
         def sequenceName = 'ThreadTest'
 
         final int THREADS = 100
@@ -131,15 +131,15 @@ class SequenceServiceTests extends GroovyTestCase {
         assertEquals 1001 + THREADS * NUMBERS, sequenceGeneratorService.nextNumberLong(sequenceName)
     }
 
-    def testDomainMethod() {
+    void testDomainMethod() {
         sequenceGeneratorService.initSequence(SequenceTestEntity, null, null, 1000, '%05d')
         assertEquals "01000", new SequenceTestEntity().getNextSequenceNumber()
         assertEquals "01001", new SequenceTestEntity().getNextSequenceNumber()
         assertEquals "01002", new SequenceTestEntity().getNextSequenceNumber()
         assertEquals "01003", new SequenceTestEntity().getNextSequenceNumber()
     }
 
-    def testBeforeValidate() {
+    void testBeforeValidate() {
         sequenceGeneratorService.initSequence(SequenceTestEntity, null, null, 1000)
         def test = new SequenceTestEntity(name: "TEST")
         assert test.respondsTo("beforeValidate")
@@ -148,7 +148,7 @@ class SequenceServiceTests extends GroovyTestCase {
         assert test.number == "1000"
     }
 
-    def testStatistics() {
+    void testStatistics() {
         sequenceGeneratorService.initSequence('Foo', null, null, 25)
         sequenceGeneratorService.initSequence('Bar', null, null, 50, 'B%d')
 
@@ -170,19 +170,19 @@ class SequenceServiceTests extends GroovyTestCase {
         assert bar.number == 55L
     }
 
-    def testClassArgument() {
+    void testClassArgument() {
         sequenceGeneratorService.initSequence(SequenceTestEntity, null, null, 1000, '%05d')
         assertEquals "01000", sequenceGeneratorService.nextNumber(SequenceTestEntity)
         assertEquals "01001", sequenceGeneratorService.nextNumber(SequenceTestEntity)
         assertEquals "01002", sequenceGeneratorService.nextNumber(SequenceTestEntity)
     }
 
-    def testStartWithZero() {
+    void testStartWithZero() {
         sequenceGeneratorService.initSequence("Zero", null, null, 0)
         assertEquals "0", sequenceGeneratorService.nextNumber("Zero")
     }
 
-    def testMultiTenant() {
+    void testMultiTenant() {
         sequenceGeneratorService.initSequence("TenantTest", null, 0, 100)
         sequenceGeneratorService.initSequence("TenantTest", null, 1, 100)
         sequenceGeneratorService.initSequence("TenantTest", null, 2, 200)
@@ -204,7 +204,7 @@ class SequenceServiceTests extends GroovyTestCase {
         new ObjectName(grailsApplication.metadata.getApplicationName() + ':name=SequenceGeneratorService,type=services')
     }
 
-    def testMBean() {
+    void testMBean() {
         sequenceGeneratorService.initSequence(SequenceTestEntity, null, null, 1001, '%04d')
         assertEquals "1001", new SequenceTestEntity().getNextSequenceNumber()
         assertEquals "1002", new SequenceTestEntity().getNextSequenceNumber()