fix package name, start database handling

2017-11-21 17:53:11 +01:00
parent 7b36caf330
commit 5896212ed9
57 changed files with 367 additions and 225 deletions
--- a/bin/de/hottis/MeasurementCollector/AJmsQueue.class
+++ b/bin/de/hottis/MeasurementCollector/AJmsQueue.class
--- a/bin/de/hottis/MeasurementCollector/AMessageParser.class
+++ b/bin/de/hottis/MeasurementCollector/AMessageParser.class
--- a/bin/de/hottis/MeasurementCollector/DataObjectQueue.class
+++ b/bin/de/hottis/MeasurementCollector/DataObjectQueue.class
--- a/bin/de/hottis/MeasurementCollector/DatabaseEngine.class
+++ b/bin/de/hottis/MeasurementCollector/DatabaseEngine.class
--- a/bin/de/hottis/MeasurementCollector/JmsQueueProducer.class
+++ b/bin/de/hottis/MeasurementCollector/JmsQueueProducer.class
--- a/bin/de/hottis/MeasurementCollector/MBusParser.class
+++ b/bin/de/hottis/MeasurementCollector/MBusParser.class
--- a/bin/de/hottis/MeasurementCollector/MeasurementCollector.class
+++ b/bin/de/hottis/MeasurementCollector/MeasurementCollector.class
--- a/bin/de/hottis/MeasurementCollector/MeasurementCollectorException.class
+++ b/bin/de/hottis/MeasurementCollector/MeasurementCollectorException.class
--- a/bin/de/hottis/MeasurementCollector/TriggerTimer.class
+++ b/bin/de/hottis/MeasurementCollector/TriggerTimer.class
--- a/bin/de/hottis/measurementCollector/ADataObject.class
+++ b/bin/de/hottis/measurementCollector/ADataObject.class
--- a/bin/de/hottis/measurementCollector/ADataParser.class
+++ b/bin/de/hottis/measurementCollector/ADataParser.class
--- a/bin/de/hottis/measurementCollector/AMessageParser.class
+++ b/bin/de/hottis/measurementCollector/AMessageParser.class
--- a/bin/de/hottis/measurementCollector/DatabaseEngine.class
+++ b/bin/de/hottis/measurementCollector/DatabaseEngine.class
--- a/bin/de/hottis/measurementCollector/ElectricEnergyDataObject.class
+++ b/bin/de/hottis/measurementCollector/ElectricEnergyDataObject.class
--- a/bin/de/hottis/measurementCollector/FinderOnePhasePowerMeter.class
+++ b/bin/de/hottis/measurementCollector/FinderOnePhasePowerMeter.class
--- a/bin/de/hottis/measurementCollector/FinderThreePhasePowerMeter.class
+++ b/bin/de/hottis/measurementCollector/FinderThreePhasePowerMeter.class
--- a/bin/de/hottis/measurementCollector/HottisFourChannelThermometer.class
+++ b/bin/de/hottis/measurementCollector/HottisFourChannelThermometer.class
--- a/bin/de/hottis/measurementCollector/ITriggerable.class
+++ b/bin/de/hottis/measurementCollector/ITriggerable.class
--- a/bin/de/hottis/measurementCollector/JmsTopic$Mode.class
+++ b/bin/de/hottis/measurementCollector/JmsTopic$Mode.class
--- a/bin/de/hottis/measurementCollector/JmsTopic.class
+++ b/bin/de/hottis/measurementCollector/JmsTopic.class
--- a/bin/de/hottis/measurementCollector/MBusParser.class
+++ b/bin/de/hottis/measurementCollector/MBusParser.class
--- a/bin/de/hottis/measurementCollector/MeasurementCollector.class
+++ b/bin/de/hottis/measurementCollector/MeasurementCollector.class
--- a/bin/de/hottis/measurementCollector/MeasurementCollectorException.class
+++ b/bin/de/hottis/measurementCollector/MeasurementCollectorException.class
--- a/bin/de/hottis/measurementCollector/MeasurementDatabaseEngine.class
+++ b/bin/de/hottis/measurementCollector/MeasurementDatabaseEngine.class
--- a/bin/de/hottis/measurementCollector/MqttReceiver$Callback.class
+++ b/bin/de/hottis/measurementCollector/MqttReceiver$Callback.class
--- a/bin/de/hottis/measurementCollector/MqttReceiver.class
+++ b/bin/de/hottis/measurementCollector/MqttReceiver.class
--- a/bin/de/hottis/measurementCollector/MyQueue.class
+++ b/bin/de/hottis/measurementCollector/MyQueue.class
--- a/bin/de/hottis/measurementCollector/TemperatureDataObject.class
+++ b/bin/de/hottis/measurementCollector/TemperatureDataObject.class
--- a/bin/de/hottis/measurementCollector/TriggerTimer.class
+++ b/bin/de/hottis/measurementCollector/TriggerTimer.class
--- a/bin/measurementCollector.props
+++ b/bin/measurementCollector.props
@ -3,11 +3,15 @@ mqtt.broker = tcp://eupenstrasse20.dynamic.hottis.de:2883
 mqtt.username = tron
 mqtt.password = geheim123

-mbus.dataparser.1 = light,Light,de.hottis.MeasurementCollector.FinderOnePhasePowerMeter
-mbus.dataparser.2 = computer,Computer,de.hottis.MeasurementCollector.FinderOnePhasePowerMeter
-mbus.dataparser.3 = laundry,Laundry,de.hottis.MeasurementCollector.FinderOnePhasePowerMeter
-mbus.dataparser.4 = dryer,Dryer,de.hottis.MeasurementCollector.FinderOnePhasePowerMeter
-mbus.dataparser.5 = dishwasher,Dishwasher,de.hottis.MeasurementCollector.FinderOnePhasePowerMeter
-mbus.dataparser.6 = freezer,Freezer,de.hottis.MeasurementCollector.FinderOnePhasePowerMeter
-mbus.dataparser.7 = electricity,Total,de.hottis.MeasurementCollector.FinderThreePhasePowerMeter
-mbus.dataparser.8 = thermom.,null,de.hottis.MeasurementCollector.HottisFourChannelThermometer
+mbus.dataparser.1 = light,Light,de.hottis.measurementCollector.FinderOnePhasePowerMeter
+mbus.dataparser.2 = computer,Computer,de.hottis.measurementCollector.FinderOnePhasePowerMeter
+mbus.dataparser.3 = laundry,Laundry,de.hottis.measurementCollector.FinderOnePhasePowerMeter
+mbus.dataparser.4 = dryer,Dryer,de.hottis.measurementCollector.FinderOnePhasePowerMeter
+mbus.dataparser.5 = dishwasher,Dishwasher,de.hottis.measurementCollector.FinderOnePhasePowerMeter
+mbus.dataparser.6 = freezer,Freezer,de.hottis.measurementCollector.FinderOnePhasePowerMeter
+mbus.dataparser.7 = electricity,Total,de.hottis.measurementCollector.FinderThreePhasePowerMeter
+mbus.dataparser.8 = thermom.,null,de.hottis.measurementCollector.HottisFourChannelThermometer
+
+jms.broker = tcp://localhost:61616
+jms.clientid = mcol
+jms.parseddata.topic = IoT/Measurement
--- a/bin/measurementDataEngine.props
+++ b/bin/measurementDataEngine.props
@ -0,0 +1,5 @@
+db.period = 3600
+
+jms.broker = tcp://localhost:61616
+jms.clientid = mdb
+jms.parseddata.topic = IoT/Measurement