[DEECo] [d3scomp/JDEECo] 8d1c99: Moving the check for duplicate ensemble definition...
GitHub
noreply at github.com
Tue Feb 17 11:42:41 CET 2015
Branch: refs/heads/omnet-plugin
Home: https://github.com/d3scomp/JDEECo
Commit: 8d1c99eb528356032620fd957b20e2cc3f4ab9fd
https://github.com/d3scomp/JDEECo/commit/8d1c99eb528356032620fd957b20e2cc3f4ab9fd
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-11 (Wed, 11 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/InvalidOperationException.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
Log Message:
-----------
Moving the check for duplicate ensemble definition from DEECo to
AnnotationProcessor
Commit: b9a75d2742f9912a3acacef7722dea6f712bbe2b
https://github.com/d3scomp/JDEECo/commit/b9a75d2742f9912a3acacef7722dea6f712bbe2b
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-12 (Thu, 12 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/DiscreteEventSimulation.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/NoExecutorAvailableException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SchedulerNotifier.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SimulationTimeEventListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/TerminationTimeHolder.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/TimerTask.java
Log Message:
-----------
new scheduler in DEECo core, start() is now synchronous and main loop
delegates via nextStep() to SchedulerNotifier. Some Javadoc and tests
still missing.
Commit: 538a52e685ffb0ee54ce7192e4969f8e6abfc97e
https://github.com/d3scomp/JDEECo/commit/538a52e685ffb0ee54ce7192e4969f8e6abfc97e
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/AbstractHost.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoSimulationRealm.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/SimulationSchedulerNotifier.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/CurrentTimeProvider.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/DiscreteEventSimulation.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SchedulerNotifier.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SimulationTimeEventListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/TerminationTimeHolder.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/DiscreteEventSchedulerNotifier.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/EventTime.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/SchedulerNotifier.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/SchedulerNotifierEventListener.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/TerminationTimeHolder.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
Log Message:
-----------
DEECoRealm and schedulers - work in progress
Commit: 3787d1411b5be8d148c6773acc9cb464aa61dad6
https://github.com/d3scomp/JDEECo/commit/3787d1411b5be8d148c6773acc9cb464aa61dad6
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Log Message:
-----------
fixing tests after latest changes in Scheduler and SchedulerNotifier
interfaces
Commit: 9754ccb51e12bbcfd63b16a256938087247bcb9c
https://github.com/d3scomp/JDEECo/commit/9754ccb51e12bbcfd63b16a256938087247bcb9c
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
fixing failing build caused by errors in simulation project (obsolete
now)
Commit: 1c560b4bc8cf50df371f4315f5f1cfffc1bf1966
https://github.com/d3scomp/JDEECo/commit/1c560b4bc8cf50df371f4315f5f1cfffc1bf1966
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoSimulationRealm.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
Log Message:
-----------
renaming "DEECo" class to "DEECoNode"
Commit: 9afa60d0a9d3a8871c7121bedc8bab028906498a
https://github.com/d3scomp/JDEECo/commit/9afa60d0a9d3a8871c7121bedc8bab028906498a
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
A jdeeco-core/simulation/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
A jdeeco-core/simulation/cz/cuni/mff/d3s/deeco/runtime/SimulationSchedulerNotifier.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRun.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/SimulationSchedulerNotifier.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/WallTimeSchedulerNotifier.java
Log Message:
-----------
Renaming "DEECoSimulationRealm" to "DEECoSimulation" and introducing new
"simulation" source folder to keep all the simulation-related classes
Commit: bd58b4e842d76b86c85cb222bb0031ab8c3d1013
https://github.com/d3scomp/JDEECo/commit/bd58b4e842d76b86c85cb222bb0031ab8c3d1013
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M jdeeco-core/simulation/cz/cuni/mff/d3s/deeco/runtime/SimulationSchedulerNotifier.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoSimulationRealm.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/TerminationTimeHolder.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
Log Message:
-----------
deleting obsolete files "DEECoSimulationRealm" and
"TerminationTimeHolder"
Commit: 68bdae8f33430b6d4f7112faa5a24c5369cb80e7
https://github.com/d3scomp/JDEECo/commit/68bdae8f33430b6d4f7112faa5a24c5369cb80e7
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
R jdeeco-core/simulation/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
R jdeeco-core/simulation/cz/cuni/mff/d3s/deeco/runtime/SimulationSchedulerNotifier.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRun.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/TerminationTimeNotSetException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/DiscreteEventSchedulerNotifier.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/SimulationSchedulerNotifier.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
Log Message:
-----------
Restructuring: DEECoSimulation extends DEECoRun and are in the "runners"
package. Exception added for the case that a simulations starts without
a termination time.
Commit: e86cddaa5a9ac4bbc8caec9f89b9b19a6fac1fea
https://github.com/d3scomp/JDEECo/commit/e86cddaa5a9ac4bbc8caec9f89b9b19a6fac1fea
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/DiscreteEventSchedulerNotifier.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/WallTimeSchedulerNotifier.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
cleanup: removing isRunning() from Scheduler (the Scheduler cannot
"run") anymore
Commit: c3f5c2d4947818205fddfac2e6f12ad33bf7a338
https://github.com/d3scomp/JDEECo/commit/c3f5c2d4947818205fddfac2e6f12ad33bf7a338
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
Log Message:
-----------
re-organizing methods of SingleThreadedScheduler class
Commit: d2c04d220e9f3c25ea3ea7a282fc4d58d3292a58
https://github.com/d3scomp/JDEECo/commit/d2c04d220e9f3c25ea3ea7a282fc4d58d3292a58
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
Log Message:
-----------
re-organising methods in DEECoNode class
Commit: 7b91946a671c0409b46f8ab98013f983e3eb5e23
https://github.com/d3scomp/JDEECo/commit/7b91946a671c0409b46f8ab98013f983e3eb5e23
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoNodeFactory.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRun.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRunner.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulationRunner.java
Log Message:
-----------
adding interfaces to DEECo runners
Commit: 4d5ad334d334f2c312f74784e80727310cee3563
https://github.com/d3scomp/JDEECo/commit/4d5ad334d334f2c312f74784e80727310cee3563
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M jdeeco-architecture/2015/architecture-2015-02-04.emx
Log Message:
-----------
class diagrams for Schedulers and Runners
Commit: a611e82912a9005f94ba639d26e620f208bd7881
https://github.com/d3scomp/JDEECo/commit/a611e82912a9005f94ba639d26e620f208bd7881
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-14 (Sat, 14 Feb 2015)
Changed paths:
M jdeeco-architecture/2015/architecture-2015-02-04.emx
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRun.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRunner.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulationRunner.java
Log Message:
-----------
flattening hierarchy of runner interfaces
Commit: caff62659df18af2dae4740b1c26004478ef3b5c
https://github.com/d3scomp/JDEECo/commit/caff62659df18af2dae4740b1c26004478ef3b5c
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-02-16 (Mon, 16 Feb 2015)
Changed paths:
M jdeeco-architecture/2015/architecture-2015-02-04.emx
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/AbstractHost.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoNodeFactory.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRun.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRunner.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulationRunner.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/TerminationTimeNotSetException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/CurrentTimeProvider.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/DiscreteEventSchedulerNotifier.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/EventTime.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/SchedulerNotifier.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/SchedulerNotifierEventListener.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/SimulationSchedulerNotifier.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/notifier/WallTimeSchedulerNotifier.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/DiscreteEventTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/EventTime.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/RunnerTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/SimulationTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/Timer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/TimerEventListener.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/WallTimeTimer.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/TimerTask.java
Log Message:
-----------
refactoring "ScheduleNotifier" to "Timer", dropping interfaces from
runners, updated class diagrams. Still missing some tests and javadoc.
Commit: 66930ab1d814bc60b735c10a4efe7cc777cbf17e
https://github.com/d3scomp/JDEECo/commit/66930ab1d814bc60b735c10a4efe7cc777cbf17e
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-02-17 (Tue, 17 Feb 2015)
Changed paths:
M jdeeco-architecture/2015/architecture-2015-02-04.emx
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/AbstractHost.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRunner.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/NoExecutorAvailableException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogger.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TimerTask.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/DiscreteEventTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/EventTime.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/RunnerTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/SimulationTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/Timer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/TimerEventListener.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/WallTimeTimer.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/TimerTask.java
Log Message:
-----------
Merge remote-tracking branch 'origin/plugin-architecture' into
omnet-plugin
Conflicts:
jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/TimerTask.java
Compare: https://github.com/d3scomp/JDEECo/compare/7a878f9d69a2...66930ab1d814
More information about the DEECo
mailing list