Merge pull request #47 from bsinno/fix-vaadin-productionmode

confirmed, ok merging
bosch-io · Feb 19, 2016 · 1ede39f · 1ede39f
2 parents 878af52 + 6b143d6
commit 1ede39f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/examples/hawkbit-example-app/src/main/resources/application.properties b/examples/hawkbit-example-app/src/main/resources/application.properties
@@ -15,8 +15,8 @@ hawkbit.server.controller.security.authentication.gatewaytoken.enabled=false
 
 spring.profiles.active=amqp
 
-vaadin.servlet.params.productionMode=false
-vaadin.static.servlet.params.productionMode=false
+vaadin.servlet.productionMode=false
+vaadin.static.servlet.productionMode=false
 
 ## Configuration for RabbitMQ integration
 hawkbit.server.amqp.username=guest

diff --git a/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties b/hawkbit-autoconfigure/src/main/resources/hawkbitdefaults.properties
@@ -29,10 +29,10 @@ flyway.initOnMigrate=true
 flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
 
 # Vaadin Servlet
-vaadin.static.servlet.params.resourceCacheTime=${spring.resources.cache-period}
-vaadin.static.servlet.params.productionMode=true
-vaadin.servlet.params.productionMode=true
-vaadin.servlet.params.resourceCacheTime=${spring.resources.cache-period}
+vaadin.static.servlet.resourceCacheTime=${spring.resources.cache-period}
+vaadin.static.servlet.productionMode=true
+vaadin.servlet.productionMode=true
+vaadin.servlet.resourceCacheTime=${spring.resources.cache-period}
 vaadin.servlet.urlMapping=/UI/*
 vaadin.servlet.params.heartbeatInterval=60
 vaadin.servlet.params.closeIdleSessions=false