Merge pull request #398 from mycontroller-org/development

Version 1.0.0.Final

README.adoc

@@ -29,15 +29,16 @@ MyController.org supports multiple languages. If you have interest to add/transl
 
 MyController.org is a very lightweight server, It required very less resource, believe me ;)
 
-  * Disk        : ~30 MB (may require more space, when we store metrics data for long time)
-  * Memory(RAM) : 100 MB
+  * Disk        : ~100 MB (may require more space, when we store metrics data for long time)
+  * Memory(RAM) : 256 MB
   * Java        : 1.8 or later
 
 ===== Supported Platforms (tested)
 MyController.org is java based application server. We can run it in any platform where Java support is available.
 
 - Linux
 - Windows
+- Orange PI
 - Raspberry PI (Oracle Java recommend)
 
 == MyController and MySensors Setup
@@ -128,5 +129,5 @@ Executable scripts are located in `mycontroller/bin/`
 * Other Platforms
 
 ```
-java -Xms8m -Xmx100m -Dlogback.configurationFile=../conf/logback.xml -Dmc.conf.file=../conf/mycontroller.properties -cp "../lib/*" org.mycontroller.standalone.StartApp
+java -Xms8m -Xmx256m -Dlogback.configurationFile=../conf/logback.xml -Dmc.conf.file=../conf/mycontroller.properties -cp "../lib/*" org.mycontroller.standalone.StartApp
 ```

dist/.tx/config

@@ -5,7 +5,7 @@ host = https://www.transifex.com
 source_file = src/main/package/www/languages/mc_locale_gui_source_en.json
 source_lang = en
 file_filter = src/main/package/www/languages/mc_locale_gui-<lang>.json
-lang_map = en_US:en_us, de_DE:de_de, ru_RU:ru_ru, ta_IN:ta_in, hi_IN:hi_in, pt_PT:pt_pt, es_AR:es_ar, ca_ES:ca_es, es_ES:es_es, nl_NL:nl_nl, da_DK:da_dk, pt_BR:pt_br, fr_FR:fr_fr, mk_MK:mk_mk, ro_RO:ro_ro
+lang_map = en_US:en_us, de_DE:de_de, ru_RU:ru_ru, ta_IN:ta_in, hi_IN:hi_in, pt_PT:pt_pt, es_AR:es_ar, ca_ES:ca_es, es_ES:es_es, nl_NL:nl_nl, da_DK:da_dk, pt_BR:pt_br, fr_FR:fr_fr, mk_MK:mk_mk, ro_RO:ro_ro, zh_CN:zh_cn, cs_CZ:cs_cz, hu_HU:hu_hu, it_IT:it_it, sk_SK:sk_sk, no_NO:no_no, he_IL:he_il, el_GR:el_gr
 
 [multi-locale.mc_locale_java]
 source_file = src/main/resources/mc_locale/mc_locale_java-source_en.properties

dist/locale_fix.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+# Copyright 2015-2017 Jeeva Kandasamy ([email protected])
 # and other contributors as indicated by the @author tags.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

dist/pom.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+    Copyright 2015-2017 Jeeva Kandasamy ([email protected])
     and other contributors as indicated by the @author tags.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.mycontroller.standalone</groupId>
     <artifactId>mycontroller-standalone-parent</artifactId>
-    <version>0.0.3.Alpha2</version>
+    <version>1.0.0.Final</version>
   </parent>
 
   <artifactId>mycontroller-dist</artifactId>
@@ -32,6 +32,7 @@
   <properties>
     <mc.dist.finalName>${project.artifactId}-standalone-${project.version}</mc.dist.finalName>
     <mc.dist.jar.finalName>${mc.dist.finalName}-single</mc.dist.jar.finalName>
+    <mc.gui.version>6</mc.gui.version>
   </properties>
 
   <dependencies>

dist/src/main/assembly/binary-deployment.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+    Copyright 2015-2017 Jeeva Kandasamy ([email protected])
     and other contributors as indicated by the @author tags.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,6 +59,78 @@
       <outputDirectory>mycontroller/www</outputDirectory>
     </fileSet>
   </fileSets>
