[DEECo] [d3scomp/JDEECo] 29ef40: Ensemble logging now called at proper places

GitHub noreply at github.com
Wed Mar 18 17:37:53 CET 2015 

  Branch: refs/heads/jDEECo-3
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 29ef4063f386aeeb7876dad4308d54f44839d0b0
      https://github.com/d3scomp/JDEECo/commit/29ef4063f386aeeb7876dad4308d54f44839d0b0
  Author: filipekt <tom.filipek at seznam.cz>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java

  Log Message:
  -----------
  Ensemble logging now called at proper places


  Commit: a7667001c7d3d76fa8997eb08212f46b6020b706
      https://github.com/d3scomp/JDEECo/commit/a7667001c7d3d76fa8997eb08212f46b6020b706
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java

  Log Message:
  -----------
  Merge pull request #174 from filipekt/master

Ensemble logging now called at proper places


  Commit: 8899cdb7b6b72cee25e87469026a8f1d5b4d14b4
      https://github.com/d3scomp/JDEECo/commit/8899cdb7b6b72cee25e87469026a8f1d5b4d14b4
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M .gitignore
    M jdeeco-architecture/.gitignore
    M jdeeco-architecture/.project
    M jdeeco-architecture/2014/OMNetIntegration-Scheduler.dnx
    M jdeeco-architecture/2014/OMNetIntegration-Synchronizer.dnx
    M jdeeco-architecture/2014/architecture-2013-10-24.emx
    M jdeeco-architecture/2014/architecture-2013-10-25.emx
    M jdeeco-architecture/2014/architecture-2013-10-26.emx
    M jdeeco-architecture/2014/architecture-2013-10-30.emx
    M jdeeco-architecture/2014/architecture-2013-11-04.emx
    M jdeeco-architecture/2014/architecture-2013-11-18.emx
    M jdeeco-architecture/2014/architecture-2013-12-11.emx
    M jdeeco-architecture/2014/jDEECo-OMNet-MATSim.dnx
    M jdeeco-architecture/2014/jDEECo-OMNet.dnx
    M jdeeco-architecture/2014/reverse-jdeeco-core.tc
    M jdeeco-architecture/2015/architecture-2015-02-04.emx
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/CycleDetectedException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPlugin.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DuplicateEnsembleDefinitionException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/InvalidOperationException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/PluginDependencyException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.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/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/ModelValidatorTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/TestSerializer.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
    A jdeeco-network-plugin/.gitignore
    A jdeeco-network-plugin/.project
    A jdeeco-network-plugin/pom.xml
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Address.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Device.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/IPAddress.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1DataProcessor.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1StrategyManager.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L2PacketSender.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L2PacketType.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L2StrategyManager.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/MANETBroadcastAddress.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkToDevice.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkToGossip.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/PrintingBroadcastDevice.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/MarshallingException.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/UnregistredPacketType.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DataIDSource.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DefaultDataIDSource.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Packet.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Strategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETReceivedInfo.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/package-info.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2ReceivedInfo.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Strategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/PacketHeader.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/package-info.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/Marshaller.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallerRegistry.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/SerializingMarshaller.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/package-info.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/PacketTypeTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/L1PacketTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallingTest.java
    A jdeeco-parent/jDEECoFormatter.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/network' into omnet-plugin


  Commit: cd655b7f2ac1172afc278650f4c8da623b301367
      https://github.com/d3scomp/JDEECo/commit/cd655b7f2ac1172afc278650f4c8da623b301367
  Author: filipekt <tom.filipek at seznam.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java

  Log Message:
  -----------
  Ensemble logging now called at proper places


  Commit: 05abb101fd561b57528e2335544ccb0932d2cc48
      https://github.com/d3scomp/JDEECo/commit/05abb101fd561b57528e2335544ccb0932d2cc48
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Log Message:
  -----------
  Merge branch 'omnet-plugin' of https://github.com/d3scomp/JDEECo.git into omnet-plugin


  Commit: 33180edd862e7e2a1b72a302286715b5f2d7ea1c
      https://github.com/d3scomp/JDEECo/commit/33180edd862e7e2a1b72a302286715b5f2d7ea1c
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    A jdeeco-omnet-plugin/.gitignore
    A jdeeco-omnet-plugin/.project
    A jdeeco-omnet-plugin/pom.xml
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/DummyListener.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/Notifier.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/package-info.java

  Log Message:
  -----------
  Add OMNeT project


  Commit: 9af6b704d2e65ca5f5f4f6a01c3ba4564cd724fa
      https://github.com/d3scomp/JDEECo/commit/9af6b704d2e65ca5f5f4f6a01c3ba4564cd724fa
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTBroadcastDevice.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTDevice.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTInfrastructureDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java

  Log Message:
  -----------
  Add prototypes of omnet interfaces


  Commit: e849221807c0d55ee10488cd1566bc8356ed1f98
      https://github.com/d3scomp/JDEECo/commit/e849221807c0d55ee10488cd1566bc8356ed1f98
  Author: filipekt <tom.filipek at seznam.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java

  Log Message:
  -----------
  Ensemble logging now called at proper places


  Commit: d7b82487799f9f34ea4a3e3258a4f98f50d7f7ed
      https://github.com/d3scomp/JDEECo/commit/d7b82487799f9f34ea4a3e3258a4f98f50d7f7ed
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    A jdeeco-omnet-plugin/.gitignore
    A jdeeco-omnet-plugin/.project
    A jdeeco-omnet-plugin/pom.xml
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/DummyListener.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/Notifier.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/package-info.java

  Log Message:
  -----------
  Add OMNeT project


  Commit: 5c34d7979dfb26555c3930cd6b15229bd9677983
      https://github.com/d3scomp/JDEECo/commit/5c34d7979dfb26555c3930cd6b15229bd9677983
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTBroadcastDevice.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTDevice.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTInfrastructureDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java

  Log Message:
  -----------
  Add prototypes of omnet interfaces


  Commit: 950daf7974235ddb4f77d0964170cbae9d259523
      https://github.com/d3scomp/JDEECo/commit/950daf7974235ddb4f77d0964170cbae9d259523
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Log Message:
  -----------
  Merge branch 'omnet-plugin' of https://github.com/d3scomp/JDEECo.git into omnet-plugin


  Commit: 46964700905bafa06be1222610f52dda36243579
      https://github.com/d3scomp/JDEECo/commit/46964700905bafa06be1222610f52dda36243579
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTDevice.java

  Log Message:
  -----------
  Fix network device class structure


  Commit: 7a878f9d69a28b8fffc50e52ac1c26d94422adbb
      https://github.com/d3scomp/JDEECo/commit/7a878f9d69a28b8fffc50e52ac1c26d94422adbb
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/Notifier.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTBroadcastDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTInfrastructureDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java

  Log Message:
  -----------
  Update omnet device classes to be up-to-date with latest design


  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


  Commit: 37b51217cbb50414d93ba3da0f0db51a61d22eb8
      https://github.com/d3scomp/JDEECo/commit/37b51217cbb50414d93ba3da0f0db51a61d22eb8
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    R jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/DummyListener.java
    R jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/Notifier.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java

  Log Message:
  -----------
  Remove mock interfaces


  Commit: cc2784313fe5bd2ec80e2df852a0ea15ce9d526e
      https://github.com/d3scomp/JDEECo/commit/cc2784313fe5bd2ec80e2df852a0ea15ce9d526e
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/.classpath
    M jdeeco-simulation-omnet-native/pom.xml
    A jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
    A jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/package-info.java

  Log Message:
  -----------
  Add Java class for wrapping static omnet integration into omnet-native
