[DEECo] [d3scomp/JDEECo] deae70: Initial commit of network plugin

[GitHub]

  Branch: refs/heads/omnet-plugin
  Home:   https://github.com/d3scomp/JDEECo
  Commit: deae70859c9143c26b37648fdaeedc718f50e7c9
      https://github.com/d3scomp/JDEECo/commit/deae70859c9143c26b37648fdaeedc718f50e7c9
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M .gitignore
    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/App.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/AppTest.java

  Log Message:
  -----------
  Initial commit of network plugin


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

  Changed paths:
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/App.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/PacketType.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Address.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/IPAddress.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETBroadcastAddress.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/Packet.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/Strategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Packet.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/ReceivedInfo.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Strategy.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

  Log Message:
  -----------
  Classes stubs


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

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

  Log Message:
  -----------
  Add exception for unregistered packet type


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

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

  Log Message:
  -----------
  Add members to PacketType interface


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

  Changed paths:
    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/marshaller/Marshaller.java

  Log Message:
  -----------
  Add members to Marshaller interface


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Address.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/IPAddress.java
    A 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/Layer.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETBroadcastAddress.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETReceivedInfo.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Packet.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Strategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Packet.java

  Log Message:
  -----------
  Renamed packets


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

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

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


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Address.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/IPAddress.java
    A 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/Layer.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETBroadcastAddress.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETReceivedInfo.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Packet.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Strategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Packet.java

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


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

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

  Log Message:
  -----------
  Add dummy implementations of marshalling


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

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/KnowledgePacketType.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketType.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/Marshaller.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallerRegistry.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshalingTest.java

  Log Message:
  -----------
  Add basic tests for marshalling


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/KnowledgePacketType.java
    M 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/marshaller/Marshaller.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallerRegistry.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/SerializingMarshaller.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshalingTest.java

  Log Message:
  -----------
  Baseline implementation of marshalling


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

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/MarshallingException.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/Marshaller.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/MarshalingTest.java

  Log Message:
  -----------
  Use MarshallingException for marshalling problems


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

  Changed paths:
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/KnowledgePacketType.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketType.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes/GrouperPacketType.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes/KnowledgePacketType.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes/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/marshaller/MarshallerRegistry.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshalingTest.java

  Log Message:
  -----------
  Provide better implementation of PacketType, move packet types to
separate package


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes/KnowledgePacketType.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes/PacketType.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/MarshallingException.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/marshaller/Marshaller.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallerRegistry.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/SerializingMarshaller.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshalingTest.java

  Log Message:
  -----------
  Add some comments fo marshaling


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

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes/GrouperPacketType.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes/KnowledgePacketType.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes/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/marshaller/Marshaller.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/MarshalingTest.java

  Log Message:
  -----------
  Use byte for network packet type


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

  Changed paths:
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/AppTest.java

  Log Message:
  -----------
  Remove default tests generated by eclipse


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

  Changed paths:
    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/Layer.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/l2/ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Strategy.java
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshalingTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshallingTest.java

  Log Message:
  -----------
  Add basic interfaces for L2 networking


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

  Changed paths:
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Tests.java

  Log Message:
  -----------
  Add dummy L2 test class


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

  Changed paths:
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshallingTest.java

  Log Message:
  -----------
  Add complex payload test for marshalling


  Commit: 174d989e4ece38e041353793ea134b632750c70c
      https://github.com/d3scomp/JDEECo/commit/174d989e4ece38e041353793ea134b632750c70c
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPlugin.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/PluginDependencyException.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
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  plugin architecture - first cut


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

  Changed paths:
    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/Layer.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/PacketHeader.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Tests.java

  Log Message:
  -----------
  Fix L2 packet marshalling/unmarshalling


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

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketType.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketTypes.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/PacketHeader.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallerRegistry.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Tests.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshallingTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/PacketTypeTest.java

  Log Message:
  -----------
  Use wrapping class for L2 network packet type value


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketType.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/MarshallingException.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

  Log Message:
  -----------
  Improve commnets and some code in the L2 network


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java

  Log Message:
  -----------
  Implement packet processing, improve tests


  Commit: e6ffd81f634ed96aa1caba6a421f77585cbb81cd
      https://github.com/d3scomp/JDEECo/commit/e6ffd81f634ed96aa1caba6a421f77585cbb81cd
  Author: Buckey <aertheas at gmail.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/CycleDetectedException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPlugin.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPluginContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/PluginDependencyException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  Split the PluginDependencyException into two exception classes
