From 878af52bc21a801a35a554fd23d4b484242a4d82 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Thu, 18 Feb 2016 12:13:48 +0100 Subject: [PATCH 1/2] Add sonar_lock to git ignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index dad7bec10..ba9cf4617 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,11 @@ *.jar *.war +###################### +# Sonar +###################### +.sonar_lock + # Eclipse IDE *.pydevproject From 6b143d6016862829283bbbed48dd7fded178a358 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Fri, 19 Feb 2016 16:30:38 +0100 Subject: [PATCH 2/2] Fixed production mode path --- .../src/main/resources/application.properties | 4 ++-- .../src/main/resources/hawkbitdefaults.properties | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/hawkbit-example-app/src/main/resources/application.properties b/examples/hawkbit-example-app/src/main/resources/application.properties index 7149dbb9c..13ceca40a 100644 --- 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 index 4020d0cdd..09ae37f90 100644 --- 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