project


  Commit: ce7319fc50c229efc0c5b0e0ca7bdcf070a38262
      https://github.com/d3scomp/JDEECo/commit/ce7319fc50c229efc0c5b0e0ca7bdcf070a38262
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/.gitignore
    M jdeeco-simulation-omnet-native/.settings/org.eclipse.core.resources.prefs
    M jdeeco-simulation-omnet-native/Makefile
    A jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.h
    A jdeeco-simulation-omnet-native/src/JDEECoRuntime.cc
    A jdeeco-simulation-omnet-native/src/JDEECoRuntime.h
    A jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc
    M jdeeco-simulation-omnet-native/src/simulation.cc
    A jdeeco-simulation-omnet-native/src/simulation.h

  Log Message:
  -----------
  Refactor omnet integration native code


  Commit: 950b65ec0eb915c7a5a7fd14ff0a540f0a0e9a30
      https://github.com/d3scomp/JDEECo/commit/950b65ec0eb915c7a5a7fd14ff0a540f0a0e9a30
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/Makefile
    M jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc
    A jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNative.java
    R jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java

  Log Message:
  -----------
  Rename omnet native interface class to OMNeTNative


  Commit: 300e53966d78da9478a0dfe16130ef51a6cbd5d6
      https://github.com/d3scomp/JDEECo/commit/300e53966d78da9478a0dfe16130ef51a6cbd5d6
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/DiscreteEventTimer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/TimerEventListener.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/scheduler/SimulationScheduler.java

  Log Message:
  -----------
  Implement provisional passing of DEECo node id to Timer
