updated to grails 2.1.x+

DroolsGormGrailsPlugin.groovy

@@ -2,15 +2,13 @@ import grails.util.Environment;
 
 class DroolsGormGrailsPlugin {
     // the plugin version
-    def version = "0.5.6"
+    def version = "0.5.7"
     // the version or versions of Grails the plugin is designed for
-    def grailsVersion = "1.3.4 > *"
+    def grailsVersion = "2.1.3 > *"
     // the other plugins this plugin depends on
     def dependsOn = [:]
     // resources that are excluded from plugin packaging
-    def pluginExcludes = (Environment.current != Environment.TEST) ? 
-            [ "grails-app/views/error.gsp", "grails-app/domain/org/drools/gorm/test/DroolsTest.groovy" ] :
-            [ "grails-app/views/error.gsp"]
+    def pluginExcludes = [ "grails-app/views/error.gsp", "grails-app/domain/org/drools/gorm/test/DroolsTest.groovy" ] 
 
     def author = "Pablo 'bauna' Nussembaum, Diego López León"
     def authorEmail = "[email protected], [email protected]"

application.properties

@@ -1,6 +1,6 @@
 #Grails Metadata file
-#Mon Nov 01 15:46:09 ART 2010
-app.grails.version=1.3.5
+#Wed Mar 13 14:41:18 PDT 2013
+app.grails.version=2.1.3
 app.name=drools-gorm
-plugins.hibernate=1.3.5
-plugins.tomcat=1.3.5
+plugins.hibernate=2.1.3
+plugins.tomcat=2.1.3

grails-app/conf/BuildConfig.groovy

@@ -6,7 +6,7 @@ grails.project.dependency.resolution = {
     // inherit Grails' default dependencies
     inherits("global") {
         // uncomment to disable ehcache
-        // excludes 'ehcache'
+        excludes 'dbcp', "xml-apis", "commons-digester", "ehcache", 'hibernate-annotations'
     }
     log "warn" // log level of Ivy resolver, either 'error', 'warn', 'info', 'debug' or 'verbose'
     repositories {

grails-app/conf/Config.groovy

@@ -22,3 +22,5 @@ log4j = {
 
     warn   'org.mortbay.log'
 }
+grails.views.default.codec="none" // none, html, base64
+grails.views.gsp.encoding="UTF-8"

grails-app/domain/org/drools/gorm/session/ProcessInstanceInfoDomain.groovy

@@ -111,13 +111,13 @@ class ProcessInstanceInfoDomain implements ProcessInstanceInfo {
 
     def beforeInsert() {
         this.lastModificationDate = new Date()
-        Set updates = env.get(GORM_UPDATE_SET);
+        Set updates = env.get(org.drools.gorm.session.HasBlob.GORM_UPDATE_SET);
         updates.add(this)
     }
 
     def beforeUpdate() {
         this.lastModificationDate = new Date()
-        Set updates = env.get(GORM_UPDATE_SET);
+        Set updates = env.get(org.drools.gorm.session.HasBlob.GORM_UPDATE_SET);
         updates.add(this)
     }
 

grails-app/domain/org/drools/gorm/session/SessionInfoDomain.groovy

@@ -57,12 +57,12 @@ class SessionInfoDomain implements SessionInfo {
 
     def beforeInsert() {
         this.lastModificationDate = new Date()
-        Set updates = env.get(GORM_UPDATE_SET);
+        Set updates = env.get(org.drools.gorm.session.HasBlob.GORM_UPDATE_SET);
         updates.add(this)
     }
 
     def beforeUpdate() {
-        Set updates = env.get(GORM_UPDATE_SET);
+        Set updates = env.get(org.drools.gorm.session.HasBlob.GORM_UPDATE_SET);
         updates.add(this)
     }
 

grails-app/domain/org/drools/gorm/session/WorkItemInfoDomain.groovy

@@ -129,12 +129,12 @@ public class WorkItemInfoDomain implements WorkItemInfo {
     }
 
     def beforeInsert() {
-        Set updates = env.get(GORM_UPDATE_SET);
+        Set updates = env.get(org.drools.gorm.session.HasBlob.GORM_UPDATE_SET);
         updates.add(this)
     }
 
     def beforeUpdate() {
-        Set updates = env.get(GORM_UPDATE_SET);
+        Set updates = env.get(org.drools.gorm.session.HasBlob.GORM_UPDATE_SET);
         updates.add(this)
     }
 

grails-app/services/org/drools/gorm/GormDomainService.groovy

@@ -28,7 +28,9 @@ class GormDomainService {
     }
 
     def SessionInfo getNewSessionInfo(Environment env) {
-        return new SessionInfoDomain(env: env)
+        def sess = new SessionInfoDomain()
+        sess.env = env
+        return sess
     }
 
     // ProcessInstanceInfo --------------------------
@@ -40,12 +42,12 @@ class GormDomainService {
         return pii
     }
 
-    def ProcessInstanceInfo getNewProcessInstanceInfo(ProcessInstance processInstance, Environment env) {
-        def pii = new ProcessInstanceInfoDomain(
-            processInstance: processInstance, 
-            processId: processInstance.getProcessId(), 
-            startDate: new Date(),
-            env: env)
+    def ProcessInstanceInfo getNewProcessInstanceInfo(ProcessInstance processInstance, Environment env) {        
+        def pii = new ProcessInstanceInfoDomain()
+        pii.processInstance = processInstance
+        pii.processId = processInstance.getProcessId()
+        pii.startDate = new Date()
+        pii.env = env
         pii.save(flush: true)
         return pii
     }
@@ -66,10 +68,11 @@ class GormDomainService {
     }
 
     def ProcessInstanceEventInfo getNewProcessInstanceEventInfo(long processInstanceId,
-            String eventType) {
-        return new ProcessInstanceEventInfoDomain(
-            processInstanceId: processInstanceId,
-            eventType: eventType)
+            String eventType) {            
+        def pied = new ProcessInstanceEventInfoDomain()
+        pied.processInstanceId = processInstanceId
+        pied.eventType = eventType
+        return pied
     }
 
     // WorkItemInfo --------------------------
@@ -85,7 +88,7 @@ class GormDomainService {
     def saveDomain(domainObject) {
         if(!domainObject.save(flush: true)) {
             throw new IllegalArgumentException("Object of '${domainObject.class.simpleName}' couldn't be saved because of validation errors: "+ domainObject.errors.toString())
-        }     	 
+        }        
     }
 
     def deleteDomain(domainObject) {

src/groovy/org/drools/gorm/GrailsIntegration.groovy

@@ -2,18 +2,19 @@ package org.drools.gorm
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.transaction.PlatformTransactionManager
-import org.codehaus.groovy.grails.commons.ApplicationHolder
 import org.codehaus.groovy.grails.commons.GrailsApplication
 import org.codehaus.groovy.grails.commons.GrailsClassUtils
 import org.drools.runtime.process.WorkItemHandler
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.apache.commons.lang.WordUtils
+import org.drools.gorm.session.SessionInfoDomain
+
 
 public class GrailsIntegration {
 
 	static GrailsApplication getGrailsApplication() {
-		return ApplicationHolder.application
+            return new SessionInfoDomain().domainClass.grailsApplication
 	}
 
 	static ApplicationContext getMainContext() {

web-app/WEB-INF/applicationContext.xml

@@ -4,39 +4,30 @@
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-	<bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
-		<description>Grails application factory bean</description>
-        <property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
-        <property name="grailsResourceLoader" ref="grailsResourceLoader" />
-	</bean>
+  <bean id="grailsApplication" class="org.codehaus.groovy.grails.commons.GrailsApplicationFactoryBean">
+    <description>Grails application factory bean</description>
+    <property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
+    <property name="grailsResourceLoader" ref="grailsResourceLoader" />
+  </bean>
 
-	<bean id="pluginManager" class="org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean">
-		<description>A bean that manages Grails plugins</description>
-        <property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
-        <property name="application" ref="grailsApplication" />
-	</bean>
+  <bean id="pluginManager" class="org.codehaus.groovy.grails.plugins.GrailsPluginManagerFactoryBean">
+    <description>A bean that manages Grails plugins</description>
+    <property name="grailsDescriptor" value="/WEB-INF/grails.xml" />
+    <property name="application" ref="grailsApplication" />
+  </bean>
 
-    <bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator">
-        <constructor-arg>
-            <ref bean="grailsApplication" />
-        </constructor-arg>
-        <property name="pluginManager" ref="pluginManager" />
-    </bean>
+  <bean id="grailsConfigurator" class="org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator">
+    <constructor-arg>
+      <ref bean="grailsApplication" />
+    </constructor-arg>
+    <property name="pluginManager" ref="pluginManager" />
+  </bean>
 
-    <bean id="grailsResourceLoader" class="org.codehaus.groovy.grails.commons.GrailsResourceLoaderFactoryBean">
-        <property name="grailsResourceHolder" ref="grailsResourceHolder" />
-    </bean>
+  <bean id="grailsResourceLoader" class="org.codehaus.groovy.grails.commons.GrailsResourceLoaderFactoryBean" />
 
-    <bean id="grailsResourceHolder" scope="prototype" class="org.codehaus.groovy.grails.commons.spring.GrailsResourceHolder">
-        <property name="resources">
-              <value>classpath*:**/grails-app/**/*.groovy</value>
-        </property>
-    </bean>    
-
-   <bean id="characterEncodingFilter"
-      class="org.springframework.web.filter.CharacterEncodingFilter">
-        <property name="encoding">
-          <value>utf-8</value>
-        </property>
-   </bean>    	
+  <bean id="characterEncodingFilter" class="org.springframework.web.filter.CharacterEncodingFilter">
+    <property name="encoding">
+      <value>utf-8</value>
+    </property>
+  </bean>
 </beans>

web-app/WEB-INF/sitemesh.xml

@@ -5,7 +5,7 @@
         <parser content-type="text/html;charset=ISO-8859-1"
             class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
         <parser content-type="text/html;charset=UTF-8"
-            class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />            
+            class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />
     </page-parsers>
 
     <decorator-mappers>