[DEECo] [d3scomp/JDEECo] 3630ee: Merge branch 'newgen' into newgen-iliasg

GitHub noreply at github.com
Fri Nov 1 17:37:20 CET 2013 

  Branch: refs/heads/newgen
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 3630ee991ad3810213970e2b1ecbeef4357ba068
      https://github.com/d3scomp/JDEECo/commit/3630ee991ad3810213970e2b1ecbeef4357ba068
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    A jdeeco-core/logs/.gitignore
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/ExecutionListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/Executor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutorTest.java
    A jdeeco-core/test/logging.properties

  Log Message:
  -----------
  Merge branch 'newgen' into newgen-iliasg


  Commit: 2fd314244eec1c6dcdf7aa20914af6cec754c13c
      https://github.com/d3scomp/JDEECo/commit/2fd314244eec1c6dcdf7aa20914af6cec754c13c
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Component.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/api/Condition.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Ensemble.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleDefinition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Exchange.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/InstanceEnsemblingController.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/InstanceProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Invocable.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/KnowledgeChangeTrigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/KnowledgePath.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Parameter.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ParameterDirection.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeField.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMapKey.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Process.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/RuntimeMetadata.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/SchedulingSpecification.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Trigger.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentImpl.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/ConditionImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleDefinitionImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ExchangeImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InstanceEnsemblingControllerImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InstanceProcessImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InvocableImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/KnowledgeChangeTriggerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/KnowledgePathImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ParameterImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeFieldImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMapKeyImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ProcessImpl.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/RuntimeMetadataImpl.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/impl/SchedulingSpecificationImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/TriggerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataFactory.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java

  Log Message:
  -----------
  new ecore-generated code


  Commit: 3feaa0e891f654027795de36ed3bcc20755fcaa2
      https://github.com/d3scomp/JDEECo/commit/3feaa0e891f654027795de36ed3bcc20755fcaa2
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/ConvoyEnsemble.java
    A jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/ListComponent.java
    A jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/Path.java
    A jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/RobotFollowerComponent.java
    A jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/RobotLeaderComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java
    A jdeeco-demo/.project

  Log Message:
  -----------
  fixing the build (tests)


  Commit: 950b24fa12b7af7819f23bf01a829a9c6743ecdf
      https://github.com/d3scomp/JDEECo/commit/950b24fa12b7af7819f23bf01a829a9c6743ecdf
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    R jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/ConvoyEnsemble.java
    R jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/ListComponent.java
    R jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/Path.java
    R jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/RobotFollowerComponent.java
    R jdeeco-core/src/cz/cuni/mff/d3s/jdeeco/javaInput/RobotLeaderComponent.java

  Log Message:
  -----------
  cleaning up...


  Commit: 74b6a55cf4ae73d3b3c2f32ad414915388e55ac7
      https://github.com/d3scomp/JDEECo/commit/74b6a55cf4ae73d3b3c2f32ad414915388e55ac7
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    R jdeeco-demo/.project

  Log Message:
  -----------
  2nd clean up


  Commit: 0eab39ba3137383bc1f46e27062694f1d99d4d4e
      https://github.com/d3scomp/JDEECo/commit/0eab39ba3137383bc1f46e27062694f1d99d4d4e
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-01 (Fri, 01 Nov 2013)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Component.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/api/Condition.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Ensemble.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleDefinition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Exchange.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/InstanceEnsemblingController.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/InstanceProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Invocable.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/KnowledgeChangeTrigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/KnowledgePath.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Parameter.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ParameterDirection.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeField.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMapKey.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Process.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/RuntimeMetadata.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/SchedulingSpecification.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Trigger.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentImpl.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/ConditionImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleDefinitionImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ExchangeImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InstanceEnsemblingControllerImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InstanceProcessImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InvocableImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/KnowledgeChangeTriggerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/KnowledgePathImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ParameterImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeFieldImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMapKeyImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ProcessImpl.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/RuntimeMetadataImpl.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/impl/SchedulingSpecificationImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/TriggerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataFactory.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java

  Log Message:
  -----------
  Merge pull request #75 from d3scomp/newgen-iliasg

New ecore model and refactoring


Compare: https://github.com/d3scomp/JDEECo/compare/9b744d7b0d5a...0eab39ba3137

More information about the DEECo mailing list