[DEECo] [d3scomp/JDEECo] ef32d9: SimLogger renamed to RuntimeLogger and moved to ac...

GitHub noreply at github.com
Wed Feb 25 11:50:30 CET 2015 

  Branch: refs/heads/omnet-plugin
  Home:   https://github.com/d3scomp/JDEECo
  Commit: ef32d9a03ea8e9aab72a63b304fc7b8e2671ba2f
      https://github.com/d3scomp/JDEECo/commit/ef32d9a03ea8e9aab72a63b304fc7b8e2671ba2f
  Author: iridin <skoda at d3s.mff.cuni.cz>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogRecord.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogTimerTaskListener.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java

  Log Message:
  -----------
  SimLogger renamed to RuntimeLogger and moved to according package.
Added unit tests for the RuntimeLogger.


  Commit: 404f493f93d5f29681b699ba0107b8b9777af85c
      https://github.com/d3scomp/JDEECo/commit/404f493f93d5f29681b699ba0107b8b9777af85c
  Author: iridin <skoda at d3s.mff.cuni.cz>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java

  Log Message:
  -----------
  Implementing the RuntimeLogger to pass all the tests in RuntimeLoggerTest class.


  Commit: edbe7c2550e7ab0b43811d15b59c590bd32307d2
      https://github.com/d3scomp/JDEECo/commit/edbe7c2550e7ab0b43811d15b59c590bd32307d2
  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:
  -----------
  Merge pull request #176 from d3scomp/plugin-architecture

Moving the check for duplicate ensemble definition from DEECo to AnnotationProcessor


  Commit: 2460908e487d733b357958d55bea14c0e11c2aef
      https://github.com/d3scomp/JDEECo/commit/2460908e487d733b357958d55bea14c0e11c2aef
  Author: iridin <skoda at d3s.mff.cuni.cz>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogRecord.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogTimerTaskListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/SnapshotProvider.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java

  Log Message:
  -----------
  The java doc for the runtime logger classes provided.


  Commit: d551a4d26d36e0eafbebe7a3ab379c5b3c60829b
      https://github.com/d3scomp/JDEECo/commit/d551a4d26d36e0eafbebe7a3ab379c5b3c60829b
  Author: iridin <skoda at d3s.mff.cuni.cz>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    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

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/origin/jDEECo-3' into runtimeLog


  Commit: 52663a2b0669b041855dde2cfaeccab3c3c058c6
      https://github.com/d3scomp/JDEECo/commit/52663a2b0669b041855dde2cfaeccab3c3c058c6
  Author: iridin <skoda at d3s.mff.cuni.cz>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogRecord.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogTimerTaskListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/SnapshotProvider.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java

  Log Message:
  -----------
  Implementing Tomas's suggestions.


  Commit: 59711fd7433a244c2d8338f6b7cc2d9619c6f424
      https://github.com/d3scomp/JDEECo/commit/59711fd7433a244c2d8338f6b7cc2d9619c6f424
  Author: iridin <skoda at d3s.mff.cuni.cz>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/SnapshotProvider.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java

  Log Message:
  -----------
  Commenting added code.


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

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java

  Log Message:
  -----------
  Unit tests for the rewritten functionality of RuntimeLogger.


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

  Changed paths:
    M jdeeco-core/pom.xml
    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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java

  Log Message:
  -----------
  Merge pull request #178 from d3scomp/runtimeLog

Runtime log


  Commit: 6c7e69e908dd2b658a516cee5fce714bc396977b
      https://github.com/d3scomp/JDEECo/commit/6c7e69e908dd2b658a516cee5fce714bc396977b
  Author: Buckey <aertheas at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.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

  Log Message:
  -----------
  Minor refactoring for testing (internal DEECoNode constructor), moved
duplicateEnsembleTest to AnnotationProcessorTest.


  Commit: 6c715f37794e03b1e5fc6787a61ad1d661d36c4d
      https://github.com/d3scomp/JDEECo/commit/6c715f37794e03b1e5fc6787a61ad1d661d36c4d
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-25 (Wed, 25 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
    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/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-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:
  -----------
  Merge remote-tracking branch 'origin/plugin-architecture' into jDEECo-3


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

  Changed paths:
    M .gitignore
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DuplicateEnsembleDefinitionException.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/Network.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/Address.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/IPAddress.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/MANETBroadcastAddress.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/package-info.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/Device.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/L1StrategyManager.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L2PacketSender.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/L1DataProcessor.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/L2PacketType.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/L2StrategyManager.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 jDEECo-3


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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.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

  Log Message:
  -----------
  Fix build


  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


Compare: https://github.com/d3scomp/JDEECo/compare/85bfd2e7aa5b...e29d77381811

More information about the DEECo mailing list