Emon
  •  
Options
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Friday 21 Oct 2011
8:23 pm

Robert Bausdorf

packages data, contol and device default logging level: INFO
packages data, contol and device default logging level: INFO
Options
    • -4
    • +2
    /branches/distributed/src/main/resources/log4j.properties
1:54 pm

Robert Bausdorf

respect manual override
respect manual override
Options
    • -4
    • +12
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/HeatingController.java
4:06 am

Robert Bausdorf

code redundancy removed
code redundancy removed
Options
    • -116
    • +41
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/FanController.java
    • -2
    • +2
    /branches/distributed/src/main/resources/device1/control.xml
    • -2
    • +87
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/InteractiveController.java
    • -111
    • +43
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/HeatingController.java
1:03 am

Robert Bausdorf

check initial settings form file and database
check initial settings form file and database
Options
    • -12
    • +55
    /branches/distributed/src/main/java/de/bausdorf/emon/control/Device.java
1:03 am

Robert Bausdorf

heating controller added
heating controller added
Options
    • -0
    • +1
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/FanController.java
    • -13
    • +24
    /branches/distributed/src/main/resources/device1/control.xml
    • -0
    • +185
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/HeatingController.java
    • -1
    • +1
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/ControlCommand.java
Thursday 20 Oct 2011
8:04 pm

Robert Bausdorf

+CommandQueue for intaractive switches
+CommandQueue for intaractive switches
Options
    • -0
    • +7
    /branches/distributed/src/main/java/de/bausdorf/emon/util/MessageConnector.java
    • -0
    • +22
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/AbstractBaseController.java
    • -34
    • +98
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/FanController.java
    • -0
    • +3
    /branches/distributed/src/main/resources/device1/control.xml
    • -0
    • +81
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/InteractiveController.java
    • -0
    • +71
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/ControlCommand.java
7:29 pm

Robert Bausdorf

use first state message as initial state
use first state message as initial state
Options
    • -3
    • +5
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/BaseSwitchImpl.java
5:39 pm

Robert Bausdorf

refactoring
refactoring
Options
    • -0
    • +1
    /branches/distributed/src/main/java/de/bausdorf/emon/control/Device.java
    • -1
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/BaseSwitchImpl.java
    • -108
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/util/Gallery.java
    • -126
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/control/FanController.java
    • -0
    • +69
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/AbstractBaseController.java
    • -0
    • +128
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/FanController.java
    • -2
    • +2
    /branches/distributed/src/main/resources/device1/control.xml
    • -69
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/control/AbstractBaseController.java
    • -1
    • +1
    /branches/distributed/src/main/java/de/bausdorf/emon/Launcher.java
    • -0
    • +73
    /branches/distributed/src/main/java/de/bausdorf/emon/control/impl/InfoController.java
    • -71
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/control/InfoController.java
5:33 pm

Robert Bausdorf

documentation
documentation
Options
    • -0
    • +22
    /branches/distributed/src/main/java/de/bausdorf/emon/data/Device.java
    • -4
    • +36
    /branches/distributed/src/main/java/de/bausdorf/emon/data/DataAggregator.java
5:18 pm

Robert Bausdorf

getter/setter for sensors
getter/setter for sensors
Options
    • -0
    • +8
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/JmsDataAggregator.java
4:33 pm

Robert Bausdorf

garbage deleted
garbage deleted
Options
    • -127
    • +0
    /branches/distributed/src/main/java/CommandLineSupport.java
    • -358
    • +0
    /branches/distributed/src/main/java/ConsumerTool.java
    • -211
    • +0
    /branches/distributed/src/main/java/TopicPublisher.java
    • -253
    • +0
    /branches/distributed/src/main/java/ProducerTool.java
    • -124
    • +0
    /branches/distributed/src/main/java/TopicListener.java
4:32 pm

Robert Bausdorf

use released emon-commons 1.0.0
use released emon-commons 1.0.0
Options
    • -1
    • +1
    /branches/distributed/pom.xml
3:58 pm

Robert Bausdorf

new device for data handling (aggregation, archiving)
new device for data handling (aggregation, archiving)
Options
    • -1
    • +1
    /branches/distributed/src/main/resources/device0/aggregator.xml
    • -0
    • +62
    /branches/distributed/src/main/java/de/bausdorf/emon/data/Device.java
    • -2
    • +9
    /branches/distributed/src/main/resources/device1/aggregator.xml
3:53 pm

Robert Bausdorf

refactoring
refactoring
Options
    • -38
    • +0
    /branches/distributed/src/test/java/de/bausdorf/emon/data/DataAggregatorTest.java
    • -0
    • +38
    /branches/distributed/src/test/java/de/bausdorf/emon/data/FileDataAggregatorTest.java
3:53 pm

Robert Bausdorf

new interface used by Device
new interface used by Device
Options
    • -0
    • +20
    /branches/distributed/src/main/java/de/bausdorf/emon/data/DataAggregator.java
3:53 pm

Robert Bausdorf

refactoring
refactoring
Options
    • -362
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/FileDataAggregator.java
    • -0
    • +413
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/FileDataAggregator.java
    • -264
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/SimpleAggregator.java
    • -0
    • +309
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/SimpleAggregator.java
    • -0
    • +278
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/JmsDataAggregator.java
    • -224
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/JmsDataAggregator.java
3:52 pm

Robert Bausdorf

