Skip to content

Commit 07c3a22

Browse files
authored
Merge pull request #398 from mycontroller-org/development
Version 1.0.0.Final
2 parents e8afb02 + 902d21f commit 07c3a22

File tree

724 files changed

+24518
-5093
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

724 files changed

+24518
-5093
lines changed

README.adoc

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ MyController.org supports multiple languages. If you have interest to add/transl
2929

3030
MyController.org is a very lightweight server, It required very less resource, believe me ;)
3131

32-
* Disk : ~30 MB (may require more space, when we store metrics data for long time)
33-
* Memory(RAM) : 100 MB
32+
* Disk : ~100 MB (may require more space, when we store metrics data for long time)
33+
* Memory(RAM) : 256 MB
3434
* Java : 1.8 or later
3535

3636
===== Supported Platforms (tested)
3737
MyController.org is java based application server. We can run it in any platform where Java support is available.
3838

3939
- Linux
4040
- Windows
41+
- Orange PI
4142
- Raspberry PI (Oracle Java recommend)
4243

4344
== MyController and MySensors Setup
@@ -128,5 +129,5 @@ Executable scripts are located in `mycontroller/bin/`
128129
* Other Platforms
129130

130131
```
131-
java -Xms8m -Xmx100m -Dlogback.configurationFile=../conf/logback.xml -Dmc.conf.file=../conf/mycontroller.properties -cp "../lib/*" org.mycontroller.standalone.StartApp
132+
java -Xms8m -Xmx256m -Dlogback.configurationFile=../conf/logback.xml -Dmc.conf.file=../conf/mycontroller.properties -cp "../lib/*" org.mycontroller.standalone.StartApp
132133
```

dist/.tx/config

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ host = https://www.transifex.com
55
source_file = src/main/package/www/languages/mc_locale_gui_source_en.json
66
source_lang = en
77
file_filter = src/main/package/www/languages/mc_locale_gui-<lang>.json
8-
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
8+
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
99

1010
[multi-locale.mc_locale_java]
1111
source_file = src/main/resources/mc_locale/mc_locale_java-source_en.properties

dist/locale_fix.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright 2015-2016 Jeeva Kandasamy ([email protected])
3+
# Copyright 2015-2017 Jeeva Kandasamy ([email protected])
44
# and other contributors as indicated by the @author tags.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");

dist/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright 2015-2016 Jeeva Kandasamy ([email protected])
3+
Copyright 2015-2017 Jeeva Kandasamy ([email protected])
44
and other contributors as indicated by the @author tags.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.mycontroller.standalone</groupId>
2323
<artifactId>mycontroller-standalone-parent</artifactId>
24-
<version>0.0.3.Alpha2</version>
24+
<version>1.0.0.Final</version>
2525
</parent>
2626

2727
<artifactId>mycontroller-dist</artifactId>
@@ -32,6 +32,7 @@
3232
<properties>
3333
<mc.dist.finalName>${project.artifactId}-standalone-${project.version}</mc.dist.finalName>
3434
<mc.dist.jar.finalName>${mc.dist.finalName}-single</mc.dist.jar.finalName>
35+
<mc.gui.version>6</mc.gui.version>
3536
</properties>
3637

3738
<dependencies>

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

