Merge pull request #172 from bsinno/fix_actionlogentry_add_mysql_profile

Fix actionlogentry add mysql profile

examples/hawkbit-device-simulator/src/main/java/org/eclipse/hawkbit/simulator/DeviceSimulatorUpdater.java

@@ -118,9 +118,6 @@ public class DeviceSimulatorUpdater {
     }
 
     private static final class DeviceSimulatorUpdateThread implements Runnable {
-        /**
-         * 
-         */
         private static final int MINIMUM_TOKENLENGTH_FOR_HINT = 6;
 
         private static final Random rndSleep = new SecureRandom();

examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyLoginUI.java

@@ -20,11 +20,11 @@ import com.vaadin.spring.annotation.SpringUI;
  * login path. The easiest way to get an hawkBit login UI running is to extend
  * the {@link HawkbitLoginUI} and to annotated it with {@link SpringUI} as in
  * this example to the defined {@link HawkbitTheme#LOGIN_UI_PATH}.
- * 
- *
- *
  */
 @SpringUI(path = HawkbitTheme.LOGIN_UI_PATH)
+// Exception squid:MaximumInheritanceDepth - Most of the inheritance comes from
+// Vaadin.
+@SuppressWarnings({ "squid:MaximumInheritanceDepth" })
 public class MyLoginUI extends HawkbitLoginUI {
 
     private static final long serialVersionUID = 1L;

examples/hawkbit-example-app/src/main/java/org/eclipse/hawkbit/app/MyUI.java

@@ -29,6 +29,9 @@ import com.vaadin.spring.annotation.SpringUI;
  */
 @SpringUI
 @Push(value = PushMode.AUTOMATIC, transport = Transport.WEBSOCKET)
+// Exception squid:MaximumInheritanceDepth - Most of the inheritance comes from
+// Vaadin.
+@SuppressWarnings({ "squid:MaximumInheritanceDepth" })
 public class MyUI extends HawkbitUI {
 
     private static final long serialVersionUID = 1L;

examples/hawkbit-example-app/src/main/resources/application-mysql.properties

@@ -0,0 +1,32 @@
+#
+# Copyright (c) 2015 Bosch Software Innovations GmbH and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+
+# This profile adds basic configurations for a MySQL DB usage. 
+# Keep in mind that you need the MariaDB driver in your classpath on compile.
+# see https://github.com/eclipse/hawkbit/wiki/Run-hawkBit
+
+spring.jpa.database=MYSQL
+spring.datasource.url=jdbc:mysql://localhost:3306/hawkbit
+spring.datasource.username=root
+spring.datasource.password=
+spring.datasource.driverClassName=org.mariadb.jdbc.Driver
+
+spring.datasource.max-active=100
+spring.datasource.max-idle=10
+spring.datasource.min-idle=10
+spring.datasource.initial-size=10
+spring.datasource.validation-query=select 1 from dual
+spring.datasource.validation-interval=30000
+spring.datasource.test-on-borrow=true
+spring.datasource.test-on-return=false
+spring.datasource.test-while-idle=true
+spring.datasource.time-between-eviction-runs-millis=30000
+spring.datasource.min-evictable-idle-time-millis=60000
+spring.datasource.max-wait=10000
+spring.datasource.jmx-enabled=true

hawkbit-rest-resource/src/main/java/org/eclipse/hawkbit/controller/RootController.java

@@ -318,8 +318,8 @@ public class RootController {
 
             LOG.debug("Found an active UpdateAction for target {}. returning deyploment: {}", targetid, base);
 
-            controllerManagement.registerRetrieved(action,
-                    "Controller retrieved update action and should start now the download.");
+            controllerManagement.registerRetrieved(action, ControllerManagement.SERVER_MESSAGE_PREFIX
+                    + "Target retrieved update action and should start now the download.");
 
             return new ResponseEntity<>(base, HttpStatus.OK);
         }
@@ -497,8 +497,8 @@ public class RootController {
 
             LOG.debug("Found an active CancelAction for target {}. returning cancel: {}", targetid, cancel);
 
-            controllerManagement.registerRetrieved(action,
-                    "Controller retrieved cancel action and should start now the cancelation.");
+            controllerManagement.registerRetrieved(action, ControllerManagement.SERVER_MESSAGE_PREFIX
+                    + "Target retrieved cancel action and should start now the cancelation.");
 
             return new ResponseEntity<>(cancel, HttpStatus.OK);
         }