+  <files>
+    <file>
+      <source>src/main/package/www/index.html</source>
+      <outputDirectory>mycontroller/www/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/app.js</source>
+      <outputDirectory>mycontroller/www/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-asg/adf-myc-a-sensor-graph.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-asg/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-cb/adf-myc-custom-buttons.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-cb/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-cw/adf-myc-custom-widget.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-cw/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-dsi/adf-myc-display-static-image.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-dsi/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-groups/adf-myc-groups.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-groups/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-hm/adf-myc-heat-map.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-hm/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-sbg/adf-myc-sensors-bullet-graph.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-sbg/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-sen-vars/adf-myc-sen-vars.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-sen-vars/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-sgg/adf-myc-sensors-grouped-graph.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-sgg/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-smg/adf-myc-sensors-mixed-graph.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-smg/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/adf-myc-sunrise.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-sunrisetime/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>src/main/package/www/controllers/adf-widgets/adf-myc-time/adf-myc-time.js</source>
+      <outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-time/</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+  </files>
 
   <dependencySets>
     <dependencySet>

dist/src/main/package/bin/start.bat

@@ -1,5 +1,5 @@
 @REM
-@REM Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+@REM Copyright 2015-2017 Jeeva Kandasamy ([email protected])
 @REM and other contributors as indicated by the @author tags.
 @REM
 @REM Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 @REM
 
 @ECHO OFF
-SET HEAP_MIN=-Xms8m
-SET HEAP_MAX=-Xmx100m
+SET HEAP_MIN=-Xms32m
+SET HEAP_MAX=-Xmx256m
 
 SET CONF_PROPERTIES_FILE=../conf/mycontroller.properties
 SET CONF_LOG_FILE=../conf/logback.xml

dist/src/main/package/bin/start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+# Copyright 2015-2017 Jeeva Kandasamy ([email protected])
 # and other contributors as indicated by the @author tags.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,8 +25,8 @@ cd ${ACTUAL_LOCATION}
 
 
 #Java Heap settings
-HEAP_MIN=-Xms8m
-HEAP_MAX=-Xmx100m
+HEAP_MIN=-Xms32m
+HEAP_MAX=-Xmx256m
 
 JAVA_VERSION="1.7"
 

dist/src/main/package/bin/stop.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+# Copyright 2015-2017 Jeeva Kandasamy ([email protected])
 # and other contributors as indicated by the @author tags.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

dist/src/main/package/conf/logback.xml

@@ -1,6 +1,6 @@
 <!--
 
-    Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+    Copyright 2015-2017 Jeeva Kandasamy ([email protected])
     and other contributors as indicated by the @author tags.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,9 @@
   <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
     <file>../logs/mycontroller.log</file>
     <encoder>
-      <pattern>%date %level [%thread] [%logger:%line] %msg%n</pattern>
+      <!-- <pattern>%date %level [%thread] [%logger:%line] %msg%n</pattern> -->
+      <!-- Replace CR(\r) with string \r and LF(\n) with string \n-->
+      <pattern>%date %level [%thread] [%logger:%line] %replace(%replace(%msg){'\r', '\\r'}){'\n', '\\n'}%n</pattern>
     </encoder>
     <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
       <FileNamePattern>../logs/mycontroller_%i.log.zip</FileNamePattern>
@@ -59,14 +61,20 @@
   <logger level="INFO" name="org.mycontroller.standalone.gateway" />
   <logger level="INFO" name="org.mycontroller.standalone.gateway.ethernet" />
   <logger level="INFO" name="org.mycontroller.standalone.gateway.mqtt" />
+  <logger level="INFO" name="org.mycontroller.standalone.gateway.phantio" />
   <logger level="INFO" name="org.mycontroller.standalone.gateway.serialport" />
   <logger level="INFO" name="org.mycontroller.standalone.group" />
   <logger level="INFO" name="org.mycontroller.standalone.jobs" />
+  <logger level="INFO" name="org.mycontroller.standalone.loggers.LoggerMySql" />
   <logger level="INFO" name="org.mycontroller.standalone.message" />
   <logger level="INFO" name="org.mycontroller.standalone.metrics" />
   <logger level="INFO" name="org.mycontroller.standalone.metrics.jobs" />
   <logger level="INFO" name="org.mycontroller.standalone.mqttbroker" />
-  <logger level="INFO" name="org.mycontroller.standalone.mysensors" />
+  <logger level="INFO" name="org.mycontroller.standalone.provider" />
+  <logger level="INFO" name="org.mycontroller.standalone.provider.mc" />
+  <logger level="INFO" name="org.mycontroller.standalone.provider.mysensors" />
+  <logger level="INFO" name="org.mycontroller.standalone.provider.phantio" />
+  <logger level="INFO" name="org.mycontroller.standalone.provider.rflink" />
   <logger level="INFO" name="org.mycontroller.standalone.restclient" />
   <logger level="INFO" name="org.mycontroller.standalone.rule" />
   <logger level="INFO" name="org.mycontroller.standalone.scheduler" />

dist/src/main/package/conf/mycontroller.properties