+73-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright 2015-2016 Jeeva Kandasamy ([email protected])
3+
Copyright 2015-2017 Jeeva Kandasamy ([email protected])
44
and other contributors as indicated by the @author tags.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
@@ -59,6 +59,78 @@
5959
<outputDirectory>mycontroller/www</outputDirectory>
6060
</fileSet>
6161
</fileSets>
62+
<files>
63+
<file>
64+
<source>src/main/package/www/index.html</source>
65+
<outputDirectory>mycontroller/www/</outputDirectory>
66+
<filtered>true</filtered>
67+
</file>
68+
<file>
69+
<source>src/main/package/www/app.js</source>
70+
<outputDirectory>mycontroller/www/</outputDirectory>
71+
<filtered>true</filtered>
72+
</file>
73+
<file>
74+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-asg/adf-myc-a-sensor-graph.js</source>
75+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-asg/</outputDirectory>
76+
<filtered>true</filtered>
77+
</file>
78+
<file>
79+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-cb/adf-myc-custom-buttons.js</source>
80+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-cb/</outputDirectory>
81+
<filtered>true</filtered>
82+
</file>
83+
<file>
84+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-cw/adf-myc-custom-widget.js</source>
85+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-cw/</outputDirectory>
86+
<filtered>true</filtered>
87+
</file>
88+
<file>
89+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-dsi/adf-myc-display-static-image.js</source>
90+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-dsi/</outputDirectory>
91+
<filtered>true</filtered>
92+
</file>
93+
<file>
94+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-groups/adf-myc-groups.js</source>
95+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-groups/</outputDirectory>
96+
<filtered>true</filtered>
97+
</file>
98+
<file>
99+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-hm/adf-myc-heat-map.js</source>
100+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-hm/</outputDirectory>
101+
<filtered>true</filtered>
102+
</file>
103+
<file>
104+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-sbg/adf-myc-sensors-bullet-graph.js</source>
105+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-sbg/</outputDirectory>
106+
<filtered>true</filtered>
107+
</file>
108+
<file>
109+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-sen-vars/adf-myc-sen-vars.js</source>
110+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-sen-vars/</outputDirectory>
111+
<filtered>true</filtered>
112+
</file>
113+
<file>
114+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-sgg/adf-myc-sensors-grouped-graph.js</source>
115+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-sgg/</outputDirectory>
116+
<filtered>true</filtered>
117+
</file>
118+
<file>
119+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-smg/adf-myc-sensors-mixed-graph.js</source>
120+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-smg/</outputDirectory>
121+
<filtered>true</filtered>
122+
</file>
123+
<file>
124+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-sunrisetime/adf-myc-sunrise.js</source>
125+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-sunrisetime/</outputDirectory>
126+
<filtered>true</filtered>
127+
</file>
128+
<file>
129+
<source>src/main/package/www/controllers/adf-widgets/adf-myc-time/adf-myc-time.js</source>
130+
<outputDirectory>mycontroller/www/controllers/adf-widgets/adf-myc-time/</outputDirectory>
131+
<filtered>true</filtered>
132+
</file>
133+
</files>
62134

63135
<dependencySets>
64136
<dependencySet>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@REM
2-
@REM Copyright 2015-2016 Jeeva Kandasamy ([email protected])
2+
@REM Copyright 2015-2017 Jeeva Kandasamy ([email protected])
33
@REM and other contributors as indicated by the @author tags.
44
@REM
55
@REM Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
1616
@REM
1717

1818
@ECHO OFF
19-
SET HEAP_MIN=-Xms8m
20-
SET HEAP_MAX=-Xmx100m
19+
SET HEAP_MIN=-Xms32m
20+
SET HEAP_MAX=-Xmx256m
2121

2222
SET CONF_PROPERTIES_FILE=../conf/mycontroller.properties
2323
SET CONF_LOG_FILE=../conf/logback.xml

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright 2015-2016 Jeeva Kandasamy ([email protected])
3+
# Copyright 2015-2017 Jeeva Kandasamy ([email protected])
44
# and other contributors as indicated by the @author tags.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,8 +25,8 @@ cd ${ACTUAL_LOCATION}
2525

2626

2727
#Java Heap settings
28-
HEAP_MIN=-Xms8m
29-
HEAP_MAX=-Xmx100m
28+
HEAP_MIN=-Xms32m
29+
HEAP_MAX=-Xmx256m
3030

3131
JAVA_VERSION="1.7"
3232

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright 2015-2016 Jeeva Kandasamy ([email protected])
3+
# Copyright 2015-2017 Jeeva Kandasamy ([email protected])
44
# and other contributors as indicated by the @author tags.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");

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