representing different failure scenarios. Added an interface
DEECoPluginContainer which provides a primary access point to the DEECo
class from the perspective of the plugins. An instance implementing this
interface is now also passed to the plugin via the init() method.
Refactoring of the DEECo class.


  Commit: f27f430ca19e153a86d4e47794b5cecb280cffb8
      https://github.com/d3scomp/JDEECo/commit/f27f430ca19e153a86d4e47794b5cecb280cffb8
  Author: Buckey <aertheas at gmail.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java

  Log Message:
  -----------
  Added basic tests for the DEECo class. Not tested yet, WIP.


  Commit: ab1edccb112f0fc1f677ecac690037c4f8717f8c
      https://github.com/d3scomp/JDEECo/commit/ab1edccb112f0fc1f677ecac690037c4f8717f8c
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-06 (Fri, 06 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/RuntimeFrameworkImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.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
    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
    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:
  -----------
  dynamic deployment - in progress


  Commit: 0b2afbdb9340bc6e1ca04c561ad843cbaac5fa22
      https://github.com/d3scomp/JDEECo/commit/0b2afbdb9340bc6e1ca04c561ad843cbaac5fa22
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-06 (Fri, 06 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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/CycleDetectedException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPlugin.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPluginContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/PluginDependencyException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

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

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java


  Commit: 2481a631c14243d654318fe91efe02e9786bf3ca
      https://github.com/d3scomp/JDEECo/commit/2481a631c14243d654318fe91efe02e9786bf3ca
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-06 (Fri, 06 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/task/ProcessContext.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.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/runtime/DEECoTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  fixing tests for dynamic deployment and plugin functionality


  Commit: eec6ec0a631bb45ac37339afaec7f7ed807ba0d2
      https://github.com/d3scomp/JDEECo/commit/eec6ec0a631bb45ac37339afaec7f7ed807ba0d2
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-08 (Sun, 08 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/DEECoPlugin.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPluginContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java

  Log Message:
  -----------
  plugin architecture enhancements and javadoc


  Commit: 3640266298c8f68ee3f8e8ec70d7ce52f5dc850d
      https://github.com/d3scomp/JDEECo/commit/3640266298c8f68ee3f8e8ec70d7ce52f5dc850d
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPlugin.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPluginContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  renaming 'DEECoPluginContainer' to 'DEECoContainer'


  Commit: 236978c27c32aed7b7aef3a056f73220559a9cf3
      https://github.com/d3scomp/JDEECo/commit/236978c27c32aed7b7aef3a056f73220559a9cf3
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java

  Log Message:
  -----------
  small fix


  Commit: b562020b902ff5e69142ad90538b2694acadb7ae
      https://github.com/d3scomp/JDEECo/commit/b562020b902ff5e69142ad90538b2694acadb7ae
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-08 (Sun, 08 Feb 2015)

  Changed paths:
    M jdeeco-architecture/2015/architecture-2015-02-04.emx

  Log Message:
  -----------
  plugin architecture class diagram


  Commit: 7053b6192d93439057a6b30e7b438540664843c9
      https://github.com/d3scomp/JDEECo/commit/7053b6192d93439057a6b30e7b438540664843c9
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Device.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/Layer.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java

  Log Message:
  -----------
  L1 update


  Commit: 725479b3078c75fa6d94741542df20c20e6bb2d2
      https://github.com/d3scomp/JDEECo/commit/725479b3078c75fa6d94741542df20c20e6bb2d2
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 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-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/PacketType.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/MarshallingException.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/UnregistredPacketType.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer.java
    A 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/L2Packet.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer.java
    A 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/l2/ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/Marshaller.java
    M 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
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/AppTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshallingTest.java
    A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/PacketTypeTest.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/l2/L2Packet.java


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

  Changed paths:
    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
    M 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/L1ReceivedInfo.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/l1/MANETReceivedInfo.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java
    M 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
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/ReceivedInfo.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java
    A jdeeco-parent/jDEECoFormatter.xml

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


  Commit: 728d35f639032a6553a94fffb7eab5ad0de2b638
      https://github.com/d3scomp/JDEECo/commit/728d35f639032a6553a94fffb7eab5ad0de2b638
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-09 (Mon, 09 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/DEECoContainer.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
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/TestSerializer.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java

  Log Message:
  -----------
  Changing 'deployComponents' becomes 'deployComponent' and returns
ComponentInstance, 'deployEnsembles' becomes 'deployEnsemble' and
returns EnsembleDefinition


  Commit: 34fd2273b9420f46a2f934e92d3952d10370e5fa
      https://github.com/d3scomp/JDEECo/commit/34fd2273b9420f46a2f934e92d3952d10370e5fa
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M jdeeco-architecture/2015/architecture-2015-02-04.emx

  Log Message:
  -----------
  plugin architecture class diagram update


  Commit: 024045ab604e8c72abcd44da46c26e62fd3606e7
      https://github.com/d3scomp/JDEECo/commit/024045ab604e8c72abcd44da46c26e62fd3606e7
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M jdeeco-architecture/2015/architecture-2015-02-04.emx

  Log Message:
  -----------
  plugin architecture class diagram fix


  Commit: 5037f2abee631f37d3d7fa6d19d7ac886d98c80b
      https://github.com/d3scomp/JDEECo/commit/5037f2abee631f37d3d7fa6d19d7ac886d98c80b
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.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

  Log Message:
  -----------
  Cleanup: removing RuntimeConfiguration and RuntimeFrameworkBuilder
classes and their test classes


  Commit: 71387baab13ed75d8a34715725554cc4eb639643
      https://github.com/d3scomp/JDEECo/commit/71387baab13ed75d8a34715725554cc4eb639643
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Address.java
    M 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/MANETBroadcastAddress.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Address.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/IPAddress.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/L1ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETBroadcastAddress.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java

  Log Message:
  -----------
  Moving the Address to the network package as it is shared between
layers.


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

  Changed paths:
    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/L2ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/PacketHeader.java

  Log Message:
  -----------
  Simplify L2 network code


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

  Changed paths:
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java
    R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/MarshallingTest.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

  Log Message:
  -----------
  Move L2 and marshalling tests to correct packeges


  Commit: 11be907edb7ef3882b9ace37227e2b2dc281755c
      https://github.com/d3scomp/JDEECo/commit/11be907edb7ef3882b9ace37227e2b2dc281755c
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Device.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/IPAddress.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/l1/L1Packet.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Strategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Strategy.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java

  Log Message:
  -----------
  Renaming strategies + other updates


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Device.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/IPAddress.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/l1/L1Packet.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Strategy.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Strategy.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

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

Conflicts:
	jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/L2Test.java


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

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

  Log Message:
  -----------
  Add network plugin class


  Commit: 1bd1c438c772b303548deee14c4906a8f55cad14
      https://github.com/d3scomp/JDEECo/commit/1bd1c438c772b303548deee14c4906a8f55cad14
  Author: Buckey <aertheas at gmail.com>
  Date:   2015-02-09 (Mon, 09 Feb 2015)

  Changed paths:
    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/DEECoException.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/PluginDependencyException.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:
  -----------
  Added detection of duplicate ensemble definition and invalid start/stop
ordering. Added state query (isRunning) to the DEECoContainer. Added
exceptions corresponding to these cases and a common DEECoException base
class. Test suite for DEECo complete, comments added.


  Commit: b4371d85ad5ba246498bcf407ebf5a54e51d2a88
      https://github.com/d3scomp/JDEECo/commit/b4371d85ad5ba246498bcf407ebf5a54e51d2a88
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-10 (Tue, 10 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/l2/Layer2.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

  Log Message:
  -----------
  Add interface, tests and implementation for L2 strategy listing and
removal.


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

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/Gossip.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/KnowledgeListener.java

  Log Message:
  -----------
  Add interface for gossip implementation


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/Gossip.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/KnowledgeListener.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/ILayer1.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/ILayer2.java
    M 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

  Log Message:
  -----------
  Use separate interfaces for defining network behaviour


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

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/INetworkToDevice.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/INetworkToGossip.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/NetworkToDevice.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkToGossip.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

  Log Message:
  -----------
  Use new interfaces in Layer2 network


  Commit: dbda7d213993286b8502a2010310bea4f098f49f
      https://github.com/d3scomp/JDEECo/commit/dbda7d213993286b8502a2010310bea4f098f49f
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2015-02-10 (Tue, 10 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 pull request #175 from d3scomp/plugin-architecture

Plugin architecture


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

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

  Log Message:
  -----------
  Update + restructuring


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

  Changed paths:
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/ILayer1.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/ILayer2.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/INetworkToDevice.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/INetworkToGossip.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L2PacketProcessor.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/Layer1Manager.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Layer2Manager.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkPlugin.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
    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

  Log Message:
  -----------
  Refactor network interfaces


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

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1StrategyManager.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L2StrategyManager.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Layer1Manager.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Layer2Manager.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkPlugin.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java

  Log Message:
  -----------
  Rename starategy managers


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

  Changed paths:
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1DataProcessor.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L2PacketProcessor.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/l2/Layer2.java

  Log Message:
  -----------
  Fix interface for L1 -> L2 network data passing


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l0/Layer0.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Packet.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1ReceivedInfo.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/l1/MANETReceivedInfo.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java

  Log Message:
  -----------
  Refactoring


  Commit: 27baabff7f80b7c043675e5f092eef330dc4dd5b
      https://github.com/d3scomp/JDEECo/commit/27baabff7f80b7c043675e5f092eef330dc4dd5b
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/ILayer1.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/ILayer2.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/INetworkToDevice.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/INetworkToGossip.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/L2StrategyManager.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkPlugin.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
    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

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


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1DataProcessor.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/PacketType.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/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

  Log Message:
  -----------
  Fix passing L2 packet type


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

Conflicts:
	jdeeco-architecture/2015/architecture-2015-02-04.emx


  Commit: 7338f8eb77b9a92c372e40fb634825ae7fc855dd
      https://github.com/d3scomp/JDEECo/commit/7338f8eb77b9a92c372e40fb634825ae7fc855dd
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1StrategyManager.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/l0/Layer0.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DataIDSource.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DefaultDataIDSource.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/L1Strategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java

  Log Message:
  -----------
  Refactoring + implementation update + comments added


  Commit: 6f8985ab633df937413eaae85c65ee463e22ef72
      https://github.com/d3scomp/JDEECo/commit/6f8985ab633df937413eaae85c65ee463e22ef72
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1DataProcessor.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/PacketType.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/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

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


  Commit: 6a3c5f941127dc5343a32fdf6b91b0238098372d
      https://github.com/d3scomp/JDEECo/commit/6a3c5f941127dc5343a32fdf6b91b0238098372d
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

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

  Log Message:
  -----------
  Fix.


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

  Changed paths:
    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/Network.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkPlugin.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/NetworkToGossip.java

  Log Message:
  -----------
  Add DummyGossip and turn Network and Gossip into DEECo plugins


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

  Changed paths:
    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/l1/MANETReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java

  Log Message:
  -----------
  Comments added.


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

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

  Log Message:
  -----------
  Pass data to network in dummy gossip implementation


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1StrategyManager.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/l0/Layer0.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DataIDSource.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DefaultDataIDSource.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Packet.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1ReceivedInfo.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Strategy.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/l1/MANETReceivedInfo.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java

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


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

  Changed paths:
    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
    M 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/l0/Layer0.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/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

  Log Message:
  -----------
  Some comments to the network


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

  Changed paths:
    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
    M 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/l0/Layer0.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/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

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

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


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/DummyGossip.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/l2/Layer2.java

  Log Message:
  -----------
  Remove extra network interfaces


  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


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

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

  Log Message:
  -----------
  DeviceOutputQueue and Layer1 update.


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

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

  Log Message:
  -----------
  Layer1 - logging instead boolean value return in device registration


  Commit: 6a4c6ce4835f72c12bd4013df0c2d67aa4a07cba
      https://github.com/d3scomp/JDEECo/commit/6a4c6ce4835f72c12bd4013df0c2d67aa4a07cba
  Author: Vladimir Matena <matena 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/l2/package-info.java

  Log Message:
  -----------
  Add Layer 2 package info


  Commit: 764f11cf5087ae122b53a62206384a2d5db7cf81
      https://github.com/d3scomp/JDEECo/commit/764f11cf5087ae122b53a62206384a2d5db7cf81
  Author: Vladimir Matena <matena 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/gossip/DummyKnowledgePublisher.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java

  Log Message:
  -----------
  Add DummyPublisher


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

  Changed paths:
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/L1DataProcessor.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

  Log Message:
  -----------
  Fix Layer 2 interface


  Commit: 7744dd02a6de01e693ed0dbf1fd6359193f1450d
      https://github.com/d3scomp/JDEECo/commit/7744dd02a6de01e693ed0dbf1fd6359193f1450d
  Author: Vladimir Matena <matena 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/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
    M 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:
  -----------
  Merge branch 'network' of https://github.com/d3scomp/JDEECo.git into
network

Conflicts:
	jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/package-info.java


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

  Changed paths:
    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/L2Packet.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

  Log Message:
  -----------
  Fix layer 2 to layer 1 interface


  Commit: d137c25814616d0aad4da71aaf51b1fe23b3b35c
      https://github.com/d3scomp/JDEECo/commit/d137c25814616d0aad4da71aaf51b1fe23b3b35c
  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/gossip/DummyKnowledgePublisher.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/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/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/package-info.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

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


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

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

  Log Message:
  -----------
  Fix assignong L2 to L2 packets passed to L2 from upper layers


  Commit: 81daa8bf586fae6fe6d5fa36df3470ebafdba714
      https://github.com/d3scomp/JDEECo/commit/81daa8bf586fae6fe6d5fa36df3470ebafdba714
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2015-02-12 (Thu, 12 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/DefaultDataIDSource.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
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2ReceivedInfo.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

  Log Message:
  -----------
  L1 packet header is reduced


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

  Changed paths:
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/DummyGossip.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/DummyKnowledgePublisher.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/Gossip.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java

  Log Message:
  -----------
  Implement broadcast-only security-less knowledge publisher


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

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

  Log Message:
  -----------
  Fix sending knowledge by dummy knowledge publisher


  Commit: 090ef12da6094abf930af51546c70f1c4b54e52e
      https://github.com/d3scomp/JDEECo/commit/090ef12da6094abf930af51546c70f1c4b54e52e
  Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
  Date:   2015-02-12 (Thu, 12 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/DefaultDataIDSource.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
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2ReceivedInfo.java
    M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java

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


  Commit: 8c566307d6c46695f102e176d8768ffc42515007
      https://github.com/d3scomp/JDEECo/commit/8c566307d6c46695f102e176d8768ffc42515007
  Author: Vladimir Matena <matena 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/PrintingBroadcastDevice.java

  Log Message:
  -----------
  Implement console printing network device


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

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

  Log Message:
  -----------
  Attempt to fix L1 buffer overflow
@mkit Please check whenever it is ok


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

  Changed paths:
    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/L1Packet.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

  Log Message:
  -----------
  Tests


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

  Changed paths:
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/DummyGossip.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/DummyKnowledgePublisher.java
    R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/gossip/Gossip.java
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/PrintingBroadcastDevice.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
    A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java

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


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

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

  Log Message:
  -----------
  Add comments for dummy knowledge publisher


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

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

  Log Message:
  -----------
  Implement loopback broadcast network device


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

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

  Log Message:
  -----------
  Implement Knowledge inserting L2 strategy


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

  Changed paths:
    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/l2/strategy/KnowledgeInsertingStrategy.java
    M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java

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


  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


Compare: https://github.com/d3scomp/JDEECo/compare/a7667001c7d3...8899cdb7b6b7