diff --git a/DroolsGormGrailsPlugin.groovy b/DroolsGormGrailsPlugin.groovy index 6df4c43..44c0273 100644 --- a/DroolsGormGrailsPlugin.groovy +++ b/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 = "baunax@gmail.com, dieguitoll@gmail.com" diff --git a/application.properties b/application.properties index 526cb7e..81f133a 100644 --- a/application.properties +++ b/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 diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index adce621..39c5387 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/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 { diff --git a/grails-app/conf/Config.groovy b/grails-app/conf/Config.groovy index 2e57c6d..d539232 100644 --- a/grails-app/conf/Config.groovy +++ b/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" diff --git a/grails-app/domain/org/drools/gorm/session/ProcessInstanceInfoDomain.groovy b/grails-app/domain/org/drools/gorm/session/ProcessInstanceInfoDomain.groovy index 77aacde..c1f100d 100644 --- a/grails-app/domain/org/drools/gorm/session/ProcessInstanceInfoDomain.groovy +++ b/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) } diff --git a/grails-app/domain/org/drools/gorm/session/SessionInfoDomain.groovy b/grails-app/domain/org/drools/gorm/session/SessionInfoDomain.groovy index 2e7aee1..1dedee3 100644 --- a/grails-app/domain/org/drools/gorm/session/SessionInfoDomain.groovy +++ b/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) } diff --git a/grails-app/domain/org/drools/gorm/session/WorkItemInfoDomain.groovy b/grails-app/domain/org/drools/gorm/session/WorkItemInfoDomain.groovy index 9e6c5cf..7fa235d 100644 --- a/grails-app/domain/org/drools/gorm/session/WorkItemInfoDomain.groovy +++ b/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) } diff --git a/grails-app/services/org/drools/gorm/GormDomainService.groovy b/grails-app/services/org/drools/gorm/GormDomainService.groovy index 5944471..c7bd37a 100644 --- a/grails-app/services/org/drools/gorm/GormDomainService.groovy +++ b/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) { diff --git a/src/groovy/org/drools/gorm/GrailsIntegration.groovy b/src/groovy/org/drools/gorm/GrailsIntegration.groovy index 52ad5e4..346cd28 100644 --- a/src/groovy/org/drools/gorm/GrailsIntegration.groovy +++ b/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() { diff --git a/web-app/WEB-INF/applicationContext.xml b/web-app/WEB-INF/applicationContext.xml index 6f42796..6faa83b 100644 --- a/web-app/WEB-INF/applicationContext.xml +++ b/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"> - - Grails application factory bean - - - + + Grails application factory bean + + + - - A bean that manages Grails plugins - - - + + A bean that manages Grails plugins + + + - - - - - - + + + + + + - - - + - - - classpath*:**/grails-app/**/*.groovy - - - - - - utf-8 - - + + + utf-8 + + \ No newline at end of file diff --git a/web-app/WEB-INF/sitemesh.xml b/web-app/WEB-INF/sitemesh.xml index a547b41..72399ce 100644 --- a/web-app/WEB-INF/sitemesh.xml +++ b/web-app/WEB-INF/sitemesh.xml @@ -5,7 +5,7 @@ + class="org.codehaus.groovy.grails.web.sitemesh.GrailsHTMLPageParser" />