+11-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright 2015-2016 Jeeva Kandasamy ([email protected])
3+
Copyright 2015-2017 Jeeva Kandasamy ([email protected])
44
and other contributors as indicated by the @author tags.
55
66
Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,9 @@
2121
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
2222
<file>../logs/mycontroller.log</file>
2323
<encoder>
24-
<pattern>%date %level [%thread] [%logger:%line] %msg%n</pattern>
24+
<!-- <pattern>%date %level [%thread] [%logger:%line] %msg%n</pattern> -->
25+
<!-- Replace CR(\r) with string \r and LF(\n) with string \n-->
26+
<pattern>%date %level [%thread] [%logger:%line] %replace(%replace(%msg){'\r', '\\r'}){'\n', '\\n'}%n</pattern>
2527
</encoder>
2628
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
2729
<FileNamePattern>../logs/mycontroller_%i.log.zip</FileNamePattern>
@@ -59,14 +61,20 @@
5961
<logger level="INFO" name="org.mycontroller.standalone.gateway" />
6062
<logger level="INFO" name="org.mycontroller.standalone.gateway.ethernet" />
6163
<logger level="INFO" name="org.mycontroller.standalone.gateway.mqtt" />
64+
<logger level="INFO" name="org.mycontroller.standalone.gateway.phantio" />
6265
<logger level="INFO" name="org.mycontroller.standalone.gateway.serialport" />
6366
<logger level="INFO" name="org.mycontroller.standalone.group" />
6467
<logger level="INFO" name="org.mycontroller.standalone.jobs" />
68+
<logger level="INFO" name="org.mycontroller.standalone.loggers.LoggerMySql" />
6569
<logger level="INFO" name="org.mycontroller.standalone.message" />
6670
<logger level="INFO" name="org.mycontroller.standalone.metrics" />
6771
<logger level="INFO" name="org.mycontroller.standalone.metrics.jobs" />
6872
<logger level="INFO" name="org.mycontroller.standalone.mqttbroker" />
69-
<logger level="INFO" name="org.mycontroller.standalone.mysensors" />
73+
<logger level="INFO" name="org.mycontroller.standalone.provider" />
74+
<logger level="INFO" name="org.mycontroller.standalone.provider.mc" />
75+
<logger level="INFO" name="org.mycontroller.standalone.provider.mysensors" />
76+
<logger level="INFO" name="org.mycontroller.standalone.provider.phantio" />
77+
<logger level="INFO" name="org.mycontroller.standalone.provider.rflink" />
7078
<logger level="INFO" name="org.mycontroller.standalone.restclient" />
7179
<logger level="INFO" name="org.mycontroller.standalone.rule" />
7280
<logger level="INFO" name="org.mycontroller.standalone.scheduler" />

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

+57-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2015-2016 Jeeva Kandasamy ([email protected])
2+
# Copyright 2015-2017 Jeeva Kandasamy ([email protected])
33
# and other contributors as indicated by the @author tags.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,12 +32,48 @@ mcc.tmp.location=tmp/
3232
mcc.resources.location=../conf/resources/
3333