- This change is necessary just to make omnet simulation run with
current native integration layer.


  Commit: 851ffd8818fb9f0385faded3a478f2ca0958e2fb
      https://github.com/d3scomp/JDEECo/commit/851ffd8818fb9f0385faded3a478f2ca0958e2fb
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNative.java
    A jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNativeListener.java

  Log Message:
  -----------
  Document OMNeT Java interface


  Commit: 3d6b49410a7b21021e69b875e7f8953d61b7641e
      https://github.com/d3scomp/JDEECo/commit/3d6b49410a7b21021e69b875e7f8953d61b7641e
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.h
    M jdeeco-simulation-omnet-native/src/JDEECoRuntime.cc
    M jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc

  Log Message:
  -----------
  Fix OMNeT integration so that the initial event works


  Commit: af30374624839faec836a6ecb87e240c249be6e5
      https://github.com/d3scomp/JDEECo/commit/af30374624839faec836a6ecb87e240c249be6e5
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc

  Log Message:
  -----------
  Workaround scheduling OMNeT event in the past


  Commit: ae805c7bd6933347eeb9c08a56e3ed6b112eb212
      https://github.com/d3scomp/JDEECo/commit/ae805c7bd6933347eeb9c08a56e3ed6b112eb212
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-19 (Thu, 19 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoRuntime.cc

  Log Message:
  -----------
  Fix OMNeT scheduling into working state
- Still we need to answer some design questions and REFACTOR the code
accordingly


  Commit: 135b777d36f4116bdaa654134ede740f1a17db4e
      https://github.com/d3scomp/JDEECo/commit/135b777d36f4116bdaa654134ede740f1a17db4e
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNative.java

  Log Message:
  -----------
  Fix time conversion between OMNeT and jDEECo


  Commit: 209a899be85440005da7629f3f5f95d98b8f1c1e
      https://github.com/d3scomp/JDEECo/commit/209a899be85440005da7629f3f5f95d98b8f1c1e
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNative.java

  Log Message:
  -----------
  Fix rounding when converting time from OMNeT to jDEECo


  Commit: 1696315a5ece96c33289cf6afbc5504eaedaa6e6
      https://github.com/d3scomp/JDEECo/commit/1696315a5ece96c33289cf6afbc5504eaedaa6e6
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/DiscreteEventTimer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/Timer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/TimerEventListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/WallTimeTimer.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-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java

  Log Message:
  -----------
  Pass node when calling notifyAt on timer


  Commit: a4954312f37ea6c058128e0fc20fe8e30443ac1d
      https://github.com/d3scomp/JDEECo/commit/a4954312f37ea6c058128e0fc20fe8e30443ac1d
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.h
    M jdeeco-simulation-omnet-native/src/JDEECoRuntime.cc
    M jdeeco-simulation-omnet-native/src/JDEECoRuntime.h
    M jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc

  Log Message:
  -----------
  Rename clear -> clearAll in omnet native integration


  Commit: 45c7a63a8fd9bce86abb2bdff68954d090caed26
      https://github.com/d3scomp/JDEECo/commit/45c7a63a8fd9bce86abb2bdff68954d090caed26
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.h
    M jdeeco-simulation-omnet-native/src/simulation.cc

  Log Message:
  -----------
  Refactor jDEECoModule


  Commit: 01933d21a8107b6ccb1537d1500055fa4c4d8205
      https://github.com/d3scomp/JDEECo/commit/01933d21a8107b6ccb1537d1500055fa4c4d8205
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.h

  Log Message:
  -----------
  Avoid repeated search for jdeeco runtime from jdeeco module


  Commit: 351049134f297f01ae2d538733faa02773bd8d92
      https://github.com/d3scomp/JDEECo/commit/351049134f297f01ae2d538733faa02773bd8d92
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/models/JDEECoApplication.ned
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.h
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.h
    M jdeeco-simulation-omnet-native/src/JDEECoRuntime.cc
    M jdeeco-simulation-omnet-native/src/JDEECoRuntime.h
    M jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc
    M jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNative.java
    M jdeeco-simulation-omnet-native/src/simulation.h

  Log Message:
  -----------
  Use integers for OMNeT node identification


  Commit: 85bfd2e7aa5b03a4baca6bfcae0840dc02c50bf0
      https://github.com/d3scomp/JDEECo/commit/85bfd2e7aa5b03a4baca6bfcae0840dc02c50bf0
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc

  Log Message:
  -----------
  Refactor OMNeT native api


  Commit: e29d77381811f1dd71272b05845ce84214fa5cbb
      https://github.com/d3scomp/JDEECo/commit/e29d77381811f1dd71272b05845ce84214fa5cbb
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogRecord.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/SnapshotProvider.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogRecord.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogTimerTaskListener.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogger.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SnapshotProvider.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java

  Log Message:
  -----------
  Merge branch 'jDEECo-3' into omnet-plugin

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogger.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java


  Commit: a75299d5c5ac668f3223d343edc3f3b76d847520
      https://github.com/d3scomp/JDEECo/commit/a75299d5c5ac668f3223d343edc3f3b76d847520
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.h
    M jdeeco-simulation-omnet-native/src/JDEECoRuntime.cc
    M jdeeco-simulation-omnet-native/src/JDEECoRuntime.h

  Log Message:
  -----------
  Use map for resolving native omnet modules and runtimes


  Commit: b1d0157cf999aff0e859a0dc48b06c6d72f96f1e
      https://github.com/d3scomp/JDEECo/commit/b1d0157cf999aff0e859a0dc48b06c6d72f96f1e
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNativeListener.java

  Log Message:
  -----------
  Add method for receiveing packets to omnet host native interface


  Commit: 3696182c1e450f7b215bf608a4d87b5340e7e84e
      https://github.com/d3scomp/JDEECo/commit/3696182c1e450f7b215bf608a4d87b5340e7e84e
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/DiscreteEventTimer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/Timer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/WallTimeTimer.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java

  Log Message:
  -----------
  Use DEECoContainer instead DEECoNode to identify nodes in omnet
integration


  Commit: 1d21aad3e35140fdd29e3f3946d048053047b1b3
      https://github.com/d3scomp/JDEECo/commit/1d21aad3e35140fdd29e3f3946d048053047b1b3
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java

  Log Message:
  -----------
  Refactor OMNeTSimulation


  Commit: de37deec60f73965780c2d2cbea76568e6078cfa
      https://github.com/d3scomp/JDEECo/commit/de37deec60f73965780c2d2cbea76568e6078cfa
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTBroadcastDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTInfrastructureDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.cc

  Log Message:
  -----------
  Make omnet send and receive broadcast packets


  Commit: 24e906147359320ab78cbaf53b621f514be78f71
      https://github.com/d3scomp/JDEECo/commit/24e906147359320ab78cbaf53b621f514be78f71
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java

  Log Message:
  -----------
  Set offset for publishing task in order to avoid interference


  Commit: c7becac7cb72b27b37d6ea3fce91bc31c35b0179
      https://github.com/d3scomp/JDEECo/commit/c7becac7cb72b27b37d6ea3fce91bc31c35b0179
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

  Log Message:
  -----------
  Merge branch 'network' into omnet-plugin


  Commit: cb465a784917c868947af204b442e2e22ef2edeb
      https://github.com/d3scomp/JDEECo/commit/cb465a784917c868947af204b442e2e22ef2edeb
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java

  Log Message:
  -----------
  Merge branch 'network' into omnet-plugin


  Commit: cfbda8042fa85701785e9787dc1089b3356e9f51
      https://github.com/d3scomp/JDEECo/commit/cfbda8042fa85701785e9787dc1089b3356e9f51
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java

  Log Message:
  -----------
  Walkaround broken sendDelayed in Layer1


  Commit: 890efb2196d92781ba29f3afd26ef8a08bcf52d2
      https://github.com/d3scomp/JDEECo/commit/890efb2196d92781ba29f3afd26ef8a08bcf52d2
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/CoordinatorRole.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/MemberRole.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRole.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRoleMultiple.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Role.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationChecker.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationCheckerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RoleAnnotationsHelper.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Parameter.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ParameterImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/ModelValidatorTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/ChildOfCorrectC1.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java
    M jdeeco-network-plugin/.gitignore
    M jdeeco-network-plugin/pom.xml
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/IPAddress.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/MANETBroadcastAddress.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopback.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.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
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyEnsemble.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Follower.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Leader.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Waypoint.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/package-info.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/package-info.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTBroadcastDevice.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/network' into omnet-plugin

Conflicts:
	jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java


  Commit: 0ec9701c2e52c90cbec97dc1a1d0a92054fc5c60
      https://github.com/d3scomp/JDEECo/commit/0ec9701c2e52c90cbec97dc1a1d0a92054fc5c60
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-architecture/2015/architecture-2015-02-04.emx
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/DefaultKnowledgeDataManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/SecurityIntegrationTests.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/jDEECo-3' into omnet-plugin

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java


  Commit: 5e51ac5caf5f0cb29f9f86806d6930c8ea76f93b
      https://github.com/d3scomp/JDEECo/commit/5e51ac5caf5f0cb29f9f86806d6930c8ea76f93b
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java

  Log Message:
  -----------
  Use static list of ip addresses in DummyKnowledgeManager


  Commit: 207624da3e87d323069e59dae3c594d555446c0f
      https://github.com/d3scomp/JDEECo/commit/207624da3e87d323069e59dae3c594d555446c0f
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java

  Log Message:
  -----------
  Add offset to Dummy knowledge publisher


  Commit: eaa7da8924e3ea509635572ed93d2e2a0198dc6d
      https://github.com/d3scomp/JDEECo/commit/eaa7da8924e3ea509635572ed93d2e2a0198dc6d
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DefaultKnowledgePublisher.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java

  Log Message:
  -----------
  Refactor default knowledge publisher


  Commit: bd398055a7b5437104417de619b8ce06e023f7bb
      https://github.com/d3scomp/JDEECo/commit/bd398055a7b5437104417de619b8ce06e023f7bb
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DefaultKnowledgePublisher.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java

  Log Message:
  -----------
  Merge branch 'network' into omnet-plugin

Conflicts:
	jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
	jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java


  Commit: 242c533209f2c18651cd369a50c13089374acda9
      https://github.com/d3scomp/JDEECo/commit/242c533209f2c18651cd369a50c13089374acda9
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java

  Log Message:
  -----------
  Remove now unecessary hack with send immediately


  Commit: cd5a8d1faac9da0470a536385ea4e7bdd16da221
      https://github.com/d3scomp/JDEECo/commit/cd5a8d1faac9da0470a536385ea4e7bdd16da221
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/IPAddress.java

  Log Message:
  -----------
  Add toString for IPAddress


  Commit: 9bae84f197df2924c9150be2e285b0f5c99a7144
      https://github.com/d3scomp/JDEECo/commit/9bae84f197df2924c9150be2e285b0f5c99a7144
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTInfrastructureDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java

  Log Message:
  -----------
  Add infrastructure network support for omnet Java part


  Commit: aebdc233892a9bdc8ae065053c5182080b488416
      https://github.com/d3scomp/JDEECo/commit/aebdc233892a9bdc8ae065053c5182080b488416
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTBroadcastDevice.java

  Log Message:
  -----------
  Refactor OMNeT broadcast device


  Commit: d540dfba22120bcbb72b4795d3df7a12ea9a6c17
      https://github.com/d3scomp/JDEECo/commit/d540dfba22120bcbb72b4795d3df7a12ea9a6c17
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-13 (Fri, 13 Mar 2015)

  Changed paths:
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
    M jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc

  Log Message:
  -----------
  Refactor code


  Commit: 35bc98d577959adf8d776b4457b223409ea53edd
      https://github.com/d3scomp/JDEECo/commit/35bc98d577959adf8d776b4457b223409ea53edd
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.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
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
    A jdeeco-network-plugin/logs/placeholder
    M jdeeco-network-plugin/pom.xml
    A jdeeco-network-plugin/test/.gitignore
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/InstantSchedulerMock.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
    M jdeeco-parent/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/jDEECo-3' into omnet-plugin

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
	jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java


  Commit: 5c164aa4c45f2e63c131cee5679a8d2387fdebfe
      https://github.com/d3scomp/JDEECo/commit/5c164aa4c45f2e63c131cee5679a8d2387fdebfe
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-16 (Mon, 16 Mar 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.h

  Log Message:
  -----------
  Preliminary fix for OMNeT infrastructure packet sending


  Commit: d065350bc3e89e67b1e247e636c99066ea7400f3
      https://github.com/d3scomp/JDEECo/commit/d065350bc3e89e67b1e247e636c99066ea7400f3
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-17 (Tue, 17 Mar 2015)

  Changed paths:
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTInfrastructureDevice.java
    M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.cc

  Log Message:
  -----------
  Use static IP addresses with OMNeT, generate OMNeT config from the DEECo
nodes and devices


  Commit: 0fc05b3ed72a8a827c916e0433982b71eaff1f2c
      https://github.com/d3scomp/JDEECo/commit/0fc05b3ed72a8a827c916e0433982b71eaff1f2c
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DefaultKnowledgePublisher.java

  Log Message:
  -----------
  Pass knoweldge data to method obtaining peer list in Default
KnowledgePublisher


  Commit: 797557d72e54d454c4b42c1087410a37207ab41c
      https://github.com/d3scomp/JDEECo/commit/797557d72e54d454c4b42c1087410a37207ab41c
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DefaultKnowledgePublisher.java

  Log Message:
  -----------
  Make default publishing period configurable by constructor in
DefaultKnowledgePublisher


  Commit: 7b682c76e4af599340633ffcefaeffa9533b3c5c
      https://github.com/d3scomp/JDEECo/commit/7b682c76e4af599340633ffcefaeffa9533b3c5c
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    A jdeeco-omnet-plugin/test/demo/broadcast/BroadcastConvoyTest.java
    A jdeeco-omnet-plugin/test/demo/broadcast/ConvoyEnsemble.java
    A jdeeco-omnet-plugin/test/demo/broadcast/Follower.java
    A jdeeco-omnet-plugin/test/demo/broadcast/Leader.java
    A jdeeco-omnet-plugin/test/demo/broadcast/Waypoint.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/ConvoyEnsemble.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/Follower.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/InfrastructureConvoyTest.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/Leader.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/Waypoint.java

  Log Message:
  -----------
  Add integration "tests" for OMNeT, that cannot be used as JUnit tests
but are still good to verify OMNeT behaviour and demonstrate usage


  Commit: c93ddce18cbab9a58dc3c57046c0469462286d76
      https://github.com/d3scomp/JDEECo/commit/c93ddce18cbab9a58dc3c57046c0469462286d76
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTConfigGenerator.java

  Log Message:
  -----------
  Add OMNeTConfigGenerator


  Commit: 3bf8f1e8436a9e937061cb495db3b25a7fb546fe
      https://github.com/d3scomp/JDEECo/commit/3bf8f1e8436a9e937061cb495db3b25a7fb546fe
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-03-18 (Wed, 18 Mar 2015)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/CoordinatorRole.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/MemberRole.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRole.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRoleMultiple.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationChecker.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationCheckerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RoleAnnotationsHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.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/timer/DiscreteEventTimer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/Timer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/WallTimeTimer.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.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-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/IPAddress.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DefaultKnowledgePublisher.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/InstantSchedulerMock.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java
    A jdeeco-omnet-plugin/.gitignore
    A jdeeco-omnet-plugin/.project
    A jdeeco-omnet-plugin/pom.xml
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTBroadcastDevice.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTConfigGenerator.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTDevice.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTInfrastructureDevice.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTSimulation.java
    A jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/package-info.java
    A jdeeco-omnet-plugin/test/demo/broadcast/BroadcastConvoyTest.java
    A jdeeco-omnet-plugin/test/demo/broadcast/ConvoyEnsemble.java
    A jdeeco-omnet-plugin/test/demo/broadcast/Follower.java
    A jdeeco-omnet-plugin/test/demo/broadcast/Leader.java
    A jdeeco-omnet-plugin/test/demo/broadcast/Waypoint.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/ConvoyEnsemble.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/Follower.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/InfrastructureConvoyTest.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/Leader.java
    A jdeeco-omnet-plugin/test/demo/infrastructure/Waypoint.java
    M jdeeco-simulation-omnet-native/.classpath
    M jdeeco-simulation-omnet-native/.gitignore
    M jdeeco-simulation-omnet-native/.settings/org.eclipse.core.resources.prefs
    M jdeeco-simulation-omnet-native/Makefile
    M jdeeco-simulation-omnet-native/models/JDEECoApplication.ned
    M jdeeco-simulation-omnet-native/pom.xml
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
    M jdeeco-simulation-omnet-native/src/JDEECoApplication.h
    A jdeeco-simulation-omnet-native/src/JDEECoModule.cc
    M jdeeco-simulation-omnet-native/src/JDEECoModule.h
    A jdeeco-simulation-omnet-native/src/JDEECoRuntime.cc
    A jdeeco-simulation-omnet-native/src/JDEECoRuntime.h
    A jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc
    A jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNative.java
    A jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNeTNativeListener.java
    A jdeeco-simulation-omnet-native/src/cz/cuni/mff/d3s/deeco/simulation/omnet/package-info.java
    M jdeeco-simulation-omnet-native/src/simulation.cc
    A jdeeco-simulation-omnet-native/src/simulation.h
    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/omnet-plugin' into jDEECo-3


Compare: https://github.com/d3scomp/JDEECo/compare/41c3f24e4c3e...3bf8f1e8436a

More information about the DEECo mailing list