unused classes removed
unused classes removed
Options
    • -35
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/DataListener.java
    • -112
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/util/MessageReciever.java
2:17 pm

Robert Bausdorf

refactoring
refactoring
Options
    • -0
    • +362
    /branches/distributed/src/main/java/de/bausdorf/emon/data/FileDataAggregator.java
    • -362
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/DataAggregator.java
2:11 pm

Robert Bausdorf

refactoring artefacts removed
refactoring artefacts removed
Options
  1. /branches/distributed/src/main/java/de/bausdorf/emon/web
2:08 pm

Robert Bausdorf

refactoring artefacts removed
refactoring artefacts removed
Options
  1. /branches/distributed/src/main/java/de/bausdorf/emon/sensors
  2. /branches/distributed/src/main/java/de/bausdorf/emon/web/preparer
2:07 pm

Robert Bausdorf

refactoring to split device reading an data aggregation
refactoring to split device reading an data aggregation
Options
    • -3
    • +3
    /branches/distributed/src/main/resources/device1/reader.xml
    • -1
    • +1
    /branches/distributed/src/main/resources/device0/reader.xml
    • -1
    • +1
    /branches/distributed/src/test/java/de/bausdorf/emon/data/DataProcessorTest.java
2:07 pm

Robert Bausdorf

html generation removed
html generation removed
Options
    • -1
    • +0
    /branches/distributed/src/main/resources/beans.xml
2:06 pm

Robert Bausdorf

refactoring to split device reading an data aggregation
refactoring to split device reading an data aggregation
Options
    • -35
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/CommandReader.java
    • -124
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/JmsCommandReader.java
    • -0
    • +293
    /branches/distributed/src/main/java/de/bausdorf/emon/device/Device.java
    • -131
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/JmsDataProcessor.java
    • -149
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/AbstractBaseDataProcessor.java
    • -89
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/FileCommandReader.java
    • -0
    • +53
    /branches/distributed/src/main/java/de/bausdorf/emon/device/SerialDataProcessor.java
    • -137
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/impl/FileDataProcessor.java
  9. /branches/distributed/src/main/java/de/bausdorf/emon/device/impl
    • -0
    • +149
    /branches/distributed/src/main/java/de/bausdorf/emon/device/impl/AbstractBaseDataProcessor.java
    • -0
    • +35
    /branches/distributed/src/main/java/de/bausdorf/emon/device/CommandReader.java
    • -0
    • +124
    /branches/distributed/src/main/java/de/bausdorf/emon/device/impl/JmsCommandReader.java
    • -0
    • +89
    /branches/distributed/src/main/java/de/bausdorf/emon/device/impl/FileCommandReader.java
    • -293
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/Device.java
    • -53
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/data/SerialDataProcessor.java
  16. … 3 more files in changeset.
2:05 pm

Robert Bausdorf

html generation removed
html generation removed
Options
    • -5
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/Component.java
2:05 pm

Robert Bausdorf

use FileSettings
use FileSettings
Options
    • -3
    • +4
    /branches/distributed/src/main/java/de/bausdorf/emon/localcontrol/Device.java
2:02 pm

Robert Bausdorf

html generation removed
html generation removed
Options
    • -42
    • +0
    /branches/distributed/src/test/java/de/bausdorf/emon/device/HtmlGeneratorTest.java
  2. /branches/distributed/src/test/java/de/bausdorf/emon/device
    • -204
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/web/preparer/DashboardPreparer.java
    • -151
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/web/preparer/CabinetDashboardPreparer.java
    • -39
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/web/ContextPreparer.java
    • -73
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/web/preparer/GalleryPreparer.java
    • -15
    • +0
    /branches/distributed/pom.xml
    • -163
    • +0
    /branches/distributed/src/main/java/de/bausdorf/emon/web/preparer/AbstractPreparerBase.java
1:47 pm

Robert Bausdorf

use FileSettings
use FileSettings
Options
    • -3
    • +4
    /branches/distributed/src/main/java/de/bausdorf/emon/control/Device.java
Wednesday 19 Oct 2011
6:00 pm

Robert Bausdorf

check, write and read settings from database too
check, write and read settings from database too
Options
    • -31
    • +79
    /branches/distributed/src/main/java/de/bausdorf/emon/control/Device.java
    • -1
    • +0
    /branches/distributed/src/test/java/de/bausdorf/emon/util/MessageConnectorTest.java
5:33 pm

Robert Bausdorf

unused package deleted
unused package deleted
Options
  1. /branches/distributed/src/test/java/de/bausdorf/emon/util/xml
5:32 pm

Robert Bausdorf

* schedule moved to commons…
* schedule moved to commons

* changes due to commons

Options
    • -3
    • +4
    /branches/distributed/src/main/java/de/bausdorf/emon/localcontrol/Device.java
    • -5
    • +6
    /branches/distributed/src/main/java/de/bausdorf/emon/control/Device.java
    • -1
    • +2
    /branches/distributed/src/main/java/de/bausdorf/emon/web/preparer/DashboardPreparer.java
    • -1
    • +2
    /branches/distributed/src/main/java/de/bausdorf/emon/web/preparer/CabinetDashboardPreparer.java
    • -80
    • +0
    /branches/distributed/src/test/java/de/bausdorf/emon/util/ScheduleTest.java
    • -63
    • +0
    /branches/distributed/src/test/java/de/bausdorf/emon/util/SettingsTest.java
Earlier activity No later activity