3434
#========================================================================
35-
# Database
36-
# Where do you want to keep your database.
35+
# Database settings
3736
# It is highly recommended to take a backup of this db on upgrade.
38-
# Database: H2DB, location and name, example:/tmp/mycontroller
37+
# MyController only supports database backup for H2DB(only on same host)
38+
# For other databases users has to manage backup and restore of database
39+
# mcc.db.backup.include: Include database backup along with
40+
# MyController backup. Supports only for H2DB on same host.
41+
# If MyController is running on embedded database mode, this parameter
42+
# will be ignored and backup includes database also.
43+
# mcc.db.type: Select database types
44+
# Supported types: H2DB_EMBEDDED, H2DB, MYSQL, POSTGRESQL, MARIADB
3945
#========================================================================
40-
mcc.db.h2db.location=../conf/mycontroller
46+
mcc.db.backup.include=true
47+
48+
#H2DB Embedded settings
49+
mcc.db.type=H2DB_EMBEDDED
50+
mcc.db.url=jdbc:h2:file:../conf/mycontroller;MVCC=TRUE
51+
mcc.db.username=mycontroller
52+
mcc.db.password=mycontroller
53+
54+
# H2DB on TCP settings - Sample
55+
#mcc.db.type=H2DB
56+
#mcc.db.url=jdbc:h2:tcp://localhost//tmp/mycontroller;MVCC=TRUE
57+
#mcc.db.username=mycontroller
58+
#mcc.db.password=mycontroller
59+
60+
# MariaDB settings - Sample
61+
#mcc.db.type=MARIADB
62+
#mcc.db.url=jdbc:mariadb://127.0.0.1:3306/mycontroller
63+
#mcc.db.username=mycontroller
64+
#mcc.db.password=mycontroller
65+
66+
# PostgreSQL settings - Sample
67+
#mcc.db.type=POSTGRESQL
68+
#mcc.db.url=jdbc:postgresql://localhost:5432/mycontroller
69+
#mcc.db.username=mycontroller
70+
#mcc.db.password=mycontroller
71+
72+
# MySQL settings - Sample
73+
#mcc.db.type=MYSQL
74+
#mcc.db.url=jdbc:mysql://localhost:3306/mycontroller
75+
#mcc.db.username=mycontroller
76+
#mcc.db.password=mycontroller
4177

4278
#========================================================================
4379
# Web Application server configuration
@@ -57,9 +93,22 @@ mcc.web.ssl.keystore.password=mycontroller
5793
mcc.web.ssl.keystore.type=JKS
5894

5995
#========================================================================
60-
# Inbuilt MQTT Broker settings
61-
# Refer GUI for more settings, GUI: [Settings >> MQTT broker]
96+
# MyController persistent stores location.
97+
# This store used to keep off-heap data.
98+
# It keeps data like messages queue, MQTT broker data, etc.
99+
# If you want to keep execute old data that not processed on shutdown
100+
# set false on mcc.clear.message.queue.on.start
101+
# If you want to keep smart sleep messages on MyController reboot,
102+
# set false on mcc.clear.smart.sleep.msg.queue.on.start
103+
#========================================================================
104+
mcc.persistent.stores.location=../conf/persistent_stores/
105+
mcc.clear.message.queue.on.start=true
106+
mcc.clear.smart.sleep.msg.queue.on.start=true
107+
108+
#========================================================================
109+
# MyController mDNS service settings
110+
# Enable or disable mDNS service
62111
#========================================================================
63-
mcc.mqtt.broker.persistent.store=../conf/moquette/moquette_store.mapdb
112+
mcc.mdns.service.enable=false
64113

65114
#logger configuration - logback.xml

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

+12-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2016 Jeeva Kandasamy ([email protected])
2+
* Copyright 2015-2017 Jeeva Kandasamy ([email protected])
33
* and other contributors as indicated by the @author tags.
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -532,7 +532,7 @@ input.mc-color-steel-blue{
532532
}
533533

534534
.mc-sensor-variable-detail{
535-
height:75px;
535+
height:80px;
536536
}
537537

538538
.mc-sensor-action-tiles{
@@ -640,6 +640,14 @@ input.mc-color-steel-blue{
640640
}
641641

642642

643+
/* ADF Table widget */
644+
.adf-table > tbody > tr > td{
645+
padding-left: 2px;
646+
padding-right: 5px;
647+
padding-top: 2px;
648+
padding-bottom: 5px;
649+
vertical-align: middle;
650+
}
643651

644652

645653
/* on-off button*/
@@ -808,7 +816,8 @@ kubernetes-topology-icon svg {
808816
}
809817

810818
.tick line {
811-
display: none;
819+
/* When you do not want to display grid line on your charts enable, 'display:none;' */
820+
/* display: none; */
812821
}
813822

814823
.modal-body {

0 commit comments

Comments
 (0)