diff --git a/configuration.gradle b/configuration.gradle index 866fd57e..e7474b8e 100644 --- a/configuration.gradle +++ b/configuration.gradle @@ -71,12 +71,12 @@ configure(javaProjects) { task updateBundles(type:Exec) { dependsOn(distributionProjects.install) - commandLine "./framework/bin/openmuc", "update-bundles" + commandLine "./framework/bin/openmuc", "update-bundles" } tasks.withType(Tar) { - dependsOn(updateBundles) +// dependsOn(updateBundles) into(project.name) { diff --git a/demo/framework/README.txt b/demo/framework/README.txt deleted file mode 100644 index 93c2bd22..00000000 --- a/demo/framework/README.txt +++ /dev/null @@ -1,5 +0,0 @@ - -To start the demo execute run-openmuc.sh (Linux,Unix) or run-openmuc.bat (Windows, you have to rename the file) - -For a detailed documentation of this demo visit: http://www.openmuc.org/index.php?id=67 - diff --git a/demo/framework/build.gradle b/demo/framework/build.gradle deleted file mode 100644 index 6dcbb1b6..00000000 --- a/demo/framework/build.gradle +++ /dev/null @@ -1,91 +0,0 @@ - -repositories { - mavenCentral() -} - -configurations.create('osgibundles') -configurations.create('osgimain') -configurations.osgibundles.transitive = false; -configurations.osgimain.transitive = false; - -dependencies { - def openmucversion = '0.15.3' - - osgimain group: 'org.apache.felix', name: 'org.apache.felix.main', version: '5.0.1' - - osgibundles files('../../build/libs-all/openmuc-core-api-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-core-spi-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-core-datamanager-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-datalogger-ascii-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-datalogger-slotsdb-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-driver-aggregator-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-driver-rest-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-webui-spi-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-webui-base-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-webui-channelconfigurator-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-webui-channelaccesstool-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-webui-userconfigurator-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-webui-dataexporter-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-webui-dataplotter-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-webui-mediaviewer-' + openmucversion + '.jar') - osgibundles files('../../build/libs-all/openmuc-server-restws-' + openmucversion + '.jar') - - osgibundles files('../projects/simpledemoapp/build/libs/openmuc-app-simpledemo-' + openmucversion + '.jar') - osgibundles files('../projects/dummydriver/build/libs/openmuc-driver-dummy-' + openmucversion + '.jar') - - //-------------------------------------------------------------------------------------------------- - // The Apache Felix Gogo standard shell for OSGi (http://felix.apache.org/site/apache-felix-gogo.html) - //-------------------------------------------------------------------------------------------------- - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.gogo.runtime', version: '0.16.2' - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.gogo.command', version: '0.14.0' - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.gogo.shell', version: '0.10.0' - - //-------------------------------------------------------------------------------------------------- - // Adds a telnet server so that the Felix Gogo Shell can be accessed - // using telnet clients. By default this server only listens on - // localhost port 6666. Therefor you can on only access it from the - // same host on which felix is running. - //-------------------------------------------------------------------------------------------------- - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.shell.remote', version: '1.1.2' - - //-------------------------------------------------------------------------------------------------- - // message logging libraries, SLF4J is a light-weight logging API, - // Logback is a message logger implementation that implements SLF4J - // natively - //-------------------------------------------------------------------------------------------------- - osgibundles group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12' - osgibundles group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.3' - osgibundles group: 'ch.qos.logback', name: 'logback-core', version: '1.1.3' - - //-------------------------------------------------------------------------------------------------- - // Apache Felix Service Component Runtime that implements the OSGi Declarative Services Specification - // the OpenMUC core bundles use declarative services and thus depend on them - //-------------------------------------------------------------------------------------------------- - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.scr', version: '2.0.0' - - //-------------------------------------------------------------------------------------------------- - // An implementation of the OSGi HTTP Service Specification, needed by the WebUI bundles - //-------------------------------------------------------------------------------------------------- - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.http.servlet-api', version: '1.1.2' - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.http.api', version: '3.0.0' - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.http.jetty', version: '3.0.2' - - //-------------------------------------------------------------------------------------------------- - // Implementations of the OSGi Event Admin, Configuration Admin and MetaType services, needed by jetty - //-------------------------------------------------------------------------------------------------- - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.eventadmin', version: '1.4.4' - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.configadmin', version: '1.8.8' - osgibundles group: 'org.apache.felix', name: 'org.apache.felix.metatype', version: '1.1.0' - -} - -task syncBundles(type: Sync) { - into rootDir.getPath() + "/bundle" - from configurations.osgibundles; -} - -task copyFelixMain(type: Copy) { - from configurations.osgimain; - into rootDir.getPath() + "/felix" - rename (/org.apache.felix.main-.*jar/, 'felix.jar') -} diff --git a/demo/framework/bundle/logback-classic-1.1.3.jar b/demo/framework/bundle/logback-classic-1.1.3.jar deleted file mode 100644 index c5ecdeb5..00000000 Binary files a/demo/framework/bundle/logback-classic-1.1.3.jar and /dev/null differ diff --git a/demo/framework/bundle/logback-core-1.1.3.jar b/demo/framework/bundle/logback-core-1.1.3.jar deleted file mode 100644 index c776e4a0..00000000 Binary files a/demo/framework/bundle/logback-core-1.1.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-app-simpledemo-0.15.3.jar b/demo/framework/bundle/openmuc-app-simpledemo-0.15.3.jar deleted file mode 100644 index 23e3b210..00000000 Binary files a/demo/framework/bundle/openmuc-app-simpledemo-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-core-api-0.15.3.jar b/demo/framework/bundle/openmuc-core-api-0.15.3.jar deleted file mode 100644 index f63602a4..00000000 Binary files a/demo/framework/bundle/openmuc-core-api-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-core-datamanager-0.15.3.jar b/demo/framework/bundle/openmuc-core-datamanager-0.15.3.jar deleted file mode 100644 index 350d7b33..00000000 Binary files a/demo/framework/bundle/openmuc-core-datamanager-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-core-spi-0.15.3.jar b/demo/framework/bundle/openmuc-core-spi-0.15.3.jar deleted file mode 100644 index 5ea6020f..00000000 Binary files a/demo/framework/bundle/openmuc-core-spi-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-datalogger-ascii-0.15.3.jar b/demo/framework/bundle/openmuc-datalogger-ascii-0.15.3.jar deleted file mode 100644 index 88070d73..00000000 Binary files a/demo/framework/bundle/openmuc-datalogger-ascii-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-datalogger-slotsdb-0.15.3.jar b/demo/framework/bundle/openmuc-datalogger-slotsdb-0.15.3.jar deleted file mode 100644 index bf8ab439..00000000 Binary files a/demo/framework/bundle/openmuc-datalogger-slotsdb-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-driver-aggregator-0.15.3.jar b/demo/framework/bundle/openmuc-driver-aggregator-0.15.3.jar deleted file mode 100644 index 21a33590..00000000 Binary files a/demo/framework/bundle/openmuc-driver-aggregator-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-driver-dummy-0.15.3.jar b/demo/framework/bundle/openmuc-driver-dummy-0.15.3.jar deleted file mode 100644 index 133c1b94..00000000 Binary files a/demo/framework/bundle/openmuc-driver-dummy-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-driver-rest-0.15.3.jar b/demo/framework/bundle/openmuc-driver-rest-0.15.3.jar deleted file mode 100644 index 0b09936c..00000000 Binary files a/demo/framework/bundle/openmuc-driver-rest-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-server-restws-0.15.3.jar b/demo/framework/bundle/openmuc-server-restws-0.15.3.jar deleted file mode 100644 index d4ded459..00000000 Binary files a/demo/framework/bundle/openmuc-server-restws-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-webui-base-0.15.3.jar b/demo/framework/bundle/openmuc-webui-base-0.15.3.jar deleted file mode 100644 index a34bcefd..00000000 Binary files a/demo/framework/bundle/openmuc-webui-base-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-webui-channelaccesstool-0.15.3.jar b/demo/framework/bundle/openmuc-webui-channelaccesstool-0.15.3.jar deleted file mode 100644 index d307c366..00000000 Binary files a/demo/framework/bundle/openmuc-webui-channelaccesstool-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-webui-channelconfigurator-0.15.3.jar b/demo/framework/bundle/openmuc-webui-channelconfigurator-0.15.3.jar deleted file mode 100644 index d6e04387..00000000 Binary files a/demo/framework/bundle/openmuc-webui-channelconfigurator-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-webui-dataexporter-0.15.3.jar b/demo/framework/bundle/openmuc-webui-dataexporter-0.15.3.jar deleted file mode 100644 index 121c6def..00000000 Binary files a/demo/framework/bundle/openmuc-webui-dataexporter-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-webui-dataplotter-0.15.3.jar b/demo/framework/bundle/openmuc-webui-dataplotter-0.15.3.jar deleted file mode 100644 index de49ca5d..00000000 Binary files a/demo/framework/bundle/openmuc-webui-dataplotter-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-webui-mediaviewer-0.15.3.jar b/demo/framework/bundle/openmuc-webui-mediaviewer-0.15.3.jar deleted file mode 100644 index c1de4f01..00000000 Binary files a/demo/framework/bundle/openmuc-webui-mediaviewer-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-webui-spi-0.15.3.jar b/demo/framework/bundle/openmuc-webui-spi-0.15.3.jar deleted file mode 100644 index 368d756a..00000000 Binary files a/demo/framework/bundle/openmuc-webui-spi-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/openmuc-webui-userconfigurator-0.15.3.jar b/demo/framework/bundle/openmuc-webui-userconfigurator-0.15.3.jar deleted file mode 100644 index 7fbc12c1..00000000 Binary files a/demo/framework/bundle/openmuc-webui-userconfigurator-0.15.3.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.configadmin-1.8.8.jar b/demo/framework/bundle/org.apache.felix.configadmin-1.8.8.jar deleted file mode 100644 index eb7e633c..00000000 Binary files a/demo/framework/bundle/org.apache.felix.configadmin-1.8.8.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.eventadmin-1.4.4.jar b/demo/framework/bundle/org.apache.felix.eventadmin-1.4.4.jar deleted file mode 100644 index 784a50ac..00000000 Binary files a/demo/framework/bundle/org.apache.felix.eventadmin-1.4.4.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.gogo.command-0.14.0.jar b/demo/framework/bundle/org.apache.felix.gogo.command-0.14.0.jar deleted file mode 100644 index 504f99ba..00000000 Binary files a/demo/framework/bundle/org.apache.felix.gogo.command-0.14.0.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.gogo.runtime-0.16.2.jar b/demo/framework/bundle/org.apache.felix.gogo.runtime-0.16.2.jar deleted file mode 100644 index 5524532f..00000000 Binary files a/demo/framework/bundle/org.apache.felix.gogo.runtime-0.16.2.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.gogo.shell-0.10.0.jar b/demo/framework/bundle/org.apache.felix.gogo.shell-0.10.0.jar deleted file mode 100644 index f74e68e5..00000000 Binary files a/demo/framework/bundle/org.apache.felix.gogo.shell-0.10.0.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.http.api-3.0.0.jar b/demo/framework/bundle/org.apache.felix.http.api-3.0.0.jar deleted file mode 100644 index 24ba9e85..00000000 Binary files a/demo/framework/bundle/org.apache.felix.http.api-3.0.0.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.http.jetty-3.0.2.jar b/demo/framework/bundle/org.apache.felix.http.jetty-3.0.2.jar deleted file mode 100644 index 614ce60c..00000000 Binary files a/demo/framework/bundle/org.apache.felix.http.jetty-3.0.2.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.http.servlet-api-1.1.2.jar b/demo/framework/bundle/org.apache.felix.http.servlet-api-1.1.2.jar deleted file mode 100644 index 36a83b27..00000000 Binary files a/demo/framework/bundle/org.apache.felix.http.servlet-api-1.1.2.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.metatype-1.1.0.jar b/demo/framework/bundle/org.apache.felix.metatype-1.1.0.jar deleted file mode 100644 index 982c1950..00000000 Binary files a/demo/framework/bundle/org.apache.felix.metatype-1.1.0.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.scr-2.0.0.jar b/demo/framework/bundle/org.apache.felix.scr-2.0.0.jar deleted file mode 100644 index e9ac0539..00000000 Binary files a/demo/framework/bundle/org.apache.felix.scr-2.0.0.jar and /dev/null differ diff --git a/demo/framework/bundle/org.apache.felix.shell.remote-1.1.2.jar b/demo/framework/bundle/org.apache.felix.shell.remote-1.1.2.jar deleted file mode 100644 index 5053cdb3..00000000 Binary files a/demo/framework/bundle/org.apache.felix.shell.remote-1.1.2.jar and /dev/null differ diff --git a/demo/framework/bundle/slf4j-api-1.7.12.jar b/demo/framework/bundle/slf4j-api-1.7.12.jar deleted file mode 100644 index 51e2fad1..00000000 Binary files a/demo/framework/bundle/slf4j-api-1.7.12.jar and /dev/null differ diff --git a/demo/framework/conf/channels.xml b/demo/framework/conf/channels.xml deleted file mode 100644 index 4c9c8cb0..00000000 --- a/demo/framework/conf/channels.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - dummy/device/address/1 - 5m - - dummy/channel/address/voltage - V - 100ms - 1s - - - dummy/channel/address/current - kW - 100ms - 5s - - - dummy - true - 5s - - - dummy - STRING - 5s - - - dummy - STRING - 10s - - - dummy - BYTE_ARRAY - 5s - - - - - 3s - - - virtual channel for power (calculated by demo app) - POWER - 5s - - - - - - - VoltageChannel:AVG:0.9 - DOUBLE - 15s - 13s - 15s - - - VoltageChannel:LAST - DOUBLE - 15s - 13s - 15s - - - VoltageChannel:DIFF - DOUBLE - 15s - 13s - 15s - - - - - 10s - 10s - - Connects to his own server - http://127.0.0.1:8888/rest - admin:admin - - VoltageChannel - 5s - - - ByteArrayChannel - BYTE_ARRAY - 5s - - - - diff --git a/demo/framework/conf/config.properties b/demo/framework/conf/config.properties deleted file mode 100644 index 0f5c95b0..00000000 --- a/demo/framework/conf/config.properties +++ /dev/null @@ -1,98 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# -# Framework config properties. -# - -# To override the packages the framework exports by default from the -# class path, set this variable. -#org.osgi.framework.system.packages= - -# To append packages to the default set of exported system packages, -# set this value. -#org.osgi.framework.system.packages.extra= - -# The following property makes specified packages from the class path -# available to all bundles. You should avoid using this property. -#org.osgi.framework.bootdelegation=sun.*,com.sun.* - -# Felix tries to guess when to implicitly boot delegate in certain -# situations to ease integration without outside code. This feature -# is enabled by default, uncomment the following line to disable it. -#felix.bootdelegation.implicit=false - -# The following property explicitly specifies the location of the bundle -# cache, which defaults to "felix-cache" in the current working directory. -# If this value is not absolute, then the felix.cache.rootdir controls -# how the absolute location is calculated. (See next property) -#org.osgi.framework.storage=${felix.cache.rootdir}/felix-cache - -# The following property is used to convert a relative bundle cache -# location into an absolute one by specifying the root to prepend to -# the relative cache path. The default for this property is the -# current working directory. -#felix.cache.rootdir=${user.dir} - -# The following property controls whether the bundle cache is flushed -# the first time the framework is initialized. Possible values are -# "none" and "onFirstInit"; the default is "none". -org.osgi.framework.storage.clean=onFirstInit - -# The following property determines which actions are performed when -# processing the auto-deploy directory. It is a comma-delimited list of -# the following values: 'install', 'start', 'update', and 'uninstall'. -# An undefined or blank value is equivalent to disabling auto-deploy -# processing. -felix.auto.deploy.action=install,start - -# The following property specifies the directory to use as the bundle -# auto-deploy directory; the default is 'bundle' in the working directory. -#felix.auto.deploy.dir=bundle - -# The following property is a space-delimited list of bundle URLs -# to install when the framework starts. The ending numerical component -# is the target start level. Any number of these properties may be -# specified for different start levels. -#felix.auto.install.1= - -# The following property is a space-delimited list of bundle URLs -# to install and start when the framework starts. The ending numerical -# component is the target start level. Any number of these properties -# may be specified for different start levels. -#felix.auto.start.1= - -felix.log.level=1 - -# Sets the initial start level of the framework upon startup. -#org.osgi.framework.startlevel.beginning=1 - -# Sets the start level of newly installed bundles. -#felix.startlevel.bundle=1 - -# Felix installs a stream and content handler factories by default, -# uncomment the following line to not install them. -#felix.service.urlhandlers=false - -# The launcher registers a shutdown hook to cleanly stop the framework -# by default, uncomment the following line to disable it. -#felix.shutdown.hook=false - -# -# Bundle config properties. -# - diff --git a/demo/framework/conf/https-certificate.jks b/demo/framework/conf/https-certificate.jks deleted file mode 100644 index 7deab55c..00000000 Binary files a/demo/framework/conf/https-certificate.jks and /dev/null differ diff --git a/demo/framework/conf/logback.xml b/demo/framework/conf/logback.xml deleted file mode 100644 index 91b1f266..00000000 --- a/demo/framework/conf/logback.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - openmuc.log - true - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - diff --git a/demo/framework/conf/system.properties b/demo/framework/conf/system.properties deleted file mode 100644 index 04b8f6da..00000000 --- a/demo/framework/conf/system.properties +++ /dev/null @@ -1,23 +0,0 @@ - - -# Configuration for the OpenMUC Logger. -logback.configurationFile=conf/logback.xml - -# The location of the channel config file, default is conf/channels.xml -#org.openmuc.framework.channelconfig=conf/channels.xml - -org.apache.felix.http.enable=true -org.osgi.service.http.port=8888 - -org.apache.felix.https.enable=true -org.apache.felix.https.keystore=conf/https-certificate.jks -org.apache.felix.https.keystore.password=https4OpenMUC -org.osgi.service.http.port.secure=8889 - -org.eclipse.jetty.server.Request.maxFormKeys=2000 - -# Set all combinations of serial ports / ttys. This fixes bugs on most of the embedded Linux Systems -#gnu.io.rxtx.SerialPorts=/dev/ttyACM0:/dev/ttyACM1:/dev/ttyACM2:/dev/ttyACM3:/dev/ttyACM4:/dev/ttyACM5:/dev/ttyACM6:/dev/ttyACM7:/dev/ttyACM8:/dev/ttyACM9:/dev/ttyACM10:/dev/ttyAMA0:/dev/ttyAMA1:/dev/ttyAMA2:/dev/ttyAMA3:/dev/ttyAMA4:/dev/ttyAMA5:/dev/ttyAMA6:/dev/ttyAMA7:/dev/ttyAMA8:/dev/ttyAMA9:/dev/ttyAMA10:/dev/ttyUSB0:/dev/ttyUSB1:/dev/ttyUSB2:/dev/ttyUSB3:/dev/ttyUSB4:/dev/ttyUSB5:/dev/ttyUSB6:/dev/ttyUSB7:/dev/ttyUSB8:/dev/ttyUSB9:/dev/ttyUSB10:/dev/ttyS0:/dev/ttyS1:/dev/ttyS2:/dev/ttyS3:/dev/ttyS4:/dev/ttyS5:/dev/ttyS6:/dev/ttyS7:/dev/ttyS8:/dev/ttyS9:/dev/ttyS10:/dev/ttyO0:/dev/ttyO1:/dev/ttyO2:/dev/ttyO3:/dev/ttyO4:/dev/ttyO5:/dev/ttyO6:/dev/ttyO7:/dev/ttyO8:/dev/ttyO9:/dev/ttyO10:COM0:COM1:COM2:COM3:COM4:COM5:COM6:COM7:COM8:COM9:COM10:COM11:COM12:COM13:COM14:COM15:COM16:COM17:COM18:COM19:COM20 - -# enable file filling instead of renaming asciidata files in *.old -org.openmuc.framework.datalogger.ascii.fillUpFiles = true diff --git a/demo/framework/conf/webui/dataplotter.conf b/demo/framework/conf/webui/dataplotter.conf deleted file mode 100644 index 86f32f23..00000000 --- a/demo/framework/conf/webui/dataplotter.conf +++ /dev/null @@ -1,45 +0,0 @@ -{ - "plotters": [{ - "type" : "data", - "name" : "Data Test", - "xAxisLabel" : "Time", - "yAxisLabel" : "Values", - "channels" : [{"id" : "CurrentChannel", "preselect" : "true" , "label" : "current", "color" : "#179C7D"}, - {"id" : "VoltageChannel", "preselect" : "true" , "label" : "voltage", "color" : "#FFD700"}, - {"id" : "TimeSeriesStringChannel", "preselect" : "false" , "label" : "forecast", "color" : "#FFD700"}], - "plotRange" : [-3, 7] - }, - { - "type" : "data", - "name" : "Data Test 2", - "xAxisLabel" : "Time", - "yAxisLabel" : "Values", - "channels" : [{"id" : "CurrentChannel", "preselect" : "true" , "label" : "current", "color" : "#179C7D"}], - "plotRange" : [-3, 7] - }, - { - "type" : "live", - "name" : "Live", - "refresh" : 1000, - "timePeriod" : 8, - "timePeriodUnit" : "seconds", - "xAxisLabel" : "Time", - "yAxisLabel" : "Values", - "channels" : [{"id" : "CurrentChannel", "preselect" : "true" , "label" : "current", "color" : "#179C7D"}, - {"id" : "VoltageChannel", "preselect" : "true" , "label" : "voltage", "color" : "#FFD700"}], - "plotRange" : [-50, 300] - }, - { - "type" : "live", - "name" : "Live2", - "refresh" : 2000, - "timePeriod" : 10, - "timePeriodUnit" : "minutes", - "xAxisLabel" : "Time", - "yAxisLabel" : "Values", - "channels" : [{"id" : "CurrentChannel", "preselect" : "true" , "label" : "current", "color" : "#179C7D"}, - {"id" : "VoltageChannel", "preselect" : "true" , "label" : "voltage", "color" : "#FFD700"}], - "plotRange" : [-3, 7] - } - ] -} \ No newline at end of file diff --git a/demo/framework/conf/webui/mediaviewer.conf b/demo/framework/conf/webui/mediaviewer.conf deleted file mode 100644 index 0fb9cd88..00000000 --- a/demo/framework/conf/webui/mediaviewer.conf +++ /dev/null @@ -1,13 +0,0 @@ -{ - "documents": [ - { - "name": "test.txt", - "file": "/media/test.txt" - }, - { - "name": "example.pdf", - "file": "/media/example.pdf" - } - ] - -} diff --git a/demo/framework/dependencies/README.txt b/demo/framework/dependencies/README.txt deleted file mode 100644 index a8f09d19..00000000 --- a/demo/framework/dependencies/README.txt +++ /dev/null @@ -1 +0,0 @@ -In this folder you can find license information to all third party modules used by the OpenMUC demo framework. diff --git a/demo/framework/dependencies/logback/NOTICE b/demo/framework/dependencies/logback/NOTICE deleted file mode 100644 index fa776b83..00000000 --- a/demo/framework/dependencies/logback/NOTICE +++ /dev/null @@ -1,14 +0,0 @@ -Logback LICENSE ---------------- - -Logback: the reliable, generic, fast and flexible logging framework. -Copyright (C) 1999-2015, QOS.ch. All rights reserved. - -This program and the accompanying materials are dual-licensed under -either the terms of the Eclipse Public License v1.0 as published by -the Eclipse Foundation - - or (per the licensee's choosing) - -under the terms of the GNU Lesser General Public License version 2.1 -as published by the Free Software Foundation. diff --git a/demo/framework/dependencies/org.apache.felix.configadmin/NOTICE b/demo/framework/dependencies/org.apache.felix.configadmin/NOTICE deleted file mode 100644 index 58fbc51a..00000000 --- a/demo/framework/dependencies/org.apache.felix.configadmin/NOTICE +++ /dev/null @@ -1,12 +0,0 @@ - -Apache Felix Configuration Admin Service -Copyright 2006-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2012). -Licensed under the Apache License 2.0. \ No newline at end of file diff --git a/demo/framework/dependencies/org.apache.felix.eventadmin/NOTICE b/demo/framework/dependencies/org.apache.felix.eventadmin/NOTICE deleted file mode 100644 index 63a33ff5..00000000 --- a/demo/framework/dependencies/org.apache.felix.eventadmin/NOTICE +++ /dev/null @@ -1,8 +0,0 @@ - -Apache Felix EventAdmin -Copyright 2006-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/demo/framework/dependencies/org.apache.felix.gogo.command/NOTICE b/demo/framework/dependencies/org.apache.felix.gogo.command/NOTICE deleted file mode 100644 index ef6670bb..00000000 --- a/demo/framework/dependencies/org.apache.felix.gogo.command/NOTICE +++ /dev/null @@ -1,11 +0,0 @@ -Apache Felix Gogo Command -Copyright 2014 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2009). -Licensed under the Apache License 2.0. diff --git a/demo/framework/dependencies/org.apache.felix.gogo.runtime/NOTICE b/demo/framework/dependencies/org.apache.felix.gogo.runtime/NOTICE deleted file mode 100644 index cb48c521..00000000 --- a/demo/framework/dependencies/org.apache.felix.gogo.runtime/NOTICE +++ /dev/null @@ -1,10 +0,0 @@ -Apache Felix Gogo Runtime -Copyright 2014 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. - -This product includes software developped by -Udo Klimaschewski (http://UdoJava.com/). -Licensed under the MIT License. diff --git a/demo/framework/dependencies/org.apache.felix.gogo.shell/NOTICE b/demo/framework/dependencies/org.apache.felix.gogo.shell/NOTICE deleted file mode 100644 index 4007bd35..00000000 --- a/demo/framework/dependencies/org.apache.felix.gogo.shell/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -Apache Felix Gogo Shell -Copyright 2011 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. diff --git a/demo/framework/dependencies/org.apache.felix.http.api/NOTICE b/demo/framework/dependencies/org.apache.felix.http.api/NOTICE deleted file mode 100644 index 591b9056..00000000 --- a/demo/framework/dependencies/org.apache.felix.http.api/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -Apache Felix Http Service Api -Copyright 2011 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. diff --git a/demo/framework/dependencies/org.apache.felix.http.jetty/NOTICE b/demo/framework/dependencies/org.apache.felix.http.jetty/NOTICE deleted file mode 100644 index f90035c7..00000000 --- a/demo/framework/dependencies/org.apache.felix.http.jetty/NOTICE +++ /dev/null @@ -1,15 +0,0 @@ -Apache Felix Http Service Jetty -Copyright 2011 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. - -This product includes software developed by -Mortbay (http://mortbay.org) -Licensed under the Apache License 2.0. - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2009). -Licensed under the Apache License 2.0. diff --git a/demo/framework/dependencies/org.apache.felix.http.servlet-api/NOTICE b/demo/framework/dependencies/org.apache.felix.http.servlet-api/NOTICE deleted file mode 100644 index f9ba8329..00000000 --- a/demo/framework/dependencies/org.apache.felix.http.servlet-api/NOTICE +++ /dev/null @@ -1,8 +0,0 @@ - -Apache Felix Servlet API -Copyright 2006-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - diff --git a/demo/framework/dependencies/org.apache.felix.main/NOTICE b/demo/framework/dependencies/org.apache.felix.main/NOTICE deleted file mode 100644 index 0631bf09..00000000 --- a/demo/framework/dependencies/org.apache.felix.main/NOTICE +++ /dev/null @@ -1,12 +0,0 @@ - -Apache Felix Main -Copyright 2006-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2015). -Licensed under the Apache License 2.0. diff --git a/demo/framework/dependencies/org.apache.felix.metatype/NOTICE b/demo/framework/dependencies/org.apache.felix.metatype/NOTICE deleted file mode 100644 index 379e1788..00000000 --- a/demo/framework/dependencies/org.apache.felix.metatype/NOTICE +++ /dev/null @@ -1,12 +0,0 @@ - -Apache Felix Metatype Service -Copyright 2006-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2012). -Licensed under the Apache License 2.0. diff --git a/demo/framework/dependencies/org.apache.felix.scr/NOTICE b/demo/framework/dependencies/org.apache.felix.scr/NOTICE deleted file mode 100644 index 64720ac1..00000000 --- a/demo/framework/dependencies/org.apache.felix.scr/NOTICE +++ /dev/null @@ -1,12 +0,0 @@ - -Apache Felix Declarative Services -Copyright 2006-2015 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - - -This product includes software developed at -The OSGi Alliance (http://www.osgi.org/). -Copyright (c) OSGi Alliance (2000, 2009). -Licensed under the Apache License 2.0. diff --git a/demo/framework/dependencies/org.apache.felix.shell.remote/NOTICE b/demo/framework/dependencies/org.apache.felix.shell.remote/NOTICE deleted file mode 100644 index cb307ff2..00000000 --- a/demo/framework/dependencies/org.apache.felix.shell.remote/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -Apache Felix Remote Shell -Copyright 2010 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). -Licensed under the Apache License 2.0. diff --git a/demo/framework/dependencies/slf4j-api/NOTICE b/demo/framework/dependencies/slf4j-api/NOTICE deleted file mode 100644 index 852df2e3..00000000 --- a/demo/framework/dependencies/slf4j-api/NOTICE +++ /dev/null @@ -1,23 +0,0 @@ -MIT license - -Copyright (c) 2004-2014 QOS.ch -All rights reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/demo/framework/felix/felix.jar b/demo/framework/felix/felix.jar deleted file mode 100644 index 195da1bb..00000000 Binary files a/demo/framework/felix/felix.jar and /dev/null differ diff --git a/demo/framework/run-openmuc.bat.winfile b/demo/framework/run-openmuc.bat.winfile deleted file mode 100644 index b042f8d5..00000000 --- a/demo/framework/run-openmuc.bat.winfile +++ /dev/null @@ -1,4 +0,0 @@ -::BATCH file for windows -ECHO will run the OpenMUC framework - -java -jar felix\felix.jar diff --git a/demo/framework/run-openmuc.sh b/demo/framework/run-openmuc.sh deleted file mode 100644 index 840d7905..00000000 --- a/demo/framework/run-openmuc.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -DIR_NAME=`dirname $0` -cd $DIR_NAME - -if [ "$1" = "-b" ] -then - java -Dgosh.args=--nointeractive -jar felix/felix.jar >openmuc.out 2>&1 & -else - java -jar felix/felix.jar -fi diff --git a/demo/framework/update-bundles.sh b/demo/framework/update-bundles.sh deleted file mode 100644 index 0520213e..00000000 --- a/demo/framework/update-bundles.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -DIR_NAME=`dirname $0` -cd $DIR_NAME - -gradle -p ../../ build -gradle -p ../projects/simpledemoapp build -gradle -p ../projects/dummydriver build -gradle syncBundles copyFelixMain diff --git a/demo/projects/dummydriver/build.gradle b/demo/projects/dummydriver/build.gradle deleted file mode 100644 index ef3d0711..00000000 --- a/demo/projects/dummydriver/build.gradle +++ /dev/null @@ -1,52 +0,0 @@ - -apply plugin: 'java' -apply plugin: 'eclipse' -apply plugin: 'osgi' -apply plugin: 'maven' - -version = '0.15.3' -group = 'org.openmuc.framework' -def bundleSymbolicName = 'org.openmuc.framework.driver.dummy' -def bundleName = 'OpenMUC Driver - Dummy' - -sourceCompatibility = 1.7 -targetCompatibility = 1.7 - -repositories { - mavenCentral() -} - -dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' - compile group: 'org.osgi', name: 'org.osgi.core', version: '4.3.1' - compile group: 'org.osgi', name: 'org.osgi.compendium', version: '4.3.1' - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12' - compile files('../../../build/libs-all/openmuc-core-api-0.15.3.jar') - compile files('../../../build/libs-all/openmuc-core-spi-0.15.3.jar') -} - -jar { - manifest { - version = project.version.replace('-','.'); - symbolicName = bundleSymbolicName - name = bundleName - instruction 'Export-Package', '' - instruction 'Service-Component', 'OSGI-INF/components.xml' - } -} - -uploadArchives { - repositories { - mavenDeployer { - repository(url: project.properties.repository) { - authentication(userName: project.properties.artifactoryUser, password: project.properties.artifactoryPass) - } - snapshotRepository(url: project.properties.snapshotRepository) { - authentication(userName: project.properties.artifactoryUser, password: project.properties.artifactoryPass) - } - } - } -} - -eclipse.pathVariables([GRADLE_USER_HOME:file(gradle.gradleUserHomeDir)]) -tasks.eclipse.dependsOn(cleanEclipse) diff --git a/demo/projects/dummydriver/settings.gradle b/demo/projects/dummydriver/settings.gradle deleted file mode 100644 index f00bd7d2..00000000 --- a/demo/projects/dummydriver/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'openmuc-driver-dummy' diff --git a/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyConnection.java b/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyConnection.java deleted file mode 100644 index 73244a1a..00000000 --- a/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyConnection.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * This file is part of OpenMUC. - * For more information visit http://www.openmuc.org - * - * You are free to use code of this sample file in any - * way you like and without any restrictions. - * - */ -package org.openmuc.framework.driver.dummy; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import org.openmuc.framework.config.ChannelScanInfo; -import org.openmuc.framework.data.DoubleValue; -import org.openmuc.framework.data.Flag; -import org.openmuc.framework.data.Record; -import org.openmuc.framework.data.ValueType; -import org.openmuc.framework.driver.spi.ChannelRecordContainer; -import org.openmuc.framework.driver.spi.ChannelValueContainer; -import org.openmuc.framework.driver.spi.Connection; -import org.openmuc.framework.driver.spi.ConnectionException; -import org.openmuc.framework.driver.spi.RecordsReceivedListener; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class DummyConnection implements Connection { - - private final static Logger logger = LoggerFactory.getLogger(DummyConnection.class); - - private final String deviceAddress; - - DummyListener listenerThread; - - boolean applianceStateON = false; - long applianceSwitchedOnTime; - long applianceSwitchedOffTime; - long applianceActiveTime; - long applianceInactiveTime; - boolean initApplianceState = true; - double p = Math.random(); - - public DummyConnection(String deviceAddress) { - this.deviceAddress = deviceAddress; - } - - @Override - public List scanForChannels(String settings) - throws UnsupportedOperationException, ConnectionException { - List informationList = new ArrayList(2); - informationList.add(new ChannelScanInfo("dummy/channel/address/voltage", "", ValueType.DOUBLE, null)); - informationList.add(new ChannelScanInfo("dummy/channel/address/current", "", ValueType.BYTE_ARRAY, 5)); - return informationList; - } - - @Override - public void disconnect() { - logger.info("Disconnecting from device: " + deviceAddress); - if (listenerThread != null) { - listenerThread.shutdown(); - } - } - - @Override - public Object read(List containers, Object containerListHandle, String samplingGroup) - throws UnsupportedOperationException, ConnectionException { - - double value = 0; - long receiveTime = System.currentTimeMillis(); - for (ChannelRecordContainer channel : containers) { - - if (channel.getChannelAddress().equals("dummy/channel/address/voltage")) { - // voltage: 227 V - 233 V - value = 227 + (int) (Math.random() * ((233 - 227) + 1)); /* Generate values between 227 and 233 */ - // voltage: 10 V - 12 V - // value = Math.random() * (12 - 10) + 10; - channel.setRecord(new Record(new DoubleValue(value), receiveTime)); - } - else if (channel.getChannelAddress().equals("dummy/channel/address/current")) { - // current: 0.3 A - 0,7 A - value = Math.sin(p) + 2; - setApplianceState(); - if (applianceStateON) { - // add 5 A if appliance is on - value += 3; - } - p += 1.0 / 100 % 2 * Math.PI; - } - else { - // a random value between -10 and +10 for any other channel address - value = Math.random() * (10 - (-10)) + (-10); - } - channel.setRecord(new Record(new DoubleValue(value), receiveTime)); - } - return null; - } - - @Override - public void startListening(List containers, RecordsReceivedListener listener) - throws UnsupportedOperationException { - if (containers.size() == 0) { - if (listenerThread != null) { - listenerThread.shutdown(); - } - } - else { - if (listenerThread == null) { - listenerThread = new DummyListener(containers, listener); - listenerThread.start(); - } - else { - listenerThread.setNewContainers(containers); - } - } - } - - @Override - public Object write(List containers, Object containerListHandle) - throws UnsupportedOperationException, ConnectionException { - try { - Thread.sleep(500); - } catch (InterruptedException e) { - } - for (ChannelValueContainer valueContainer : containers) { - valueContainer.setFlag(Flag.VALID); - } - return null; - } - - private void setApplianceState() { - - long currentTime = new Date().getTime(); - - if (!applianceStateON) { - // if appliance off then leave it off for a certain time and then turn it on - if ((applianceSwitchedOffTime + applianceInactiveTime) < currentTime || initApplianceState) { - initApplianceState = false; - applianceActiveTime = (long) (Math.random() * (10000 - 1000) + 1000); // 1s - 10s - applianceSwitchedOnTime = new Date().getTime(); - applianceStateON = true; - } - } - else { - // if appliance on then turn it off after a certain time - if ((applianceSwitchedOnTime + applianceActiveTime) < currentTime) { - applianceInactiveTime = (long) (Math.random() * (10000 - 1000) + 1000); - applianceSwitchedOffTime = new Date().getTime(); - applianceStateON = false; - } - } - } - -} diff --git a/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyDriver.java b/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyDriver.java deleted file mode 100644 index 32a61805..00000000 --- a/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyDriver.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * This file is part of OpenMUC. - * For more information visit http://www.openmuc.org - * - * You are free to use code of this sample file in any - * way you like and without any restrictions. - * - */ -package org.openmuc.framework.driver.dummy; - -import org.openmuc.framework.config.ArgumentSyntaxException; -import org.openmuc.framework.config.DeviceScanInfo; -import org.openmuc.framework.config.DriverInfo; -import org.openmuc.framework.config.ScanException; -import org.openmuc.framework.config.ScanInterruptedException; -import org.openmuc.framework.driver.spi.Connection; -import org.openmuc.framework.driver.spi.ConnectionException; -import org.openmuc.framework.driver.spi.DriverDeviceScanListener; -import org.openmuc.framework.driver.spi.DriverService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public final class DummyDriver implements DriverService { - - private final static Logger logger = LoggerFactory.getLogger(DummyDriver.class); - - private final static DriverInfo info = new DriverInfo("dummy", // id - // description - "This is just a dummy driver that returns dummy values and acts as a sink for written values", - // device address - "dummy/device/address/[0-9]", - // parameters - "N.A.", - // channel address - "dummy/channel/address/[a-z A-Z]", - // device scan settings - "N.A."); - - private volatile boolean scanRunning = false; - - @Override - public DriverInfo getInfo() { - return info; - } - - @Override - public void scanForDevices(String settings, DriverDeviceScanListener listener) - throws UnsupportedOperationException, ArgumentSyntaxException, ScanException, ScanInterruptedException { - - listener.deviceFound(new DeviceScanInfo("dummy/device/address/1", "", "Dummy device 1.")); - try { - scanRunning = true; - for (int i = 0; i <= 10; i++) { - if (!scanRunning) { - throw new ScanInterruptedException(); - } - Thread.sleep(500); - listener.scanProgressUpdate(i * 10); - if (i == 5) { - listener.deviceFound( - new DeviceScanInfo("dummy/device/address/2", "meaning=101010b", "Dummy device 2.")); - } - } - } catch (InterruptedException e) { - throw new ScanInterruptedException(e); - } - } - - @Override - public void interruptDeviceScan() throws UnsupportedOperationException { - logger.debug("interrupting scan"); - scanRunning = false; - } - - @Override - public Connection connect(String deviceAddress, String settings) throws ConnectionException { - - logger.info("Connecting to device: " + deviceAddress); - - return new DummyConnection(deviceAddress); - } - -} diff --git a/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyListener.java b/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyListener.java deleted file mode 100644 index 697ed62c..00000000 --- a/demo/projects/dummydriver/src/main/java/org/openmuc/framework/driver/dummy/DummyListener.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * This file is part of OpenMUC. - * For more information visit http://www.openmuc.org - * - * You are free to use code of this sample file in any - * way you like and without any restrictions. - * - */ -package org.openmuc.framework.driver.dummy; - -import java.util.List; - -import org.openmuc.framework.data.DoubleValue; -import org.openmuc.framework.data.Record; -import org.openmuc.framework.driver.spi.ChannelRecordContainer; -import org.openmuc.framework.driver.spi.RecordsReceivedListener; - -final class DummyListener extends Thread { - - private List containers; - private final RecordsReceivedListener listener; - - Double p = Math.random(); - - public DummyListener(List containers, RecordsReceivedListener listener) { - this.containers = containers; - this.listener = listener; - } - - @Override - public void run() { - while (true) { - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - return; - } - long receiveTime = System.currentTimeMillis(); - synchronized (containers) { - for (ChannelRecordContainer container : containers) { - container.setRecord(new Record(new DoubleValue(Math.sin(p)), receiveTime)); - p += 1.0 / 90 % 2 * Math.PI; - } - listener.newRecords(containers); - } - } - } - - public void setNewContainers(List containers) { - synchronized (containers) { - this.containers = containers; - } - } - - public void shutdown() { - interrupt(); - } - -} diff --git a/demo/projects/dummydriver/src/main/resources/OSGI-INF/components.xml b/demo/projects/dummydriver/src/main/resources/OSGI-INF/components.xml deleted file mode 100644 index ed69f402..00000000 --- a/demo/projects/dummydriver/src/main/resources/OSGI-INF/components.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/demo/projects/simpledemoapp/build.gradle b/demo/projects/simpledemoapp/build.gradle deleted file mode 100644 index 3c503b9b..00000000 --- a/demo/projects/simpledemoapp/build.gradle +++ /dev/null @@ -1,51 +0,0 @@ - -apply plugin: 'java' -apply plugin: 'eclipse' -apply plugin: 'osgi' -apply plugin: 'maven' - -version = '0.15.3' -group = 'org.openmuc.framework' -def bundleSymbolicName = 'org.openmuc.framework.app.simpledemo' -def bundleName = 'OpenMUC App - Simple Demo' - -sourceCompatibility = 1.7 -targetCompatibility = 1.7 - -repositories { - mavenCentral() -} - -dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' - compile group: 'org.osgi', name: 'org.osgi.core', version: '4.3.1' - compile group: 'org.osgi', name: 'org.osgi.compendium', version: '4.3.1' - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.12' - compile files('../../../build/libs-all/openmuc-core-api-0.15.3.jar') -} - -jar { - manifest { - version = project.version.replace('-','.'); - symbolicName = bundleSymbolicName - name = bundleName - instruction 'Export-Package', '' - instruction 'Service-Component', 'OSGI-INF/components.xml' - } -} - -uploadArchives { - repositories { - mavenDeployer { - repository(url: project.properties.repository) { - authentication(userName: project.properties.artifactoryUser, password: project.properties.artifactoryPass) - } - snapshotRepository(url: project.properties.snapshotRepository) { - authentication(userName: project.properties.artifactoryUser, password: project.properties.artifactoryPass) - } - } - } -} - -eclipse.pathVariables([GRADLE_USER_HOME:file(gradle.gradleUserHomeDir)]) -tasks.eclipse.dependsOn(cleanEclipse) diff --git a/demo/projects/simpledemoapp/settings.gradle b/demo/projects/simpledemoapp/settings.gradle deleted file mode 100644 index 5cb0fa81..00000000 --- a/demo/projects/simpledemoapp/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'openmuc-app-simpledemo' diff --git a/demo/projects/simpledemoapp/src/main/java/org/openmuc/framework/app/simpledemo/SimpleDemoApp.java b/demo/projects/simpledemoapp/src/main/java/org/openmuc/framework/app/simpledemo/SimpleDemoApp.java deleted file mode 100644 index 7e6dd692..00000000 --- a/demo/projects/simpledemoapp/src/main/java/org/openmuc/framework/app/simpledemo/SimpleDemoApp.java +++ /dev/null @@ -1,220 +0,0 @@ -/* - * This file is part of OpenMUC. - * For more information visit http://www.openmuc.org - * - * You are free to use code of this sample file in any - * way you like and without any restrictions. - * - */ -package org.openmuc.framework.app.simpledemo; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.GregorianCalendar; - -import org.openmuc.framework.data.ByteArrayValue; -import org.openmuc.framework.data.DoubleValue; -import org.openmuc.framework.data.Record; -import org.openmuc.framework.data.StringValue; -import org.openmuc.framework.data.Value; -import org.openmuc.framework.dataaccess.Channel; -import org.openmuc.framework.dataaccess.DataAccessService; -import org.openmuc.framework.dataaccess.RecordListener; -import org.osgi.service.component.ComponentContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public final class SimpleDemoApp extends Thread implements RecordListener { - - private final static Logger logger = LoggerFactory.getLogger(SimpleDemoApp.class); - - private volatile boolean deactivatedSignal; - - // With this you can access to your measured and control data of your devices. - DataAccessService dataAccessService; - - // Channel for accessing data of a channel. - Channel channel1; - Channel channel2; - Channel channel3; - Channel channel4; - Channel channel5; - Channel channel6; - Channel channel7; - - // ChannelIDs, see conf/channel.xml - public static final String CHANNEL_ID1 = "VoltageChannel"; - public static final String CHANNEL_ID2 = "CurrentChannel"; - public static final String CHANNEL_ID3 = "PowerChannel"; - public static final String CHANNEL_ID4 = "listeningChannel"; - public static final String CHANNEL_ID5 = "StringChannel"; - public static final String CHANNEL_ID6 = "ByteArrayChannel"; - public static final String CHANNEL_ID7 = "TimeSeriesStringChannel"; - - int printCounter; // for slowing down the output of the console - - /** - * Every app needs one activate method. Is is called at begin. Here you can configure all you need at start of your - * app. The Activate method can block the start of your OpenMUC, f.e. if you use Thread.sleep(). - * - * @param context - */ - protected void activate(ComponentContext context) { - logger.info("Activating Demo App"); - setName("OpenMUC Simple Demo App"); - start(); - } - - /** - * Every app needs one deactivate method. It handles the shutdown of your app. Here you can f.e. close streams. - * - * @param context - */ - protected void deactivate(ComponentContext context) { - logger.info("Deactivating Demo App"); - deactivatedSignal = true; - interrupt(); - try { - this.join(); - } catch (InterruptedException e) { - } - } - - /** - * To set the DataAccessService dataAccessService for your app. - * - * @param dataAccessService - */ - protected void setDataAccessService(DataAccessService dataAccessService) { - this.dataAccessService = dataAccessService; - } - - /** - * To unset the DataAccessService dataAccessService for your app. - * - * @param dataAccessService - */ - protected void unsetDataAccessService(DataAccessService dataAccessService) { - this.dataAccessService = null; - } - - @Override - public void run() { - - logger.info("Demo App started running..."); - - if (deactivatedSignal) { - logger.info("DemoApp thread interrupted: will stop"); - return; - } - - // Get channel with ChannelID. - channel1 = dataAccessService.getChannel(CHANNEL_ID1); - channel2 = dataAccessService.getChannel(CHANNEL_ID2); - channel3 = dataAccessService.getChannel(CHANNEL_ID3); - channel4 = dataAccessService.getChannel(CHANNEL_ID4); - channel5 = dataAccessService.getChannel(CHANNEL_ID5); - channel6 = dataAccessService.getChannel(CHANNEL_ID6); - channel7 = dataAccessService.getChannel(CHANNEL_ID7); - Value value = null; - - while (!deactivatedSignal && (channel1 == null || channel2 == null || channel3 == null || value == null)) { - String errorMessage = "Channel " + CHANNEL_ID1 + " or " + CHANNEL_ID2 + " or " + CHANNEL_ID3 - + " not found, will try again in 5 seconds."; - logger.error(errorMessage); - - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - logger.info("DemoApp thread interrupted: will stop"); - } - - channel1 = dataAccessService.getChannel(CHANNEL_ID1); - channel2 = dataAccessService.getChannel(CHANNEL_ID2); - channel3 = dataAccessService.getChannel(CHANNEL_ID3); - if (channel1 != null) { - value = channel1.getLatestRecord().getValue(); - } - } - channel5 = dataAccessService.getChannel(CHANNEL_ID5); - channel6 = dataAccessService.getChannel(CHANNEL_ID6); - channel4.addListener(this); - - while (!deactivatedSignal) { - - double valueChannel1 = channel1.getLatestRecord().getValue().asDouble(); // voltage - double valueChannel2 = channel2.getLatestRecord().getValue().asDouble(); // current - double valueChannel3 = valueChannel1 * valueChannel2; // power - String valueChannel5 = null; - String valueChannel7 = null; - Calendar cal = new GregorianCalendar(); - long time = cal.getTimeInMillis(); - if ((cal.get(Calendar.MINUTE) % 2) > 0) { - valueChannel5 = "Teststring"; - byte[] valueChannel6 = { 0x00, 0x01, 0x09, 0x0A, 0x0F, 0x10, 0x11, 0x7F, -0x7F, -0x51, -0x10, -0x01 }; - channel6.setLatestRecord(new Record(new ByteArrayValue(valueChannel6), time)); - } - else { - valueChannel5 = "Test"; - byte[] valueChannel6 = { 0x00, 0x01, -0x10, -0x01 }; - channel6.setLatestRecord(new Record(new ByteArrayValue(valueChannel6), time)); - } - - channel3.setLatestRecord(new Record(new DoubleValue(valueChannel3), time)); - channel5.setLatestRecord(new Record(new StringValue(valueChannel5), time)); - - // create a dummy TimeSeriesString to be written to channel7 - ArrayList data = new ArrayList(); - data.add(2.); - data.add(3.); - data.add(4.); - data.add(3.5); - data.add(2.2); - data.add(1.5); - data.add(0.5); - data.add(-0.5); - - long time_3mins_ago = (time - 3 * 2000); - long one_hot_minute = 2000; - StringBuffer sb = new StringBuffer(); - for (Double double1 : data) { - sb.append(String.valueOf(time_3mins_ago)).append(',').append(double1).append(';'); - time_3mins_ago += one_hot_minute; - } - valueChannel7 = sb.toString(); - channel7.setLatestRecord(new Record(new StringValue(valueChannel7), time)); - - String state; - if (valueChannel2 > 1.5) { - state = "ON"; - } - else { - state = "OFF"; - } - - printCounter++; - if (printCounter > 20) { - logger.info(CHANNEL_ID1 + ": " + valueChannel1 + " " + CHANNEL_ID2 + ": " + valueChannel2 + " " - + CHANNEL_ID3 + ": " + valueChannel3 + " state: " + state); - printCounter = 0; - } - try { - Thread.sleep(100); - } catch (InterruptedException e) { - logger.info("DemoApp thread interrupted"); - } - } - - if (channel4 != null) { - channel4.removeListener(this); - } - } - - /** - * This methods reacts on new records. - */ - @Override - public void newRecord(Record record) { - logger.info("Record listener got new record: " + record); - } -} diff --git a/demo/projects/simpledemoapp/src/main/resources/OSGI-INF/components.xml b/demo/projects/simpledemoapp/src/main/resources/OSGI-INF/components.xml deleted file mode 100644 index a7f795f9..00000000 --- a/demo/projects/simpledemoapp/src/main/resources/OSGI-INF/components.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - -