Skip to content

Commit

Permalink
Grails 3 / activiti Workflow working.
Browse files Browse the repository at this point in the history
- upgrade activiti to 5.23.0
  - resources.groovy :
    - in processEngineConfiguration(SpringProcessEngineConfiguration) {
      add databaseSchemaUpdate = true for activiti upgrade
    - in build.gradle use groovy-all version of gradle
      - contains jsr223 script engine
        required to avoid "Can't find scripting engine for 'groovy'"
- fix workflow route camel syntax
  - correct incomplete fix when changeing property to exchangeProperty
    ( was done in 5a8d732 )
    - use ' and ${} with exchangeProperty
    - fix typo echangeProperty to exchangeProperty

- application.groovy changes :
 - reactivead grail.cache.enabled
 - hibernate.flush.mode = COMMIT in one place
 - dbCreate = none ; first database-migration plugin tests
 - System.properties['smarthome.datasource.url'] : not hardcoded even in dev.

- application name is now consoherozh ( settings.gradle rootProject.name )

- reinddented application.groovy to prepare for change to application.yml
- resources.groovy ( unix format )
- updated .ignore
  - build result is in build, not in target anymore.
  • Loading branch information
artlog committed Mar 24, 2022
1 parent c61bd01 commit 53fdbf3
Show file tree
Hide file tree
Showing 12 changed files with 291 additions and 253 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
.settings/
target/
target-eclipse/
build/
.gradle/
.classpath
wrapper/
/bin/
Expand Down
18 changes: 16 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ buildscript {
classpath "org.grails:grails-gradle-plugin:$grailsVersion"
classpath "org.grails.plugins:hibernate5:${gormVersion-".RELEASE"}"
classpath "com.bertramlabs.plugins:asset-pipeline-gradle:2.15.1"
classpath 'org.grails.plugins:database-migration:3.1.0'
}
}

Expand All @@ -25,7 +26,7 @@ apply plugin:"org.grails.grails-gsp"
ext {
camelVersion = "3.7.7"
// 7.1.0.M6
activitiVersion = "5.18.0"
activitiVersion = "5.23.0"
}

repositories {
Expand All @@ -34,6 +35,14 @@ repositories {
mavenCentral()
}

sourceSets {
main {
resources {
srcDir 'grails-app/migrations'
}
}
}

dependencies {
compile "org.springframework.boot:spring-boot-starter-logging"
compile "org.springframework.boot:spring-boot-autoconfigure"
Expand All @@ -59,6 +68,8 @@ dependencies {
runtime "org.hibernate:hibernate-ehcache"
runtime "net.sf.ehcache:ehcache:2.10.9.2"
compile "org.grails.plugins:gsp"
compile 'org.grails.plugins:database-migration:3.1.0'
compile 'org.liquibase:liquibase-core:3.10.1'
compile "com.bertramlabs.plugins:asset-pipeline-grails:2.15.1"
compile "org.aspectj:aspectjrt"
compile "org.aspectj:aspectjweaver"
Expand Down Expand Up @@ -94,6 +105,7 @@ dependencies {
compile 'org.grails.plugins:spring-security-core:3.3.1'
console "org.grails:grails-console"
profile "org.grails.profiles:web"
runtime "org.codehaus.groovy:groovy-all:2.4.21"
runtime 'org.postgresql:postgresql:9.4.1212'
testCompile "org.grails:grails-gorm-testing-support"
testCompile "org.grails.plugins:geb"
Expand All @@ -110,6 +122,7 @@ bootRun {
addResources = true
String springProfilesActive = 'spring.profiles.active'
systemProperty springProfilesActive, System.getProperty(springProfilesActive)
systemProperty "smarthome.datasource.url", System.getProperty("smarthome.datasource.url")
systemProperty "smarthome.datasource.password", System.getProperty("smarthome.datasource.password")
systemProperty "smarthome.config.location", System.getProperty("smarthome.config.location")
systemProperty "smarthome.cluster.serverId", System.getProperty("smarthome.cluster.serverId")
Expand Down Expand Up @@ -146,4 +159,5 @@ grails {

springBoot {
mainClass = 'smarthome.Application'
}
}

2 changes: 1 addition & 1 deletion documentation/fr/connection.compte.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Si le compte n'existe pas pour cette adresse mail ou bien le mot de passe ne cor

#### Création de compte

Si votre compte n'existe pas vous pouvez utliser le bouton vert Créer un compte en bas de l'écran
Si votre compte n'existe pas vous pouvez utiliser le bouton vert Créer un compte en bas de l'écran

[créer un compte](creer.compte.md).

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ classe groovy d'implémentation **smarthome.automation.deviceType.Linky**

### authorization_code

Nécessaire à la première connection pour renregister l'autorisaiton du compte de délégation client via
Nécessaire à la première connection pour enregister l'autorisaiton du compte de délégation client via
cette application auprès d'enedis .

### consumptionLoadCurve
Expand Down
2 changes: 1 addition & 1 deletion documentation/fr/motdepasseoublie.compte.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ En cliquant dessus, vous serez alors redirigé vers une page vous demandant un n

sur la page du site :

Un email pour réinitialiser votre mot de passe vous a été envoyé à l'adresse suivante : [email protected]
Un email pour réinitialiser votre mot de passe vous a été envoyé à l'adresse suivante : <adresse mail>

reception d'un mail :

Expand Down
Loading

0 comments on commit 53fdbf3

Please sign in to comment.