[DEECo] [d3scomp/JDEECo] 3b89ef: Network update

GitHub noreply at github.com
Thu Feb 12 12:21:20 CET 2015 

  Branch: refs/heads/network
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 3b89ef6d9e1c169a4a9010acf5958bfc242b504e
      https://github.com/d3scomp/JDEECo/commit/3b89ef6d9e1c169a4a9010acf5958bfc242b504e
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Device.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkToDevice.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l0/Device.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l0/Layer0.java
    A 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/L1Packet.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/network/l1/package-info.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/package-info.java

  Log Message:
  -----------
  Network update


  Commit: 96bb5e9c8cacfa73f519470cd98ed9c468aeb4b5
      https://github.com/d3scomp/JDEECo/commit/96bb5e9c8cacfa73f519470cd98ed9c468aeb4b5
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M jdeeco-architecture/2015/architecture-2015-02-04.emx
    A jdeeco-architecture/refactored_classes-03.02.15/runtime-builders.ucls
    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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentInstanceImpl.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
    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/security/KnowledgeEncryptor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/security/LocalSecurityChecker.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogRecord.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogTimerTaskListener.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogger.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SnapshotProvider.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/CustomStepTask.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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TimerTask.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TimerTaskListener.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/KnowledgeEncryptorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/LocalSecurityCheckerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/DummyGossip.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/Gossip.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1DataProcessor.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1StrategyManager.java
    M 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
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L2StrategyManager.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/MANETBroadcastAddress.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkPlugin.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkToDevice.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkToGossip.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketType.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/UnregistredPacketType.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.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/PacketHeader.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallerRegistry.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/PacketTypeTest.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallingTest.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DelayedKnowledgeDataHandler.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
    R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/TimerTaskListener.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/KnowledgeUpdateTask.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/SimulationStepTask.java
    R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/TimerTask.java

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

Conflicts:
	jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
	jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l0/Layer0.java


Compare: https://github.com/d3scomp/JDEECo/compare/7ed9de48f0e3...96bb5e9c8cac

More information about the DEECo mailing list