[DEECo] [d3scomp/JDEECo] eec41b: Update

GitHub noreply at github.com
Fri Jun 13 23:36:18 CEST 2014 

  Branch: refs/heads/sim-bures
  Home:   https://github.com/d3scomp/JDEECo
  Commit: eec41b1aaacc27e0adcbdcb6de2baf92862e79fe
      https://github.com/d3scomp/JDEECo/commit/eec41b1aaacc27e0adcbdcb6de2baf92862e79fe
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

  Changed paths:
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java

  Log Message:
  -----------
  Update


  Commit: 802245f1854289c352579097bd17b1dbd4f879ea
      https://github.com/d3scomp/JDEECo/commit/802245f1854289c352579097bd17b1dbd4f879ea
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    M jdeeco-core/plugin.xml
    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/RuntimeMetadataFactoryImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/StringToObjectMapImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PositionProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java

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


  Commit: f7d36c88393073b1072ca51df45415622998ac8e
      https://github.com/d3scomp/JDEECo/commit/f7d36c88393073b1072ca51df45415622998ac8e
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-06-12 (Thu, 12 Jun 2014)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ObjectToObjectMapImpl.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Member.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionAwareComponent.java
    A jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionSensor.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
    A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
    A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java

  Log Message:
  -----------
  Update


  Commit: 0b9ff0de5acc0c2eda5b38f5a8c3139e90606147
      https://github.com/d3scomp/JDEECo/commit/0b9ff0de5acc0c2eda5b38f5a8c3139e90606147
  Author: Michal Kit <kit at d3s.mff.cuni.cz>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
    A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulationRuntimeBuilder.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimPreloadingControler.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
    R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationRuntimeBuilder.java

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


  Commit: ca5f4d949fad94e1d89d4577539ad8b1bd1ba386
      https://github.com/d3scomp/JDEECo/commit/ca5f4d949fad94e1d89d4577539ad8b1bd1ba386
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-parent/pom.xml
    A jdeeco-simulation-omnet-native/.project
    A jdeeco-simulation-omnet-native/.settings/org.eclipse.core.resources.prefs
    A jdeeco-simulation-omnet-native/.settings/org.eclipse.m2e.core.prefs
    A jdeeco-simulation-omnet-native/Makefile
    A jdeeco-simulation-omnet-native/README.md
    A jdeeco-simulation-omnet-native/models/CustomEthernetInterface.ned
    A jdeeco-simulation-omnet-native/models/CustomMobility.ned
    A jdeeco-simulation-omnet-native/models/Host802154.ned
    A jdeeco-simulation-omnet-native/models/JDEECoApplication.ned
    A jdeeco-simulation-omnet-native/models/KmlHttpServer.ned
    A jdeeco-simulation-omnet-native/models/MANET.ned
    A jdeeco-simulation-omnet-native/models/Nic802154_TI_CC2420_Decider.xml
    A jdeeco-simulation-omnet-native/models/Node.ned
    A jdeeco-simulation-omnet-native/models/Switch.ned
    A jdeeco-simulation-omnet-native/models/VisualizationController.ned
    A jdeeco-simulation-omnet-native/models/config80211.xml
    A jdeeco-simulation-omnet-native/models/config802154.xml
    A jdeeco-simulation-omnet-native/models/network.cfg
    A jdeeco-simulation-omnet-native/models/node80211.route
    A jdeeco-simulation-omnet-native/models/package.ned
    A jdeeco-simulation-omnet-native/models/router.route
    A jdeeco-simulation-omnet-native/omnet-config/configure.user
    A jdeeco-simulation-omnet-native/pom.xml
    A jdeeco-simulation-omnet-native/src/.gitignore
    A jdeeco-simulation-omnet-native/src/CustomMobility.cc
    A jdeeco-simulation-omnet-native/src/CustomMobility.h
    A jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
    A jdeeco-simulation-omnet-native/src/JDEECoApplication.h
    A jdeeco-simulation-omnet-native/src/JDEECoModule.h
    A jdeeco-simulation-omnet-native/src/JDEECoPacket.msg
    A jdeeco-simulation-omnet-native/src/KmlHttpServer.cc
    A jdeeco-simulation-omnet-native/src/KmlHttpServer.h
    A jdeeco-simulation-omnet-native/src/KmlUtil.cc
    A jdeeco-simulation-omnet-native/src/KmlUtil.h
    A jdeeco-simulation-omnet-native/src/SocketDataProvider.h
    A jdeeco-simulation-omnet-native/src/SocketRealTimeScheduler.cc
    A jdeeco-simulation-omnet-native/src/SocketRealTimeScheduler.h
    A jdeeco-simulation-omnet-native/src/SocketSequentialScheduler.cc
    A jdeeco-simulation-omnet-native/src/SocketSequentialScheduler.h
    A jdeeco-simulation-omnet-native/src/VisualizationController.cc
    A jdeeco-simulation-omnet-native/src/VisualizationController.h
    A jdeeco-simulation-omnet-native/src/config.h
    A jdeeco-simulation-omnet-native/src/simulation.cc
    M jdeeco-simulation/pom.xml

  Log Message:
  -----------
  Cleaned up POM files and mavenization (+renaming) of jdeeco-omnetpp.


  Commit: 126e495dd4782539485ba6c11efb5d5a1ed67576
      https://github.com/d3scomp/JDEECo/commit/126e495dd4782539485ba6c11efb5d5a1ed67576
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    M jdeeco-core/plugin.xml
    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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ObjectToObjectMapImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/StringToObjectMapImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/NetworkProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PositionProvider.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Main.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/Member.java
    M jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionAwareComponent.java
    A jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/demo/PositionSensor.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectConnectionsProvider.java
    A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationHost.java
    A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoAgent.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/JDEECoWithinDayMobsimListener.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataProvider.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimDataReceiver.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimInput.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulationRuntimeBuilder.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimRouter.java
    A jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimSimulation.java
    M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java
    R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationRuntimeBuilder.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen-kit' into sim-bures

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
	jdeeco-simulation-demo/src/cz/cuni/mff/d3s/jdeeco/simulation/jni/DemoJNIKnowledgeDataManager.java
	jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulation.java


Compare: https://github.com/d3scomp/JDEECo/compare/26126dadd580...126e495dd478

More information about the DEECo mailing list