@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+# Copyright 2015-2017 Jeeva Kandasamy ([email protected])
 # and other contributors as indicated by the @author tags.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,12 +32,48 @@ mcc.tmp.location=tmp/
 mcc.resources.location=../conf/resources/
 
 #========================================================================
-# Database
-# Where do you want to keep your database.
+# Database settings
 # It is highly recommended  to take a backup of this db on upgrade.
-# Database: H2DB, location and name, example:/tmp/mycontroller
+# MyController only supports database backup for H2DB(only on same host)
+# For other databases users has to manage backup and restore of database
+# mcc.db.backup.include: Include database backup along with
+# MyController backup. Supports only for H2DB on same host.
+# If MyController is running on embedded database mode, this parameter
+# will be ignored and backup includes database also.
+# mcc.db.type: Select database types
+# Supported types: H2DB_EMBEDDED, H2DB, MYSQL, POSTGRESQL, MARIADB
 #========================================================================
-mcc.db.h2db.location=../conf/mycontroller
+mcc.db.backup.include=true
+
+#H2DB Embedded settings
+mcc.db.type=H2DB_EMBEDDED
+mcc.db.url=jdbc:h2:file:../conf/mycontroller;MVCC=TRUE
+mcc.db.username=mycontroller
+mcc.db.password=mycontroller
+
+# H2DB on TCP settings - Sample
+#mcc.db.type=H2DB
+#mcc.db.url=jdbc:h2:tcp://localhost//tmp/mycontroller;MVCC=TRUE
+#mcc.db.username=mycontroller
+#mcc.db.password=mycontroller
+
+# MariaDB settings - Sample
+#mcc.db.type=MARIADB
+#mcc.db.url=jdbc:mariadb://127.0.0.1:3306/mycontroller
+#mcc.db.username=mycontroller
+#mcc.db.password=mycontroller
+
+# PostgreSQL settings - Sample
+#mcc.db.type=POSTGRESQL
+#mcc.db.url=jdbc:postgresql://localhost:5432/mycontroller
+#mcc.db.username=mycontroller
+#mcc.db.password=mycontroller
+
+# MySQL settings - Sample
+#mcc.db.type=MYSQL
+#mcc.db.url=jdbc:mysql://localhost:3306/mycontroller
+#mcc.db.username=mycontroller
+#mcc.db.password=mycontroller
 
 #========================================================================
 # Web Application server configuration
@@ -57,9 +93,22 @@ mcc.web.ssl.keystore.password=mycontroller
 mcc.web.ssl.keystore.type=JKS
 
 #========================================================================
-# Inbuilt MQTT Broker settings
-# Refer GUI for more settings, GUI: [Settings >> MQTT broker]
+# MyController persistent stores location.
+# This store used to keep off-heap data.
+# It keeps data like messages queue, MQTT broker data, etc.
+# If you want to keep execute old data that not processed on shutdown
+# set false on mcc.clear.message.queue.on.start
+# If you want to keep smart sleep messages on MyController reboot,
+# set false on mcc.clear.smart.sleep.msg.queue.on.start
+#========================================================================
+mcc.persistent.stores.location=../conf/persistent_stores/
+mcc.clear.message.queue.on.start=true
+mcc.clear.smart.sleep.msg.queue.on.start=true
+
+#========================================================================
+# MyController mDNS service settings
+# Enable or disable mDNS service
 #========================================================================
-mcc.mqtt.broker.persistent.store=../conf/moquette/moquette_store.mapdb
+mcc.mdns.service.enable=false
 
 #logger configuration - logback.xml

dist/src/main/package/www/app.css

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2016 Jeeva Kandasamy ([email protected])
+ * Copyright 2015-2017 Jeeva Kandasamy ([email protected])
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -532,7 +532,7 @@ input.mc-color-steel-blue{
 }
 
 .mc-sensor-variable-detail{
-  height:75px;
+  height:80px;
 }
 
 .mc-sensor-action-tiles{
@@ -640,6 +640,14 @@ input.mc-color-steel-blue{
 }
 
 
+/* ADF Table widget */
+.adf-table > tbody > tr > td{
+  padding-left: 2px;
+  padding-right: 5px;
+  padding-top: 2px;
+  padding-bottom: 5px;
+  vertical-align: middle;
+}
 
 
 /* on-off button*/
@@ -808,7 +816,8 @@ kubernetes-topology-icon svg {
 }
 
 .tick line {
-  display: none;
+  /* When you do not want to display grid line on your charts enable, 'display:none;' */
+  /* display: none; */
 }
 
 .modal-body {