diff --git a/ARE/build.xml b/ARE/build.xml index 1a9f02a6f..6ade24e21 100644 --- a/ARE/build.xml +++ b/ARE/build.xml @@ -3,7 +3,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/ARE/components/actuator.GSMModem/build.xml b/ARE/components/actuator.GSMModem/build.xml index 46df694f6..6549423ea 100644 --- a/ARE/components/actuator.GSMModem/build.xml +++ b/ARE/components/actuator.GSMModem/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.analogout/build.xml b/ARE/components/actuator.analogout/build.xml index 636d95495..3a8520832 100644 --- a/ARE/components/actuator.analogout/build.xml +++ b/ARE/components/actuator.analogout/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.androidphonecontrol/build.xml b/ARE/components/actuator.androidphonecontrol/build.xml index 6c6396244..2b8370778 100644 --- a/ARE/components/actuator.androidphonecontrol/build.xml +++ b/ARE/components/actuator.androidphonecontrol/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.angularcursorcontrol/build.xml b/ARE/components/actuator.angularcursorcontrol/build.xml index 5c2cd0a25..b83e0882e 100644 --- a/ARE/components/actuator.angularcursorcontrol/build.xml +++ b/ARE/components/actuator.angularcursorcontrol/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.applicationlauncher/build.xml b/ARE/components/actuator.applicationlauncher/build.xml index d799b62e7..84fb46b92 100644 --- a/ARE/components/actuator.applicationlauncher/build.xml +++ b/ARE/components/actuator.applicationlauncher/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.arewindow/build.xml b/ARE/components/actuator.arewindow/build.xml index c6ef7c20c..ef2eaeb73 100644 --- a/ARE/components/actuator.arewindow/build.xml +++ b/ARE/components/actuator.arewindow/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.bardisplay/build.xml b/ARE/components/actuator.bardisplay/build.xml index b0bc6a4fd..48362bb02 100644 --- a/ARE/components/actuator.bardisplay/build.xml +++ b/ARE/components/actuator.bardisplay/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.crosshaircursorcontrol/build.xml b/ARE/components/actuator.crosshaircursorcontrol/build.xml index f6b9e7a91..e1eb84d69 100644 --- a/ARE/components/actuator.crosshaircursorcontrol/build.xml +++ b/ARE/components/actuator.crosshaircursorcontrol/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.dialogbox/build.xml b/ARE/components/actuator.dialogbox/build.xml index d849c45d6..6ec577b4c 100644 --- a/ARE/components/actuator.dialogbox/build.xml +++ b/ARE/components/actuator.dialogbox/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.digitalout/build.xml b/ARE/components/actuator.digitalout/build.xml index a4a17ccbe..e4379f8cc 100644 --- a/ARE/components/actuator.digitalout/build.xml +++ b/ARE/components/actuator.digitalout/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.dotmeter/build.xml b/ARE/components/actuator.dotmeter/build.xml index 4b8c19d7a..c949311f7 100644 --- a/ARE/components/actuator.dotmeter/build.xml +++ b/ARE/components/actuator.dotmeter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.easyhomecontrol/build.xml b/ARE/components/actuator.easyhomecontrol/build.xml index 2c43c7858..d531e3f86 100644 --- a/ARE/components/actuator.easyhomecontrol/build.xml +++ b/ARE/components/actuator.easyhomecontrol/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/actuator.emulatefaultyplugin/build.xml b/ARE/components/actuator.emulatefaultyplugin/build.xml index 2ea931cf0..66579e37d 100644 --- a/ARE/components/actuator.emulatefaultyplugin/build.xml +++ b/ARE/components/actuator.emulatefaultyplugin/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.enobiodisplay/build.xml b/ARE/components/actuator.enobiodisplay/build.xml index 708d7a238..eb23f7341 100644 --- a/ARE/components/actuator.enobiodisplay/build.xml +++ b/ARE/components/actuator.enobiodisplay/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.enocean/build.xml b/ARE/components/actuator.enocean/build.xml index 2bd71b0f8..051fb5691 100644 --- a/ARE/components/actuator.enocean/build.xml +++ b/ARE/components/actuator.enocean/build.xml @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/ARE/components/actuator.event_visualizer/build.xml b/ARE/components/actuator.event_visualizer/build.xml index 6cb1300ef..8d089bc9a 100644 --- a/ARE/components/actuator.event_visualizer/build.xml +++ b/ARE/components/actuator.event_visualizer/build.xml @@ -6,7 +6,7 @@ - + diff --git a/ARE/components/actuator.filewriter/build.xml b/ARE/components/actuator.filewriter/build.xml index 5a456147e..a96a3f64b 100644 --- a/ARE/components/actuator.filewriter/build.xml +++ b/ARE/components/actuator.filewriter/build.xml @@ -6,12 +6,12 @@ - + - + diff --git a/ARE/components/actuator.flickeringlightstimulator/build.xml b/ARE/components/actuator.flickeringlightstimulator/build.xml index 9c449e848..cd7acff9a 100644 --- a/ARE/components/actuator.flickeringlightstimulator/build.xml +++ b/ARE/components/actuator.flickeringlightstimulator/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.fs20sender/build.xml b/ARE/components/actuator.fs20sender/build.xml index c5bbae4ad..e86fdf660 100644 --- a/ARE/components/actuator.fs20sender/build.xml +++ b/ARE/components/actuator.fs20sender/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/actuator.gmailshortcuts/build.xml b/ARE/components/actuator.gmailshortcuts/build.xml index 35764e17c..958d9761c 100644 --- a/ARE/components/actuator.gmailshortcuts/build.xml +++ b/ARE/components/actuator.gmailshortcuts/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.gui_tester/build.xml b/ARE/components/actuator.gui_tester/build.xml index 0d67b3a12..026317dd2 100644 --- a/ARE/components/actuator.gui_tester/build.xml +++ b/ARE/components/actuator.gui_tester/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.imagebox/build.xml b/ARE/components/actuator.imagebox/build.xml index a956df2b6..02590d825 100644 --- a/ARE/components/actuator.imagebox/build.xml +++ b/ARE/components/actuator.imagebox/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.irtrans/build.xml b/ARE/components/actuator.irtrans/build.xml index dc63abf10..6b6b6aef5 100644 --- a/ARE/components/actuator.irtrans/build.xml +++ b/ARE/components/actuator.irtrans/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.keyboard/build.xml b/ARE/components/actuator.keyboard/build.xml index 952255e91..93351790b 100644 --- a/ARE/components/actuator.keyboard/build.xml +++ b/ARE/components/actuator.keyboard/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.knx/build.xml b/ARE/components/actuator.knx/build.xml index 5a7982cda..fc1c0ff50 100644 --- a/ARE/components/actuator.knx/build.xml +++ b/ARE/components/actuator.knx/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/actuator.linewriter/build.xml b/ARE/components/actuator.linewriter/build.xml index a95b4bc15..cf1a02866 100644 --- a/ARE/components/actuator.linewriter/build.xml +++ b/ARE/components/actuator.linewriter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.mediaplayer/build.xml b/ARE/components/actuator.mediaplayer/build.xml index 27d57167b..35713b473 100644 --- a/ARE/components/actuator.mediaplayer/build.xml +++ b/ARE/components/actuator.mediaplayer/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.midi/build.xml b/ARE/components/actuator.midi/build.xml index 121945d5c..efdce8992 100644 --- a/ARE/components/actuator.midi/build.xml +++ b/ARE/components/actuator.midi/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.modelSwitcher/build.xml b/ARE/components/actuator.modelSwitcher/build.xml index 1e6aee63c..36611dae9 100644 --- a/ARE/components/actuator.modelSwitcher/build.xml +++ b/ARE/components/actuator.modelSwitcher/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.mouse/build.xml b/ARE/components/actuator.mouse/build.xml index fd22907e9..ffc500f0c 100644 --- a/ARE/components/actuator.mouse/build.xml +++ b/ARE/components/actuator.mouse/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.mousecursoricon/build.xml b/ARE/components/actuator.mousecursoricon/build.xml index 63e9d7fd8..46cfc9ccf 100644 --- a/ARE/components/actuator.mousecursoricon/build.xml +++ b/ARE/components/actuator.mousecursoricon/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.netconnection/build.xml b/ARE/components/actuator.netconnection/build.xml index 75e8395e8..dfc445426 100644 --- a/ARE/components/actuator.netconnection/build.xml +++ b/ARE/components/actuator.netconnection/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.oscilloscope/build.xml b/ARE/components/actuator.oscilloscope/build.xml index 41b60a147..e86b0b132 100644 --- a/ARE/components/actuator.oscilloscope/build.xml +++ b/ARE/components/actuator.oscilloscope/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.oscoutclient/build.xml b/ARE/components/actuator.oscoutclient/build.xml index 680e27e40..d6bf4450f 100644 --- a/ARE/components/actuator.oscoutclient/build.xml +++ b/ARE/components/actuator.oscoutclient/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/actuator.phonecontrol/build.xml b/ARE/components/actuator.phonecontrol/build.xml index 658540344..c827e8dd9 100644 --- a/ARE/components/actuator.phonecontrol/build.xml +++ b/ARE/components/actuator.phonecontrol/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.picotts/build.xml b/ARE/components/actuator.picotts/build.xml index 75714c3ba..705706802 100644 --- a/ARE/components/actuator.picotts/build.xml +++ b/ARE/components/actuator.picotts/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.platformdigitalout/build.xml b/ARE/components/actuator.platformdigitalout/build.xml index 0f1a40229..fe74f3df5 100644 --- a/ARE/components/actuator.platformdigitalout/build.xml +++ b/ARE/components/actuator.platformdigitalout/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.platformlcd/build.xml b/ARE/components/actuator.platformlcd/build.xml index e2fa58758..d1b17650d 100644 --- a/ARE/components/actuator.platformlcd/build.xml +++ b/ARE/components/actuator.platformlcd/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.ponggame/build.xml b/ARE/components/actuator.ponggame/build.xml index 7256624c7..1d5284001 100644 --- a/ARE/components/actuator.ponggame/build.xml +++ b/ARE/components/actuator.ponggame/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.remotejoystick/build.xml b/ARE/components/actuator.remotejoystick/build.xml index 3ba20c1f5..01899c6c1 100644 --- a/ARE/components/actuator.remotejoystick/build.xml +++ b/ARE/components/actuator.remotejoystick/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.remotekeyboard/build.xml b/ARE/components/actuator.remotekeyboard/build.xml index 8a0b172a8..709a45513 100644 --- a/ARE/components/actuator.remotekeyboard/build.xml +++ b/ARE/components/actuator.remotekeyboard/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.remotemouse/build.xml b/ARE/components/actuator.remotemouse/build.xml index 444bd69c3..eecb27c46 100644 --- a/ARE/components/actuator.remotemouse/build.xml +++ b/ARE/components/actuator.remotemouse/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.remotetablet/build.xml b/ARE/components/actuator.remotetablet/build.xml index 2fc36c131..0076f39c9 100644 --- a/ARE/components/actuator.remotetablet/build.xml +++ b/ARE/components/actuator.remotetablet/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.remotewindow/build.xml b/ARE/components/actuator.remotewindow/build.xml index 51acda40b..d460e74c0 100644 --- a/ARE/components/actuator.remotewindow/build.xml +++ b/ARE/components/actuator.remotewindow/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.serialSender/build.xml b/ARE/components/actuator.serialSender/build.xml index de6414cad..6cc2aea7e 100644 --- a/ARE/components/actuator.serialSender/build.xml +++ b/ARE/components/actuator.serialSender/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.skype/build.xml b/ARE/components/actuator.skype/build.xml index a657650fb..448f85c1c 100644 --- a/ARE/components/actuator.skype/build.xml +++ b/ARE/components/actuator.skype/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.skywatchermount/build.xml b/ARE/components/actuator.skywatchermount/build.xml index e167d7d29..f5cb38e90 100644 --- a/ARE/components/actuator.skywatchermount/build.xml +++ b/ARE/components/actuator.skywatchermount/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.ssvepfilewriter/build.xml b/ARE/components/actuator.ssvepfilewriter/build.xml index 92c01f459..116421fff 100644 --- a/ARE/components/actuator.ssvepfilewriter/build.xml +++ b/ARE/components/actuator.ssvepfilewriter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.ssvepstimulator/build.xml b/ARE/components/actuator.ssvepstimulator/build.xml index 5dd19a6e9..186e7cd5d 100644 --- a/ARE/components/actuator.ssvepstimulator/build.xml +++ b/ARE/components/actuator.ssvepstimulator/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.syntheticvoice/build.xml b/ARE/components/actuator.syntheticvoice/build.xml index f70daa779..428fd6b16 100644 --- a/ARE/components/actuator.syntheticvoice/build.xml +++ b/ARE/components/actuator.syntheticvoice/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.teensyrc/build.xml b/ARE/components/actuator.teensyrc/build.xml index 2c6a028f2..d0c2973ea 100644 --- a/ARE/components/actuator.teensyrc/build.xml +++ b/ARE/components/actuator.teensyrc/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.textarea/build.xml b/ARE/components/actuator.textarea/build.xml index b38dce18b..a28892a7c 100644 --- a/ARE/components/actuator.textarea/build.xml +++ b/ARE/components/actuator.textarea/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.textdisplay/build.xml b/ARE/components/actuator.textdisplay/build.xml index 31ebe9749..f2a4a5fa5 100644 --- a/ARE/components/actuator.textdisplay/build.xml +++ b/ARE/components/actuator.textdisplay/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.tonegenerator/build.xml b/ARE/components/actuator.tonegenerator/build.xml index ce9854d7b..4ba956e1d 100644 --- a/ARE/components/actuator.tonegenerator/build.xml +++ b/ARE/components/actuator.tonegenerator/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.tooltip/build.xml b/ARE/components/actuator.tooltip/build.xml index 7870828cc..ea05e160b 100644 --- a/ARE/components/actuator.tooltip/build.xml +++ b/ARE/components/actuator.tooltip/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.wavefileplayer/build.xml b/ARE/components/actuator.wavefileplayer/build.xml index 75f2b95d4..3df5ec1ba 100644 --- a/ARE/components/actuator.wavefileplayer/build.xml +++ b/ARE/components/actuator.wavefileplayer/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.writecsv/build.xml b/ARE/components/actuator.writecsv/build.xml index 6664bb5e7..35bea8ea4 100644 --- a/ARE/components/actuator.writecsv/build.xml +++ b/ARE/components/actuator.writecsv/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/actuator.writeedf/build.xml b/ARE/components/actuator.writeedf/build.xml index 4408f4ac9..252dee592 100644 --- a/ARE/components/actuator.writeedf/build.xml +++ b/ARE/components/actuator.writeedf/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.acousticscanning/build.xml b/ARE/components/processor.acousticscanning/build.xml index 7ab94d19d..a7c670912 100644 --- a/ARE/components/processor.acousticscanning/build.xml +++ b/ARE/components/processor.acousticscanning/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/processor.adjustmentcurve/build.xml b/ARE/components/processor.adjustmentcurve/build.xml index 4eefc3110..d93f0c83b 100644 --- a/ARE/components/processor.adjustmentcurve/build.xml +++ b/ARE/components/processor.adjustmentcurve/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.amplifier/build.xml b/ARE/components/processor.amplifier/build.xml index fcff272f8..5d0fb9a36 100644 --- a/ARE/components/processor.amplifier/build.xml +++ b/ARE/components/processor.amplifier/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.arduino/build.xml b/ARE/components/processor.arduino/build.xml index 7c2bd110c..003d57a01 100644 --- a/ARE/components/processor.arduino/build.xml +++ b/ARE/components/processor.arduino/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.audioselector/build.xml b/ARE/components/processor.audioselector/build.xml index 23f75dfa7..f95f46cd3 100644 --- a/ARE/components/processor.audioselector/build.xml +++ b/ARE/components/processor.audioselector/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.averager/build.xml b/ARE/components/processor.averager/build.xml index 5708996a4..dc59fe146 100644 --- a/ARE/components/processor.averager/build.xml +++ b/ARE/components/processor.averager/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.basictralgorithms/build.xml b/ARE/components/processor.basictralgorithms/build.xml index 8c137e705..9516467f9 100644 --- a/ARE/components/processor.basictralgorithms/build.xml +++ b/ARE/components/processor.basictralgorithms/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.benchmark/build.xml b/ARE/components/processor.benchmark/build.xml index 2ae65220c..c7e158892 100644 --- a/ARE/components/processor.benchmark/build.xml +++ b/ARE/components/processor.benchmark/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.blinkdetector/build.xml b/ARE/components/processor.blinkdetector/build.xml index e3bfb4ed6..f7b87624c 100644 --- a/ARE/components/processor.blinkdetector/build.xml +++ b/ARE/components/processor.blinkdetector/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.blinkdetectortrainer/build.xml b/ARE/components/processor.blinkdetectortrainer/build.xml index b52d98fa9..3e9c8b94d 100644 --- a/ARE/components/processor.blinkdetectortrainer/build.xml +++ b/ARE/components/processor.blinkdetectortrainer/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.comparator/build.xml b/ARE/components/processor.comparator/build.xml index db2d334fc..2765112c9 100644 --- a/ARE/components/processor.comparator/build.xml +++ b/ARE/components/processor.comparator/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.comport/build.xml b/ARE/components/processor.comport/build.xml index c7201f4eb..89a691678 100644 --- a/ARE/components/processor.comport/build.xml +++ b/ARE/components/processor.comport/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.computebandpower/build.xml b/ARE/components/processor.computebandpower/build.xml index 2e0e74532..7965d4544 100644 --- a/ARE/components/processor.computebandpower/build.xml +++ b/ARE/components/processor.computebandpower/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.constantdispatcher/build.xml b/ARE/components/processor.constantdispatcher/build.xml index cda38682b..a989929eb 100644 --- a/ARE/components/processor.constantdispatcher/build.xml +++ b/ARE/components/processor.constantdispatcher/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.datatype/build.xml b/ARE/components/processor.datatype/build.xml index e3329fce1..59ef38aba 100644 --- a/ARE/components/processor.datatype/build.xml +++ b/ARE/components/processor.datatype/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.deadzone/build.xml b/ARE/components/processor.deadzone/build.xml index 94028b6da..81164d321 100644 --- a/ARE/components/processor.deadzone/build.xml +++ b/ARE/components/processor.deadzone/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.decimation/build.xml b/ARE/components/processor.decimation/build.xml index e7f78c100..a05e791a9 100644 --- a/ARE/components/processor.decimation/build.xml +++ b/ARE/components/processor.decimation/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.delay/build.xml b/ARE/components/processor.delay/build.xml index c6ec2e2c6..23c2d281f 100644 --- a/ARE/components/processor.delay/build.xml +++ b/ARE/components/processor.delay/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.derivative/build.xml b/ARE/components/processor.derivative/build.xml index 53a4173b8..e9c46097c 100644 --- a/ARE/components/processor.derivative/build.xml +++ b/ARE/components/processor.derivative/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.differentiate/build.xml b/ARE/components/processor.differentiate/build.xml index 1893e11fa..77867bfee 100644 --- a/ARE/components/processor.differentiate/build.xml +++ b/ARE/components/processor.differentiate/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.dissimilarity/build.xml b/ARE/components/processor.dissimilarity/build.xml index 48ed01ef8..a0b10bdff 100644 --- a/ARE/components/processor.dissimilarity/build.xml +++ b/ARE/components/processor.dissimilarity/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.doubletostring/build.xml b/ARE/components/processor.doubletostring/build.xml index 113408294..9a5ddce7d 100644 --- a/ARE/components/processor.doubletostring/build.xml +++ b/ARE/components/processor.doubletostring/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.ecmascriptinterpreter/build.xml b/ARE/components/processor.ecmascriptinterpreter/build.xml index b9981a188..5110782c6 100644 --- a/ARE/components/processor.ecmascriptinterpreter/build.xml +++ b/ARE/components/processor.ecmascriptinterpreter/build.xml @@ -7,13 +7,13 @@ - + - + diff --git a/ARE/components/processor.eventblock/build.xml b/ARE/components/processor.eventblock/build.xml index ecba56836..9c245b27c 100644 --- a/ARE/components/processor.eventblock/build.xml +++ b/ARE/components/processor.eventblock/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.eventcascade/build.xml b/ARE/components/processor.eventcascade/build.xml index a2a9051e7..de7367377 100644 --- a/ARE/components/processor.eventcascade/build.xml +++ b/ARE/components/processor.eventcascade/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.eventcounter/build.xml b/ARE/components/processor.eventcounter/build.xml index a42b989e3..c9c70720d 100644 --- a/ARE/components/processor.eventcounter/build.xml +++ b/ARE/components/processor.eventcounter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.eventdelay/build.xml b/ARE/components/processor.eventdelay/build.xml index 179ddfb60..0c7f0441a 100644 --- a/ARE/components/processor.eventdelay/build.xml +++ b/ARE/components/processor.eventdelay/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.eventdispatcher/build.xml b/ARE/components/processor.eventdispatcher/build.xml index 796e6feb3..6fe73a0a8 100644 --- a/ARE/components/processor.eventdispatcher/build.xml +++ b/ARE/components/processor.eventdispatcher/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.eventflipflop/build.xml b/ARE/components/processor.eventflipflop/build.xml index 75e116195..d1e8a68fa 100644 --- a/ARE/components/processor.eventflipflop/build.xml +++ b/ARE/components/processor.eventflipflop/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.eventrouter/build.xml b/ARE/components/processor.eventrouter/build.xml index 82f18c5ce..423d5fcd1 100644 --- a/ARE/components/processor.eventrouter/build.xml +++ b/ARE/components/processor.eventrouter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.eventstatemachine/build.xml b/ARE/components/processor.eventstatemachine/build.xml index 1718e78f8..ca53a47d3 100644 --- a/ARE/components/processor.eventstatemachine/build.xml +++ b/ARE/components/processor.eventstatemachine/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.fabi/build.xml b/ARE/components/processor.fabi/build.xml index 087ff3e16..d63a57a76 100644 --- a/ARE/components/processor.fabi/build.xml +++ b/ARE/components/processor.fabi/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.fabicronusmax/build.xml b/ARE/components/processor.fabicronusmax/build.xml index 038a7ab47..2abe6842a 100644 --- a/ARE/components/processor.fabicronusmax/build.xml +++ b/ARE/components/processor.fabicronusmax/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.filter/build.xml b/ARE/components/processor.filter/build.xml index c5dfc14a2..c2eaee756 100644 --- a/ARE/components/processor.filter/build.xml +++ b/ARE/components/processor.filter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.fs20commandinterpreter/build.xml b/ARE/components/processor.fs20commandinterpreter/build.xml index 5646ae085..445572048 100644 --- a/ARE/components/processor.fs20commandinterpreter/build.xml +++ b/ARE/components/processor.fs20commandinterpreter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.hrvanalysis/build.xml b/ARE/components/processor.hrvanalysis/build.xml index 2ebef7595..8c5031b4f 100644 --- a/ARE/components/processor.hrvanalysis/build.xml +++ b/ARE/components/processor.hrvanalysis/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.iirfilter/build.xml b/ARE/components/processor.iirfilter/build.xml index d2f3bbe84..591be4383 100644 --- a/ARE/components/processor.iirfilter/build.xml +++ b/ARE/components/processor.iirfilter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.integrate/build.xml b/ARE/components/processor.integrate/build.xml index e779ed875..e4d986ef6 100644 --- a/ARE/components/processor.integrate/build.xml +++ b/ARE/components/processor.integrate/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.inttostring/build.xml b/ARE/components/processor.inttostring/build.xml index feadecf3a..513f01c40 100644 --- a/ARE/components/processor.inttostring/build.xml +++ b/ARE/components/processor.inttostring/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.irmicro/build.xml b/ARE/components/processor.irmicro/build.xml index 23f3a27ce..82bc80696 100644 --- a/ARE/components/processor.irmicro/build.xml +++ b/ARE/components/processor.irmicro/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.mathevaluator/build.xml b/ARE/components/processor.mathevaluator/build.xml index 189f3739b..3e7041940 100644 --- a/ARE/components/processor.mathevaluator/build.xml +++ b/ARE/components/processor.mathevaluator/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.minmax/build.xml b/ARE/components/processor.minmax/build.xml index b60c875dc..21d7179eb 100644 --- a/ARE/components/processor.minmax/build.xml +++ b/ARE/components/processor.minmax/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.motionanalysis/build.xml b/ARE/components/processor.motionanalysis/build.xml index dd10525bf..73b324e0e 100644 --- a/ARE/components/processor.motionanalysis/build.xml +++ b/ARE/components/processor.motionanalysis/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.multisource/build.xml b/ARE/components/processor.multisource/build.xml index 7af575730..588ca0a8d 100644 --- a/ARE/components/processor.multisource/build.xml +++ b/ARE/components/processor.multisource/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.multisourcestring/build.xml b/ARE/components/processor.multisourcestring/build.xml index 6612d37e4..8b00740be 100644 --- a/ARE/components/processor.multisourcestring/build.xml +++ b/ARE/components/processor.multisourcestring/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.neuralnetworkloader/build.xml b/ARE/components/processor.neuralnetworkloader/build.xml index 82b6ce9e1..a856fb390 100644 --- a/ARE/components/processor.neuralnetworkloader/build.xml +++ b/ARE/components/processor.neuralnetworkloader/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.nexusconnector/build.xml b/ARE/components/processor.nexusconnector/build.xml index 6153d1b0f..672c71cd6 100644 --- a/ARE/components/processor.nexusconnector/build.xml +++ b/ARE/components/processor.nexusconnector/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.oneeventmanyactions/build.xml b/ARE/components/processor.oneeventmanyactions/build.xml index 4c8fdbe52..12143c64a 100644 --- a/ARE/components/processor.oneeventmanyactions/build.xml +++ b/ARE/components/processor.oneeventmanyactions/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.openhab/build.xml b/ARE/components/processor.openhab/build.xml index 3c3b41140..8b7c2a1a6 100644 --- a/ARE/components/processor.openhab/build.xml +++ b/ARE/components/processor.openhab/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.oscgesturefollower/build.xml b/ARE/components/processor.oscgesturefollower/build.xml index ea244e94b..06ea32db2 100644 --- a/ARE/components/processor.oscgesturefollower/build.xml +++ b/ARE/components/processor.oscgesturefollower/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/processor.oska/build.xml b/ARE/components/processor.oska/build.xml index 45e960c84..59e9b6b3c 100644 --- a/ARE/components/processor.oska/build.xml +++ b/ARE/components/processor.oska/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.pathmultiplexer/build.xml b/ARE/components/processor.pathmultiplexer/build.xml index ad8540fdf..bb903a202 100644 --- a/ARE/components/processor.pathmultiplexer/build.xml +++ b/ARE/components/processor.pathmultiplexer/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.pathselector/build.xml b/ARE/components/processor.pathselector/build.xml index 415a244fb..4bfcce5fe 100644 --- a/ARE/components/processor.pathselector/build.xml +++ b/ARE/components/processor.pathselector/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.peakdetector/build.xml b/ARE/components/processor.peakdetector/build.xml index a8652bfee..e6de7920a 100644 --- a/ARE/components/processor.peakdetector/build.xml +++ b/ARE/components/processor.peakdetector/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.protocolssveptrain/build.xml b/ARE/components/processor.protocolssveptrain/build.xml index 4a48e0105..4136fa454 100644 --- a/ARE/components/processor.protocolssveptrain/build.xml +++ b/ARE/components/processor.protocolssveptrain/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.quantizer/build.xml b/ARE/components/processor.quantizer/build.xml index 6da19ee2d..913e8088c 100644 --- a/ARE/components/processor.quantizer/build.xml +++ b/ARE/components/processor.quantizer/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.regularexpression/build.xml b/ARE/components/processor.regularexpression/build.xml index 84b177c4b..7d15bb960 100644 --- a/ARE/components/processor.regularexpression/build.xml +++ b/ARE/components/processor.regularexpression/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.relativemovesampler/build.xml b/ARE/components/processor.relativemovesampler/build.xml index af43cede3..0958484c8 100644 --- a/ARE/components/processor.relativemovesampler/build.xml +++ b/ARE/components/processor.relativemovesampler/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.sampleandhold/build.xml b/ARE/components/processor.sampleandhold/build.xml index fe8fd3fde..ec62e1f61 100644 --- a/ARE/components/processor.sampleandhold/build.xml +++ b/ARE/components/processor.sampleandhold/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.sampler/build.xml b/ARE/components/processor.sampler/build.xml index 2d81a67f8..7111dbdae 100644 --- a/ARE/components/processor.sampler/build.xml +++ b/ARE/components/processor.sampler/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.serialport/build.xml b/ARE/components/processor.serialport/build.xml index becfff083..fbf1a17cb 100644 --- a/ARE/components/processor.serialport/build.xml +++ b/ARE/components/processor.serialport/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.signaltranslation/build.xml b/ARE/components/processor.signaltranslation/build.xml index c20a507ec..7574b07b2 100644 --- a/ARE/components/processor.signaltranslation/build.xml +++ b/ARE/components/processor.signaltranslation/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.speechprocessor/build.xml b/ARE/components/processor.speechprocessor/build.xml index b9ed2ec9b..c184eeea9 100644 --- a/ARE/components/processor.speechprocessor/build.xml +++ b/ARE/components/processor.speechprocessor/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.ssvepdetect/build.xml b/ARE/components/processor.ssvepdetect/build.xml index 386cd19cb..538e69b55 100644 --- a/ARE/components/processor.ssvepdetect/build.xml +++ b/ARE/components/processor.ssvepdetect/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringappend/build.xml b/ARE/components/processor.stringappend/build.xml index 530b303c2..573a1a2f3 100644 --- a/ARE/components/processor.stringappend/build.xml +++ b/ARE/components/processor.stringappend/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringdelay/build.xml b/ARE/components/processor.stringdelay/build.xml index 0f34280d1..0ebb96fb9 100644 --- a/ARE/components/processor.stringdelay/build.xml +++ b/ARE/components/processor.stringdelay/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringdispatcher/build.xml b/ARE/components/processor.stringdispatcher/build.xml index c57035d4c..d47812f3f 100644 --- a/ARE/components/processor.stringdispatcher/build.xml +++ b/ARE/components/processor.stringdispatcher/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringexpander/build.xml b/ARE/components/processor.stringexpander/build.xml index 90b532597..05ce24997 100644 --- a/ARE/components/processor.stringexpander/build.xml +++ b/ARE/components/processor.stringexpander/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringfilter/build.xml b/ARE/components/processor.stringfilter/build.xml index d6e306108..d7f79de6b 100644 --- a/ARE/components/processor.stringfilter/build.xml +++ b/ARE/components/processor.stringfilter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringformatter/build.xml b/ARE/components/processor.stringformatter/build.xml index 88dfa3fd6..a39ab138b 100644 --- a/ARE/components/processor.stringformatter/build.xml +++ b/ARE/components/processor.stringformatter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringpathmultiplexer/build.xml b/ARE/components/processor.stringpathmultiplexer/build.xml index 43066f657..aee7f9bff 100644 --- a/ARE/components/processor.stringpathmultiplexer/build.xml +++ b/ARE/components/processor.stringpathmultiplexer/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringpathselector/build.xml b/ARE/components/processor.stringpathselector/build.xml index 12c4591d5..7709a0439 100644 --- a/ARE/components/processor.stringpathselector/build.xml +++ b/ARE/components/processor.stringpathselector/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringsplitter/build.xml b/ARE/components/processor.stringsplitter/build.xml index a1f494ac2..24d2b3c94 100644 --- a/ARE/components/processor.stringsplitter/build.xml +++ b/ARE/components/processor.stringsplitter/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringtodouble/build.xml b/ARE/components/processor.stringtodouble/build.xml index 99f5552a9..fc20285cb 100644 --- a/ARE/components/processor.stringtodouble/build.xml +++ b/ARE/components/processor.stringtodouble/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.stringtoint/build.xml b/ARE/components/processor.stringtoint/build.xml index c75db46c3..98131cdc0 100644 --- a/ARE/components/processor.stringtoint/build.xml +++ b/ARE/components/processor.stringtoint/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.textsender/build.xml b/ARE/components/processor.textsender/build.xml index 8224d10ed..a037e1d00 100644 --- a/ARE/components/processor.textsender/build.xml +++ b/ARE/components/processor.textsender/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.threshold/build.xml b/ARE/components/processor.threshold/build.xml index 82c9be9ff..505b54b8a 100644 --- a/ARE/components/processor.threshold/build.xml +++ b/ARE/components/processor.threshold/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.universalremotecontrol/build.xml b/ARE/components/processor.universalremotecontrol/build.xml index eef0c9341..f1e3a663c 100644 --- a/ARE/components/processor.universalremotecontrol/build.xml +++ b/ARE/components/processor.universalremotecontrol/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.websocket/build.xml b/ARE/components/processor.websocket/build.xml index 2757c7dd8..5df3b8e77 100644 --- a/ARE/components/processor.websocket/build.xml +++ b/ARE/components/processor.websocket/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/processor.yaak/build.xml b/ARE/components/processor.yaak/build.xml index 30dd8dbd6..ca6ad5b00 100644 --- a/ARE/components/processor.yaak/build.xml +++ b/ARE/components/processor.yaak/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/proxy.remoteconsumer/build.xml b/ARE/components/proxy.remoteconsumer/build.xml index e24967f81..c7273ad02 100644 --- a/ARE/components/proxy.remoteconsumer/build.xml +++ b/ARE/components/proxy.remoteconsumer/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.XfacetrackerLK/build.xml b/ARE/components/sensor.XfacetrackerLK/build.xml index 4ba3fa654..22510ee2e 100644 --- a/ARE/components/sensor.XfacetrackerLK/build.xml +++ b/ARE/components/sensor.XfacetrackerLK/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.acceleration/build.xml b/ARE/components/sensor.acceleration/build.xml index 8e095025b..4d3827b5c 100644 --- a/ARE/components/sensor.acceleration/build.xml +++ b/ARE/components/sensor.acceleration/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.analogin/build.xml b/ARE/components/sensor.analogin/build.xml index 3afab58b6..e13d5d64b 100644 --- a/ARE/components/sensor.analogin/build.xml +++ b/ARE/components/sensor.analogin/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.autostartevent/build.xml b/ARE/components/sensor.autostartevent/build.xml index b62f9dabe..9d5c458e7 100644 --- a/ARE/components/sensor.autostartevent/build.xml +++ b/ARE/components/sensor.autostartevent/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.buttongrid/build.xml b/ARE/components/sensor.buttongrid/build.xml index 99b712a7d..f16670a73 100644 --- a/ARE/components/sensor.buttongrid/build.xml +++ b/ARE/components/sensor.buttongrid/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.cellboard/build.xml b/ARE/components/sensor.cellboard/build.xml index 56c9637c0..67fd26901 100644 --- a/ARE/components/sensor.cellboard/build.xml +++ b/ARE/components/sensor.cellboard/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.digitalin/build.xml b/ARE/components/sensor.digitalin/build.xml index a3787e4da..9c459fe12 100644 --- a/ARE/components/sensor.digitalin/build.xml +++ b/ARE/components/sensor.digitalin/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.editbox/build.xml b/ARE/components/sensor.editbox/build.xml index eb1df27cd..02121b1ab 100644 --- a/ARE/components/sensor.editbox/build.xml +++ b/ARE/components/sensor.editbox/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.enobio/build.xml b/ARE/components/sensor.enobio/build.xml index ef9882fb7..6b895b892 100644 --- a/ARE/components/sensor.enobio/build.xml +++ b/ARE/components/sensor.enobio/build.xml @@ -6,7 +6,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/ARE/components/sensor.eog/build.xml b/ARE/components/sensor.eog/build.xml index eb0b235f9..dc95eef72 100644 --- a/ARE/components/sensor.eog/build.xml +++ b/ARE/components/sensor.eog/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.eshoe/build.xml b/ARE/components/sensor.eshoe/build.xml index aef9479ed..870798399 100644 --- a/ARE/components/sensor.eshoe/build.xml +++ b/ARE/components/sensor.eshoe/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.event_generator/build.xml b/ARE/components/sensor.event_generator/build.xml index 77f06996f..4edd27992 100644 --- a/ARE/components/sensor.event_generator/build.xml +++ b/ARE/components/sensor.event_generator/build.xml @@ -5,7 +5,7 @@ - + diff --git a/ARE/components/sensor.eyetracker/build.xml b/ARE/components/sensor.eyetracker/build.xml index 03205a085..e642c36f0 100644 --- a/ARE/components/sensor.eyetracker/build.xml +++ b/ARE/components/sensor.eyetracker/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.eyetribe/build.xml b/ARE/components/sensor.eyetribe/build.xml index 1ce89c755..b44406943 100644 --- a/ARE/components/sensor.eyetribe/build.xml +++ b/ARE/components/sensor.eyetribe/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/sensor.eyex/build.xml b/ARE/components/sensor.eyex/build.xml index b830f487b..8721842dd 100644 --- a/ARE/components/sensor.eyex/build.xml +++ b/ARE/components/sensor.eyex/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.facetrackerCLM/build.xml b/ARE/components/sensor.facetrackerCLM/build.xml index 861d6e6ae..48dba384d 100644 --- a/ARE/components/sensor.facetrackerCLM/build.xml +++ b/ARE/components/sensor.facetrackerCLM/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.facetrackerLK/build.xml b/ARE/components/sensor.facetrackerLK/build.xml index c445c7b2d..4f0dd475e 100644 --- a/ARE/components/sensor.facetrackerLK/build.xml +++ b/ARE/components/sensor.facetrackerLK/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.folderbrowser/build.xml b/ARE/components/sensor.folderbrowser/build.xml index d5d67bac9..4dd0a20b7 100644 --- a/ARE/components/sensor.folderbrowser/build.xml +++ b/ARE/components/sensor.folderbrowser/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.fourdjoystick/build.xml b/ARE/components/sensor.fourdjoystick/build.xml index 081f36072..bf476967d 100644 --- a/ARE/components/sensor.fourdjoystick/build.xml +++ b/ARE/components/sensor.fourdjoystick/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.fs20receiver/build.xml b/ARE/components/sensor.fs20receiver/build.xml index f04609fe5..94d7e506a 100644 --- a/ARE/components/sensor.fs20receiver/build.xml +++ b/ARE/components/sensor.fs20receiver/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/sensor.headpositionhc/build.xml b/ARE/components/sensor.headpositionhc/build.xml index 1dd218e08..4b189bf2b 100644 --- a/ARE/components/sensor.headpositionhc/build.xml +++ b/ARE/components/sensor.headpositionhc/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.hoverpanel/build.xml b/ARE/components/sensor.hoverpanel/build.xml index 78a876521..770cdd195 100644 --- a/ARE/components/sensor.hoverpanel/build.xml +++ b/ARE/components/sensor.hoverpanel/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.intelrealsense/build.xml b/ARE/components/sensor.intelrealsense/build.xml index dcbf9678e..0d2f4b291 100644 --- a/ARE/components/sensor.intelrealsense/build.xml +++ b/ARE/components/sensor.intelrealsense/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.joystickcapture/build.xml b/ARE/components/sensor.joystickcapture/build.xml index 89a848b05..74cce55f7 100644 --- a/ARE/components/sensor.joystickcapture/build.xml +++ b/ARE/components/sensor.joystickcapture/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.keyboardcapture/build.xml b/ARE/components/sensor.keyboardcapture/build.xml index 46392e8f8..22d4094a3 100644 --- a/ARE/components/sensor.keyboardcapture/build.xml +++ b/ARE/components/sensor.keyboardcapture/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.keycapture/build.xml b/ARE/components/sensor.keycapture/build.xml index 4ca3089fe..1fc32a5b6 100644 --- a/ARE/components/sensor.keycapture/build.xml +++ b/ARE/components/sensor.keycapture/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.kinect/build.xml b/ARE/components/sensor.kinect/build.xml index 37730ea10..87c4831d1 100644 --- a/ARE/components/sensor.kinect/build.xml +++ b/ARE/components/sensor.kinect/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.kinectj4k/build.xml b/ARE/components/sensor.kinectj4k/build.xml index b974df96b..69e8f8656 100644 --- a/ARE/components/sensor.kinectj4k/build.xml +++ b/ARE/components/sensor.kinectj4k/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.lightscore/build.xml b/ARE/components/sensor.lightscore/build.xml index 0f0f7bc1a..1380d6ea3 100644 --- a/ARE/components/sensor.lightscore/build.xml +++ b/ARE/components/sensor.lightscore/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.linereader/build.xml b/ARE/components/sensor.linereader/build.xml index 8133f1f61..be9b11c72 100644 --- a/ARE/components/sensor.linereader/build.xml +++ b/ARE/components/sensor.linereader/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.lipmouse/build.xml b/ARE/components/sensor.lipmouse/build.xml index 6308ef1d7..02b62aad1 100644 --- a/ARE/components/sensor.lipmouse/build.xml +++ b/ARE/components/sensor.lipmouse/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.lipmouseir/build.xml b/ARE/components/sensor.lipmouseir/build.xml index 4a2759a76..bd85a61ba 100644 --- a/ARE/components/sensor.lipmouseir/build.xml +++ b/ARE/components/sensor.lipmouseir/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.micgpi/build.xml b/ARE/components/sensor.micgpi/build.xml index e91dd84fa..4d10f5632 100644 --- a/ARE/components/sensor.micgpi/build.xml +++ b/ARE/components/sensor.micgpi/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.mousecapture/build.xml b/ARE/components/sensor.mousecapture/build.xml index b60b0e5eb..8e20504df 100644 --- a/ARE/components/sensor.mousecapture/build.xml +++ b/ARE/components/sensor.mousecapture/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.openBCI/build.xml b/ARE/components/sensor.openBCI/build.xml index 8d306d82d..1c8790324 100644 --- a/ARE/components/sensor.openBCI/build.xml +++ b/ARE/components/sensor.openBCI/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.openvibe/build.xml b/ARE/components/sensor.openvibe/build.xml index da13be0e7..79a1c8b03 100644 --- a/ARE/components/sensor.openvibe/build.xml +++ b/ARE/components/sensor.openvibe/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/sensor.oscserver/build.xml b/ARE/components/sensor.oscserver/build.xml index 6c5b0e7f4..b6300315a 100644 --- a/ARE/components/sensor.oscserver/build.xml +++ b/ARE/components/sensor.oscserver/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/components/sensor.p2_parser/build.xml b/ARE/components/sensor.p2_parser/build.xml index a00a87cc4..1e102c8c4 100644 --- a/ARE/components/sensor.p2_parser/build.xml +++ b/ARE/components/sensor.p2_parser/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.platformanalogin/build.xml b/ARE/components/sensor.platformanalogin/build.xml index 0edc5c317..0927668f3 100644 --- a/ARE/components/sensor.platformanalogin/build.xml +++ b/ARE/components/sensor.platformanalogin/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.platformdigitalin/build.xml b/ARE/components/sensor.platformdigitalin/build.xml index 09b151258..bddd1f3ca 100644 --- a/ARE/components/sensor.platformdigitalin/build.xml +++ b/ARE/components/sensor.platformdigitalin/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.proximity/build.xml b/ARE/components/sensor.proximity/build.xml index faa2eb92f..ef47622d4 100644 --- a/ARE/components/sensor.proximity/build.xml +++ b/ARE/components/sensor.proximity/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.randomnumber/build.xml b/ARE/components/sensor.randomnumber/build.xml index 4960e32b2..32a540bee 100644 --- a/ARE/components/sensor.randomnumber/build.xml +++ b/ARE/components/sensor.randomnumber/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.razorimu/build.xml b/ARE/components/sensor.razorimu/build.xml index 390020f9f..be1a3185b 100644 --- a/ARE/components/sensor.razorimu/build.xml +++ b/ARE/components/sensor.razorimu/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.readcsv/build.xml b/ARE/components/sensor.readcsv/build.xml index beadf7e07..23d4e76b7 100644 --- a/ARE/components/sensor.readcsv/build.xml +++ b/ARE/components/sensor.readcsv/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.readedf/build.xml b/ARE/components/sensor.readedf/build.xml index f3c5eeafb..988d84f13 100644 --- a/ARE/components/sensor.readedf/build.xml +++ b/ARE/components/sensor.readedf/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.rfidreader/build.xml b/ARE/components/sensor.rfidreader/build.xml index 8eefeb95f..ea3fd33d7 100644 --- a/ARE/components/sensor.rfidreader/build.xml +++ b/ARE/components/sensor.rfidreader/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.sensorboard/build.xml b/ARE/components/sensor.sensorboard/build.xml index 201d30317..ac75d382f 100644 --- a/ARE/components/sensor.sensorboard/build.xml +++ b/ARE/components/sensor.sensorboard/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.signalgenerator/build.xml b/ARE/components/sensor.signalgenerator/build.xml index 7fd578252..e53eb1fcd 100644 --- a/ARE/components/sensor.signalgenerator/build.xml +++ b/ARE/components/sensor.signalgenerator/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.signalshaper/build.xml b/ARE/components/sensor.signalshaper/build.xml index ece49c1cd..54a6e328a 100644 --- a/ARE/components/sensor.signalshaper/build.xml +++ b/ARE/components/sensor.signalshaper/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.slider/build.xml b/ARE/components/sensor.slider/build.xml index d717b9ffd..e03139599 100644 --- a/ARE/components/sensor.slider/build.xml +++ b/ARE/components/sensor.slider/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.spacenavigtor3Dmouse/build.xml b/ARE/components/sensor.spacenavigtor3Dmouse/build.xml index 0bdeb2ef3..61c64f814 100644 --- a/ARE/components/sensor.spacenavigtor3Dmouse/build.xml +++ b/ARE/components/sensor.spacenavigtor3Dmouse/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.textfieldreader/build.xml b/ARE/components/sensor.textfieldreader/build.xml index 4540d7b37..ee333ccf9 100644 --- a/ARE/components/sensor.textfieldreader/build.xml +++ b/ARE/components/sensor.textfieldreader/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.timer/build.xml b/ARE/components/sensor.timer/build.xml index 39364f373..c416b0181 100644 --- a/ARE/components/sensor.timer/build.xml +++ b/ARE/components/sensor.timer/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.tobii4cheadtracker/build.xml b/ARE/components/sensor.tobii4cheadtracker/build.xml index 73e5bf4fb..0c637f9a8 100644 --- a/ARE/components/sensor.tobii4cheadtracker/build.xml +++ b/ARE/components/sensor.tobii4cheadtracker/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.tobitic/build.xml b/ARE/components/sensor.tobitic/build.xml index 36e7e40c3..621d712b0 100644 --- a/ARE/components/sensor.tobitic/build.xml +++ b/ARE/components/sensor.tobitic/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.truesense/build.xml b/ARE/components/sensor.truesense/build.xml index a3e8a66c1..fd1ce7327 100644 --- a/ARE/components/sensor.truesense/build.xml +++ b/ARE/components/sensor.truesense/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.tuioreactivision/build.xml b/ARE/components/sensor.tuioreactivision/build.xml index 338bfe1f9..4e519bf33 100644 --- a/ARE/components/sensor.tuioreactivision/build.xml +++ b/ARE/components/sensor.tuioreactivision/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/components/sensor.wiimote/build.xml b/ARE/components/sensor.wiimote/build.xml index 193590c36..f1698d1e1 100644 --- a/ARE/components/sensor.wiimote/build.xml +++ b/ARE/components/sensor.wiimote/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/middleware/build.xml b/ARE/middleware/build.xml index b6e7fb6a9..f8146deba 100644 --- a/ARE/middleware/build.xml +++ b/ARE/middleware/build.xml @@ -6,12 +6,12 @@ - + - + diff --git a/ARE/osgi/org.eclipse.osgi_3.6.0.v20100517.jar b/ARE/osgi/org.eclipse.osgi_3.6.0.v20100517.jar deleted file mode 100644 index b2bd56eb2..000000000 Binary files a/ARE/osgi/org.eclipse.osgi_3.6.0.v20100517.jar and /dev/null differ diff --git a/ARE/services/CIMCommunication/build.xml b/ARE/services/CIMCommunication/build.xml index 6786c155b..8e51045a5 100644 --- a/ARE/services/CIMCommunication/build.xml +++ b/ARE/services/CIMCommunication/build.xml @@ -7,13 +7,13 @@ - + - + @@ -24,7 +24,7 @@ - + @@ -40,6 +40,8 @@ + + diff --git a/ARE/services/CIMCommunication/src/main/resources/META-INF/MANIFEST-windows.MF b/ARE/services/CIMCommunication/src/main/resources/META-INF/MANIFEST-windows.MF index 5bb4457de..52efe01ca 100644 --- a/ARE/services/CIMCommunication/src/main/resources/META-INF/MANIFEST-windows.MF +++ b/ARE/services/CIMCommunication/src/main/resources/META-INF/MANIFEST-windows.MF @@ -11,5 +11,4 @@ Bundle-NativeCode: lib/native/windows/x86/rxtxSerial.dll; Export-Package: eu.asterics.mw.cimcommunication Require-Bundle: org.asterics.middleware Bundle-Activator: eu.asterics.mw.cimcommunication.CIMCommunicationBundleActivator -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 DynamicImport-Package: * \ No newline at end of file diff --git a/ARE/services/CIMCommunication/src/main/resources/META-INF/MANIFEST.MF b/ARE/services/CIMCommunication/src/main/resources/META-INF/MANIFEST.MF index d0dbc484e..552652285 100644 --- a/ARE/services/CIMCommunication/src/main/resources/META-INF/MANIFEST.MF +++ b/ARE/services/CIMCommunication/src/main/resources/META-INF/MANIFEST.MF @@ -3,9 +3,8 @@ Bundle-ManifestVersion: 2 Bundle-Name: asterics-services.cimcommunication Bundle-SymbolicName: eu.asterics.mw.cimcommunication Bundle-Version: 0.1.0 -Bundle-ClassPath: ., lib/native/nrjavaserial-3.13.0.jar, lib/native/jna-4.2.2.jar, lib/native/jna-platform-4.2.2.jar +Bundle-ClassPath: ., lib/native/nrjavaserial-3.15.0-java11.jar, lib/native/jna-4.2.2.jar, lib/native/jna-platform-4.2.2.jar Export-Package: eu.asterics.mw.cimcommunication Require-Bundle: org.asterics.middleware Bundle-Activator: eu.asterics.mw.cimcommunication.CIMCommunicationBundleActivator -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 DynamicImport-Package: * diff --git a/ARE/services/CIMCommunication/src/main/resources/lib/native/nrjavaserial-3.13.0.jar b/ARE/services/CIMCommunication/src/main/resources/lib/native/nrjavaserial-3.15.0-java11.jar similarity index 70% rename from ARE/services/CIMCommunication/src/main/resources/lib/native/nrjavaserial-3.13.0.jar rename to ARE/services/CIMCommunication/src/main/resources/lib/native/nrjavaserial-3.15.0-java11.jar index ce85e0bec..bd2e77e03 100644 Binary files a/ARE/services/CIMCommunication/src/main/resources/lib/native/nrjavaserial-3.13.0.jar and b/ARE/services/CIMCommunication/src/main/resources/lib/native/nrjavaserial-3.15.0-java11.jar differ diff --git a/ARE/services/ComputerVision/build.xml b/ARE/services/ComputerVision/build.xml index 2f9bd6a1f..2978f9ce4 100644 --- a/ARE/services/ComputerVision/build.xml +++ b/ARE/services/ComputerVision/build.xml @@ -6,7 +6,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/ARE/services/DisplayGuiManagement/build.xml b/ARE/services/DisplayGuiManagement/build.xml index e0999700a..e9bba016c 100644 --- a/ARE/services/DisplayGuiManagement/build.xml +++ b/ARE/services/DisplayGuiManagement/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/services/JNativeHook/build.xml b/ARE/services/JNativeHook/build.xml index a7525f600..b1370dafd 100644 --- a/ARE/services/JNativeHook/build.xml +++ b/ARE/services/JNativeHook/build.xml @@ -6,14 +6,14 @@ - + - + diff --git a/ARE/services/SystemStateChange/build.xml b/ARE/services/SystemStateChange/build.xml index c6c3ce03c..3239d8efa 100644 --- a/ARE/services/SystemStateChange/build.xml +++ b/ARE/services/SystemStateChange/build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/ARE/services/WebService/build.xml b/ARE/services/WebService/build.xml index f1e83491a..49f8c5e09 100644 --- a/ARE/services/WebService/build.xml +++ b/ARE/services/WebService/build.xml @@ -6,22 +6,24 @@ - + - + - + + + diff --git a/ARE/services/WebService/src/main/resources/META-INF/MANIFEST.MF b/ARE/services/WebService/src/main/resources/META-INF/MANIFEST.MF index 79eecc3c4..6b95bc54b 100644 --- a/ARE/services/WebService/src/main/resources/META-INF/MANIFEST.MF +++ b/ARE/services/WebService/src/main/resources/META-INF/MANIFEST.MF @@ -19,6 +19,13 @@ Bundle-ClassPath: ., lib/javax.annotation-api-1.2.jar, lib/javax.inject-2.4.0-b06.jar, lib/javax.ws.rs-api-2.0.1.jar, + lib/jaxb-api-2.3.0-b170201.1204.jar, + lib/jaxb-runtime-2.3.2.jar, + lib/stax-ex.jar, + lib/txw2.jar, + lib/istack-commons-runtime.jar, + lib/FastInfoset.jar, + lib/javax.activation-1.2.0.jar, lib/jersey-client-2.8.jar, lib/jersey-common-2.8.jar, lib/jersey-container-grizzly2-http-2.8.jar, diff --git a/ARE/services/WebService/src/main/resources/lib/FastInfoset.jar b/ARE/services/WebService/src/main/resources/lib/FastInfoset.jar new file mode 100644 index 000000000..6e91f1cec Binary files /dev/null and b/ARE/services/WebService/src/main/resources/lib/FastInfoset.jar differ diff --git a/ARE/services/WebService/src/main/resources/lib/istack-commons-runtime.jar b/ARE/services/WebService/src/main/resources/lib/istack-commons-runtime.jar new file mode 100644 index 000000000..8f37e950b Binary files /dev/null and b/ARE/services/WebService/src/main/resources/lib/istack-commons-runtime.jar differ diff --git a/ARE/services/WebService/src/main/resources/lib/javax.activation-1.2.0.jar b/ARE/services/WebService/src/main/resources/lib/javax.activation-1.2.0.jar new file mode 100644 index 000000000..9637479ad Binary files /dev/null and b/ARE/services/WebService/src/main/resources/lib/javax.activation-1.2.0.jar differ diff --git a/ARE/services/WebService/src/main/resources/lib/jaxb-api-2.3.0-b170201.1204.jar b/ARE/services/WebService/src/main/resources/lib/jaxb-api-2.3.0-b170201.1204.jar new file mode 100644 index 000000000..118b3cc40 Binary files /dev/null and b/ARE/services/WebService/src/main/resources/lib/jaxb-api-2.3.0-b170201.1204.jar differ diff --git a/ARE/services/WebService/src/main/resources/lib/jaxb-runtime-2.3.2.jar b/ARE/services/WebService/src/main/resources/lib/jaxb-runtime-2.3.2.jar new file mode 100644 index 000000000..62f871966 Binary files /dev/null and b/ARE/services/WebService/src/main/resources/lib/jaxb-runtime-2.3.2.jar differ diff --git a/ARE/services/WebService/src/main/resources/lib/stax-ex.jar b/ARE/services/WebService/src/main/resources/lib/stax-ex.jar new file mode 100644 index 000000000..a200db532 Binary files /dev/null and b/ARE/services/WebService/src/main/resources/lib/stax-ex.jar differ diff --git a/ARE/services/WebService/src/main/resources/lib/txw2.jar b/ARE/services/WebService/src/main/resources/lib/txw2.jar new file mode 100644 index 000000000..0d5ac012d Binary files /dev/null and b/ARE/services/WebService/src/main/resources/lib/txw2.jar differ diff --git a/ARE/services/org.eclipse.osgi.services_3.2.100.v20100503.jar b/ARE/services/org.eclipse.osgi.services_3.2.100.v20100503.jar deleted file mode 100644 index e7aeacd97..000000000 Binary files a/ARE/services/org.eclipse.osgi.services_3.2.100.v20100503.jar and /dev/null differ diff --git a/ARE/services/org.eclipse.osgi.services_3.8.0.v20190206-2147.jar b/ARE/services/org.eclipse.osgi.services_3.8.0.v20190206-2147.jar new file mode 100644 index 000000000..9edb37882 Binary files /dev/null and b/ARE/services/org.eclipse.osgi.services_3.8.0.v20190206-2147.jar differ diff --git a/ARE/tools/APE/build.xml b/ARE/tools/APE/build.xml index 93d72ecc5..5a6aab852 100644 --- a/ARE/tools/APE/build.xml +++ b/ARE/tools/APE/build.xml @@ -6,8 +6,11 @@ - - + + + + + @@ -16,7 +19,7 @@ - + @@ -37,30 +40,34 @@ + + + + - + - + - + - - + + - - + + diff --git a/ARE/tools/APE/src/main/resources/META-INF/MANIFEST.MF b/ARE/tools/APE/src/main/resources/META-INF/MANIFEST.MF index 3b7574014..784f7cb76 100644 --- a/ARE/tools/APE/src/main/resources/META-INF/MANIFEST.MF +++ b/ARE/tools/APE/src/main/resources/META-INF/MANIFEST.MF @@ -1,3 +1,10 @@ -Manifest-Version: 1.0 -Main-Class: eu.asterics.ape.main.APE -Class-Path: ../ARE/asterics.ARE.jar ../ARE/org.eclipse.osgi_3.6.0.v20100517.jar ../ARE/org.eclipse.osgi.services_3.2.100.v20100503.jar lib/commons-io-2.4.jar lib/commons-codec-1.11.jar ../asterics.ARE.jar ../org.eclipse.osgi_3.6.0.v20100517.jar ../org.eclipse.osgi.services_3.2.100.v20100503.jar \ No newline at end of file +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.10.5 +Created-By: 12.0.2+10 (Oracle Corporation) +Main-Class: eu.asterics.ape.main.APE +Class-Path: ../ARE/asterics.ARE.jar ../ARE/org.eclipse.osgi_3.14.0.v20 + 190517-1309.jar ../ARE/org.eclipse.osgi.services_3.8.0.v20190206-2147 + .jar lib/commons-io-2.4.jar lib/commons-codec-1.11.jar ../asterics.AR + E.jar ../org.eclipse.osgi_3.14.0.v20190517-1309.jar ../org.eclipse.os + gi.services_3.8.0.v20190206-2147.jar + diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/aopalliance-repackaged-2.2.0.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/aopalliance-repackaged-2.2.0.jar deleted file mode 100644 index 8af5c138b..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/aopalliance-repackaged-2.2.0.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-api-2.4.0-b06.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-api-2.4.0-b06.jar deleted file mode 100644 index 6971e68a1..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-api-2.4.0-b06.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-locator-2.4.0-b06.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-locator-2.4.0-b06.jar deleted file mode 100644 index 941a8d9ec..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-locator-2.4.0-b06.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-utils-2.4.0-b06.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-utils-2.4.0-b06.jar deleted file mode 100644 index b01026781..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/hk2-utils-2.4.0-b06.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-core-asl-1.8.3.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-core-asl-1.8.3.jar deleted file mode 100644 index e4159ec89..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-core-asl-1.8.3.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-jaxrs-1.8.3.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-jaxrs-1.8.3.jar deleted file mode 100644 index 1065a63af..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-jaxrs-1.8.3.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-mapper-asl-1.8.3.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-mapper-asl-1.8.3.jar deleted file mode 100644 index 9360ff681..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-mapper-asl-1.8.3.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-xc-1.8.3.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-xc-1.8.3.jar deleted file mode 100644 index 9e168ecf5..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/jackson-xc-1.8.3.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/javassist-3.17.0-ga.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/javassist-3.17.0-ga.jar deleted file mode 100644 index fa8e5e2b5..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/javassist-3.17.0-ga.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/javax.annotation-api-1.2.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/javax.annotation-api-1.2.jar deleted file mode 100644 index 9ab39ffa4..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/javax.annotation-api-1.2.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/javax.inject-2.4.0-b06.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/javax.inject-2.4.0-b06.jar deleted file mode 100644 index 2109e9837..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/javax.inject-2.4.0-b06.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/javax.ws.rs-api-2.0.1.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/javax.ws.rs-api-2.0.1.jar deleted file mode 100644 index 7eb68b4a0..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/javax.ws.rs-api-2.0.1.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-client-2.8.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-client-2.8.jar deleted file mode 100644 index 52fbfc034..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-client-2.8.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-common-2.8.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-common-2.8.jar deleted file mode 100644 index af1f38f83..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-common-2.8.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-guava-2.8.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-guava-2.8.jar deleted file mode 100644 index cd70ee074..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-guava-2.8.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-media-sse-2.8.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-media-sse-2.8.jar deleted file mode 100644 index 10db026da..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/jersey-media-sse-2.8.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/osgi-resource-locator-1.0.1.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/osgi-resource-locator-1.0.1.jar deleted file mode 100644 index bd6aa17eb..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/osgi-resource-locator-1.0.1.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/JavaLibrary/lib/validation-api-1.1.0.Final.jar b/ARE_RestAPIlibraries/JavaLibrary/lib/validation-api-1.1.0.Final.jar deleted file mode 100644 index de8540386..000000000 Binary files a/ARE_RestAPIlibraries/JavaLibrary/lib/validation-api-1.1.0.Final.jar and /dev/null differ diff --git a/ARE_RestAPIlibraries/build.xml b/ARE_RestAPIlibraries/build.xml index 5da25c908..b26fc280e 100644 --- a/ARE_RestAPIlibraries/build.xml +++ b/ARE_RestAPIlibraries/build.xml @@ -7,7 +7,7 @@ - + @@ -17,6 +17,8 @@ + + diff --git a/bin/ACS/tools/templates/template_build.xml b/bin/ACS/tools/templates/template_build.xml index defbb8d7e..0e9457510 100644 --- a/bin/ACS/tools/templates/template_build.xml +++ b/bin/ACS/tools/templates/template_build.xml @@ -6,13 +6,13 @@ - + - + diff --git a/bin/APE/template/imported.xml b/bin/APE/template/imported.xml index c611ae371..c3fbec92f 100644 --- a/bin/APE/template/imported.xml +++ b/bin/APE/template/imported.xml @@ -327,7 +327,11 @@ - + + + + + @@ -343,7 +347,11 @@ - + + + + + @@ -361,7 +369,11 @@ - + + + + + diff --git a/bin/ARE/javax.servlet-api-3.1.0.jar b/bin/ARE/javax.servlet-api-3.1.0.jar new file mode 100644 index 000000000..6b14c3d26 Binary files /dev/null and b/bin/ARE/javax.servlet-api-3.1.0.jar differ diff --git a/bin/ARE/javax.servlet_3.1.0.v201410161800.jar b/bin/ARE/javax.servlet_3.1.0.v201410161800.jar new file mode 100644 index 000000000..e786f9976 Binary files /dev/null and b/bin/ARE/javax.servlet_3.1.0.v201410161800.jar differ diff --git a/bin/ARE/org.apache.felix.gogo.command_1.0.2.v20170914-1324.jar b/bin/ARE/org.apache.felix.gogo.command_1.0.2.v20170914-1324.jar new file mode 100644 index 000000000..a600d83c9 Binary files /dev/null and b/bin/ARE/org.apache.felix.gogo.command_1.0.2.v20170914-1324.jar differ diff --git a/bin/ARE/org.apache.felix.gogo.runtime_1.1.0.v20180713-1646.jar b/bin/ARE/org.apache.felix.gogo.runtime_1.1.0.v20180713-1646.jar new file mode 100644 index 000000000..e7ce90895 Binary files /dev/null and b/bin/ARE/org.apache.felix.gogo.runtime_1.1.0.v20180713-1646.jar differ diff --git a/bin/ARE/org.apache.felix.gogo.shell_1.1.0.v20180713-1646.jar b/bin/ARE/org.apache.felix.gogo.shell_1.1.0.v20180713-1646.jar new file mode 100644 index 000000000..1764d3c1d Binary files /dev/null and b/bin/ARE/org.apache.felix.gogo.shell_1.1.0.v20180713-1646.jar differ diff --git a/bin/ARE/org.eclipse.equinox.console_1.3.300.v20190516-1504.jar b/bin/ARE/org.eclipse.equinox.console_1.3.300.v20190516-1504.jar new file mode 100644 index 000000000..0b06405f7 Binary files /dev/null and b/bin/ARE/org.eclipse.equinox.console_1.3.300.v20190516-1504.jar differ diff --git a/bin/ARE/org.eclipse.osgi.util_3.5.200.v20190115-2323.jar b/bin/ARE/org.eclipse.osgi.util_3.5.200.v20190115-2323.jar new file mode 100644 index 000000000..96150d1d5 Binary files /dev/null and b/bin/ARE/org.eclipse.osgi.util_3.5.200.v20190115-2323.jar differ diff --git a/bin/ARE/org.eclipse.osgi_3.14.0.v20190517-1309.jar b/bin/ARE/org.eclipse.osgi_3.14.0.v20190517-1309.jar new file mode 100644 index 000000000..5cb5b4958 Binary files /dev/null and b/bin/ARE/org.eclipse.osgi_3.14.0.v20190517-1309.jar differ diff --git a/bin/ARE/org.eclipse.osgi_3.6.0.v20100517.jar b/bin/ARE/org.eclipse.osgi_3.6.0.v20100517.jar deleted file mode 100644 index b2bd56eb2..000000000 Binary files a/bin/ARE/org.eclipse.osgi_3.6.0.v20100517.jar and /dev/null differ diff --git a/bin/ARE/profile/services-windows.ini b/bin/ARE/profile/services-windows.ini index 5c78bd48d..a6a8dc9f0 100644 --- a/bin/ARE/profile/services-windows.ini +++ b/bin/ARE/profile/services-windows.ini @@ -3,8 +3,8 @@ asterics.mw.systemstatechange-windows.jar #asterics.mw.systemstatechange.jar #Starts the CIMPortManager: Enables communication to AsTeRICS CIM modules like acceleration sensor, GPI, GPO, Arduino,.... -asterics.mw.cimcommunication-windows.jar -#asterics.mw.cimcommunication.jar +#asterics.mw.cimcommunication-windows.jar +asterics.mw.cimcommunication.jar #Provides crossplatform computervision and framegrabbing libraries (opencv, libfreenect, videoInput,...) javacv-1.3.0-basic-windows.jar diff --git a/bin/ARE/profile/services.ini b/bin/ARE/profile/services.ini index 25c5623ce..2de2a5a18 100644 --- a/bin/ARE/profile/services.ini +++ b/bin/ARE/profile/services.ini @@ -2,7 +2,14 @@ #The order of the entries is important #Needed for the --webservice mode, is a dependency of grizzly-httpservice-bundle-2.3.23.jar -org.eclipse.osgi.services_3.2.100.v20100503.jar +org.eclipse.osgi.util_3.5.200.v20190115-2323.jar +org.apache.felix.gogo.runtime_1.1.0.v20180713-1646.jar +org.apache.felix.gogo.shell_1.1.0.v20180713-1646.jar +org.apache.felix.gogo.command_1.0.2.v20170914-1324.jar +org.eclipse.equinox.console_1.3.300.v20190516-1504.jar +org.eclipse.osgi.services_3.8.0.v20190206-2147.jar +javax.servlet-api-3.1.0.jar +javax.servlet_3.1.0.v201410161800.jar #Needed for global keyboard shortcuts and generally for key, mouse capturing and key, mouse emulation -asterics.mw.jnativehook.jar \ No newline at end of file +asterics.mw.jnativehook.jar diff --git a/bin/ARE/start.bat b/bin/ARE/start.bat index c062d574a..caf839177 100644 --- a/bin/ARE/start.bat +++ b/bin/ARE/start.bat @@ -70,7 +70,7 @@ REM The start command must have empty quotes as first parameter, so that a path @IF NOT DEFINED ARE_DEBUG_STRING set START_CMD=start "" @IF NOT DEFINED ARE_DEBUG_STRING set SPLASH_SWITCH=-splash:images/asterics_startup.png -%START_CMD% %JAVA_BIN% %ARE_DEBUG_STRING% %SPLASH_SWITCH% -Deu.asterics.mw.services.AstericsErrorHandling.consoleLogLevel=%ARE_CONSOLE_LOGLEVEL% -Dsun.java2d.d3d=true -Dorg.osgi.framework.os.name=win32 -Dosgi.clean=true -Dorg.osgi.framework.bootdelegation=* -Dorg.osgi.framework.system.packages.extra=sun.misc -DAnsi=true -Djava.util.logging.config.file=logging.properties -Deu.asterics.ARE.startModel=%AUTOSTART_MODEL% -Deu.asterics.ARE.ServicesFiles="%ARE_OPTIONAL_SERVICES_INI%" -jar org.eclipse.osgi_3.6.0.v20100517.jar -configuration %PROFILE_PATH% -console %* +%START_CMD% %JAVA_BIN% %ARE_DEBUG_STRING% %SPLASH_SWITCH% -Deu.asterics.mw.services.AstericsErrorHandling.consoleLogLevel=%ARE_CONSOLE_LOGLEVEL% -Dsun.java2d.d3d=true -Dorg.osgi.framework.os.name=win32 -Dosgi.clean=true -Dorg.osgi.framework.bootdelegation=* -Dorg.osgi.framework.system.packages.extra=sun.misc -DAnsi=true -Djava.util.logging.config.file=logging.properties -Deu.asterics.ARE.startModel=%AUTOSTART_MODEL% -Deu.asterics.ARE.ServicesFiles="%ARE_OPTIONAL_SERVICES_INI%" -jar org.eclipse.osgi_3.14.0.v20190517-1309.jar -configuration %PROFILE_PATH% -console %* set ARE_CONSOLE_LOGLEVEL= set ARE_DEBUG_STRING= diff --git a/bin/ARE/start.sh b/bin/ARE/start.sh index 3c86520c8..3be916bc2 100755 --- a/bin/ARE/start.sh +++ b/bin/ARE/start.sh @@ -42,7 +42,7 @@ echo "ARE_DEBUG_STRING=$ARE_DEBUG_STRING" echo "ARE_OPTIONAL_SERVICES_INI=$ARE_OPTIONAL_SERVICES_INI" -java $ARE_DEBUG_STRING -Deu.asterics.mw.services.AstericsErrorHandling.consoleLogLevel=$ARE_CONSOLE_LOGLEVEL -Dosgi.clean=true -Dorg.osgi.framework.bootdelegation=* -Dorg.osgi.framework.system.packages.extra=sun.misc -DAnsi=true -Djava.util.logging.config.file=logging.properties -Deu.asterics.ARE.startModel="$ARE_AUTOSTART_MODEL" -Deu.asterics.ARE.ServicesFiles="$ARE_OPTIONAL_SERVICES_INI" -jar org.eclipse.osgi_3.6.0.v20100517.jar -configuration $ARE_PROFILE_PATH -console "$@" +java $ARE_DEBUG_STRING -Deu.asterics.mw.services.AstericsErrorHandling.consoleLogLevel=$ARE_CONSOLE_LOGLEVEL -Dosgi.clean=true -Dorg.osgi.framework.bootdelegation=* -Dorg.osgi.framework.system.packages.extra=sun.misc -DAnsi=true -Djava.util.logging.config.file=logging.properties -Deu.asterics.ARE.startModel="$ARE_AUTOSTART_MODEL" -Deu.asterics.ARE.ServicesFiles="$ARE_OPTIONAL_SERVICES_INI" -jar org.eclipse.osgi_3.14.0.v20190517-1309.jar -configuration $ARE_PROFILE_PATH -console "$@" # workaround for muliple user support