Merge pull request #417 from SCADA-LTS/develop-sdtabilit

v.0.0.9

.gitignore

@@ -77,4 +77,14 @@ seroUtils.jar
 ###########################
 # docker
 ###########################
-docker/app/**
+docker/app/**
+
+###########################
+# intelij
+###########################
+.idea
+
+###########################
+# jrebel
+###########################
+catalina-jrebel.bat

.travis.yml

@@ -1,13 +1,5 @@
 sudo: required
 before_install:
-#- sudo add-apt-repository ppa:openjdk-r/ppa -y
-#- sudo apt-get update
-#- sudo apt-get install -y openjdk-8-jdk
-#- sudo update-alternatives --auto java
-#- sudo update-alternatives --auto javac
-#- export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-#- java -version
-#- javac -version
 - sudo apt-get install tomcat7
 before_script:
 - mysql -e "SET PASSWORD FOR 'root'@'localhost' = PASSWORD('root');"
@@ -40,8 +32,8 @@ jdk:
 services:
 - docker
 - mysql
-#script: ant war && ant junit
-script: ant war
+script: ant war && ant junit
+#script: ant war
 branches:
   only:
   - "/^PROC-.*$/"
@@ -92,6 +84,4 @@ after_script:
 - docker login -u=$DOCKER_USENAME -p=$DOCKER_PASSWORD
 - docker push dockergb/scadalts-dev 
 
-
 #- echo $TRAVIS_BUILD_DIR
-#- sshpa

README.md

@@ -86,14 +86,18 @@ Code base on [ScadaBR](https://sourceforge.net/projects/scadabr/?source=director
 
 * <https://github.com/grzesiekb>
 
-**Konrad Daniek**
-
-* <https://github.com/wisyr>
-
 **Arkadiusz Parafiniuk**
 
 * <https://github.com/ArkadiuszParafiniuk>
 
+**Rafał Kotyla**
+
+* <https://github.com/RandemRafaeL> UI/UX
+
+**Konrad Daniek**
+
+* <https://github.com/wisyr>
+
 **Jarosław Morzyniec**
 
 * <https://github.com/Morzyniec> Testing

WebContent/WEB-INF/classes/env.properties

@@ -66,8 +66,9 @@ abilit.MILLIS_SECONDS_PERIOD_UPDATE_EVENT_DETECTORS=1000
 abilit.MILLIS_SECONDS_PERIOD_UPDATE_PENDING_EVENTS=1000
 abilit.CRONE_UPDATE_CACHE_POINT_HIERARCHY=0 0/10 * * * ?
 
-
-
+# every minute
+abilit.CRONE_UPDATE_DATA_SOURCES_POINTS=0 0/1 * * * ?
+abilit.USE_CACHE_DATA_SOURCES_POINTS_WHEN_THE_SYSTEM_IS_READY=true
 
 #security.hashAlgorithm=NONE
 #grove.url=http://mango.serotoninsoftware.com/servlet