lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into Rollout_migrate_table_to_grid

Browse Source
This commit is contained in:
asharani-murugesh
2016-02-22 15:50:18 +01:00
parent 64d7a7b250 1ede39fb45
commit d0376aeafc
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -16,6 +16,11 @@
*.jar *.jar
*.war *.war
######################
# Sonar
######################
.sonar_lock
# Eclipse IDE # Eclipse IDE
*.pydevproject *.pydevproject

4
examples/hawkbit-example-app/src/main/resources/application.properties
View File

@@ -15,8 +15,8 @@ hawkbit.server.controller.security.authentication.gatewaytoken.enabled=false
spring.profiles.active=amqp spring.profiles.active=amqp
vaadin.servlet.params.productionMode=false vaadin.servlet.productionMode=false
vaadin.static.servlet.params.productionMode=false vaadin.static.servlet.productionMode=false
## Configuration for RabbitMQ integration ## Configuration for RabbitMQ integration
hawkbit.server.amqp.username=guest hawkbit.server.amqp.username=guest

8
hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties
View File

@@ -29,10 +29,10 @@ flyway.initOnMigrate=true
flyway.sqlMigrationSuffix=${spring.jpa.database}.sql flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
# Vaadin Servlet # Vaadin Servlet
vaadin.static.servlet.params.resourceCacheTime=${spring.resources.cache-period} vaadin.static.servlet.resourceCacheTime=${spring.resources.cache-period}
vaadin.static.servlet.params.productionMode=true vaadin.static.servlet.productionMode=true
vaadin.servlet.params.productionMode=true vaadin.servlet.productionMode=true
vaadin.servlet.params.resourceCacheTime=${spring.resources.cache-period} vaadin.servlet.resourceCacheTime=${spring.resources.cache-period}
vaadin.servlet.urlMapping=/UI/* vaadin.servlet.urlMapping=/UI/*
vaadin.servlet.params.heartbeatInterval=60 vaadin.servlet.params.heartbeatInterval=60
vaadin.servlet.params.closeIdleSessions=false vaadin.servlet.params.closeIdleSessions=false