[DEECo] [d3scomp/JDEECo] 2cc47c: Scheduler receives Executor via a setter instead o...

GitHub noreply at github.com
Mon Nov 4 09:24:08 CET 2013 

  Branch: refs/heads/newgen-kit
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 2cc47c486fb75c185af2f2150dbe957a56cc6edb
      https://github.com/d3scomp/JDEECo/commit/2cc47c486fb75c185af2f2150dbe957a56cc6edb
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-02 (Sat, 02 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java

  Log Message:
  -----------
  Scheduler receives Executor via a setter instead of a constructor
parameter


  Commit: 51c116da978322112c3455ff1558ea2656d3c70e
      https://github.com/d3scomp/JDEECo/commit/51c116da978322112c3455ff1558ea2656d3c70e
  Author: rima-alali <alali at d3s.mff.cuni.cz>
  Date:   2013-11-02 (Sat, 02 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java

  Log Message:
  -----------
  Merge pull request #79 from d3scomp/newgen-keznikl

Scheduler receives Executor via a setter instead of a constructor


  Commit: 7689113fa713fa235dd176609000efc0e8f87d75
      https://github.com/d3scomp/JDEECo/commit/7689113fa713fa235dd176609000efc0e8f87d75
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

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

  Log Message:
  -----------
  Some suggestions for the KnowledgeManagersView class.
@rima-alali, @keznikl, @mkit


  Commit: f1971b355ee4032dff6107ebcf869c97d553a27e
      https://github.com/d3scomp/JDEECo/commit/f1971b355ee4032dff6107ebcf869c97d553a27e
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

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

  Log Message:
  -----------
  Extensions of the SampleRuntimeModel class to create also an ensemble.


  Commit: 30f8c7bcfccfb55524e2c81e999926c990e07947
      https://github.com/d3scomp/JDEECo/commit/30f8c7bcfccfb55524e2c81e999926c990e07947
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    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/EnsembleDefinition.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeCoordinator.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMember.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/EnsembleDefinitionImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeCoordinatorImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMemberImpl.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
    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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleCoordinatorTask.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleMemberTask.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.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

  Log Message:
  -----------
  Changes in the meta-model:
- remove ComponentInstance.id
- change OtherKnowledgeManagersAccess to KnowledgeManagersView
- have separate scheduling specifications for the member and the
coordinator (the main reason is to have separate triggers)

Further changes include separation of the the EnsembleTask into two (one
for a coordinator, another for all members). This is because they have
different scheduling. They will share a lot of implementation via some
abstract predecessor (the class for the predecessor is not in place
yet).


  Commit: 0d9d721955551d93f671f7babdd549f6bcc87509
      https://github.com/d3scomp/JDEECo/commit/0d9d721955551d93f671f7babdd549f6bcc87509
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleMemberTask.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleMembersTask.java

  Log Message:
  -----------
  EnsembleMemberTask renamed EnsembleMembersTask to signify that the task
actually handles multiple instances of the member role in ensembles of
the same ensemble definition.


  Commit: aa9f302c92c764d4ade19724002d2f931bf032b6
      https://github.com/d3scomp/JDEECo/commit/aa9f302c92c764d4ade19724002d2f931bf032b6
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleMemberTask.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleMembersTask.java

  Log Message:
  -----------
  Last change - renaming of the EnsembleMemberTask to plural reverted.


  Commit: 01a24097cd8133636c0bb0e3d3c2157a068daf27
      https://github.com/d3scomp/JDEECo/commit/01a24097cd8133636c0bb0e3d3c2157a068daf27
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentProcessImpl.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

  Log Message:
  -----------
  added isActive flag to the Process class in the meta-model


  Commit: ee72bc0db1e47c805a8397262b187582ed5d0446
      https://github.com/d3scomp/JDEECo/commit/ee72bc0db1e47c805a8397262b187582ed5d0446
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleDefinition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleDefinitionImpl.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
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleCoordinatorTask.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleMemberTask.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.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:
  -----------
  The split of coordinator vs. member scheduling of an ensemble reverted.
It didn't really solve the problem I had in mind (i.e. that knowledge
paths of triggers have to be striped of member/coord prefix) and by
itself, it was an overkill.

There are some more architectural suggestions in the comments.
Essentially it seems that it would make a lot of sense to have separate
trigger listeners:
KnowledgeManager: triggered(Trigger)
KnowledgeManagersView: triggered(ReadOnlyKnowledgeManager, Trigger)
Task: triggered(Task)


  Commit: 40d7ffa94564fc3bd24df5993bf98c39fcae7999
      https://github.com/d3scomp/JDEECo/commit/40d7ffa94564fc3bd24df5993bf98c39fcae7999
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    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/knowledge/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Updated the FIXMEs that I've inserted in the code so that they identify
me as their author. Now, it should be clear who is to be consulted if
any of the FIXMEs is not clear.


  Commit: 50926d7ddc9655744993080f00c0aa10a632ac0b
      https://github.com/d3scomp/JDEECo/commit/50926d7ddc9655744993080f00c0aa10a632ac0b
  Author: mkit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    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/knowledge/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.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/ComponentProcess.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeCoordinator.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMember.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/ComponentProcessImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeCoordinatorImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMemberImpl.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
    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/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.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/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.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 #80 from d3scomp/newgen-bures

Changes in the meta-model + separation of the EnsembleTask to two tasks (one for coordinator and another for members)


  Commit: 4c4d165b494f1a67703265a2f2e50ce6b3ab7846
      https://github.com/d3scomp/JDEECo/commit/4c4d165b494f1a67703265a2f2e50ce6b3ab7846
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    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/knowledge/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.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/ComponentProcess.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeCoordinator.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMember.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/ComponentProcessImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeCoordinatorImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMemberImpl.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
    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/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.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/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java

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

Conflicts:
	jdeeco-core/model/RuntimeModel.ecore
	jdeeco-core/model/RuntimeModel.ecorediag
	jdeeco-core/model/RuntimeModel.genmodel
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/ExecutionListener.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/Executor.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentProcess.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentInstanceImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentProcessImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataFactory.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java


  Commit: a8b10f9a7b9379e1ad35d31cc3ede56446d15fc1
      https://github.com/d3scomp/JDEECo/commit/a8b10f9a7b9379e1ad35d31cc3ede56446d15fc1
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java

  Log Message:
  -----------
  Fixes


Compare: https://github.com/d3scomp/JDEECo/compare/6fa92a45b78a...a8b10f9a7b93

More information about the DEECo mailing list