[DEECo] [d3scomp/JDEECo] 10b43a: Merge pull request #76 from d3scomp/newgen-iliasg

GitHub noreply at github.com
Mon Nov 4 10:29:16 CET 2013


  Branch: refs/heads/newgen-iliasg
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 10b43ab8848a726394aef4aa600b21a772bc0be3
      https://github.com/d3scomp/JDEECo/commit/10b43ab8848a726394aef4aa600b21a772bc0be3
  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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Process.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/ComponentProcessImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.java
    R 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/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/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/ProcessTaskTest.java

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

Newgen iliasg


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

  Changed paths:
    A jdeeco-architecture/architecture-30.10.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    M jdeeco-core/.classpath
    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/src/cz/cuni/mff/d3s/deeco/task/Task.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:
  -----------
  Process task register/unregister trigger.


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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerNotExistentException.java
    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/KnowledgeManagerRegistry.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/ProcessTask.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ValueSetTest.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:
  -----------
  Small code & test review (mostly missing headers and coverage of the
tests). See suggestions in the code (marked by FIXME and TODO).


  Commit: 7b4e2c65c9461d2ec68ed37964ee76a4f8f52b8a
      https://github.com/d3scomp/JDEECo/commit/7b4e2c65c9461d2ec68ed37964ee76a4f8f52b8a
  Author: mkit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-02 (Sat, 02 Nov 2013)

  Changed paths:
    A jdeeco-architecture/architecture-30.10.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    M jdeeco-core/.classpath
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerNotExistentException.java
    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/KnowledgeManagerRegistry.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/ProcessTask.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/KnowledgeManagerImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ValueSetTest.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 #77 from d3scomp/newgen-bures

Small code & test review


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

  Changed paths:
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerNotExistentException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.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/KnowledgeManagerImplTest.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java

  Log Message:
  -----------
  ProcessTask seems to be complete.
Moved Knowledge Manager-related exceptions to the knowledge package.


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

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

  Log Message:
  -----------
  Build fix.


  Commit: 27f85b6fc4cc8752549144d7e5291a3aaf64c517
      https://github.com/d3scomp/JDEECo/commit/27f85b6fc4cc8752549144d7e5291a3aaf64c517
  Author: mkit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-02 (Sat, 02 Nov 2013)

  Changed paths:
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerNotExistentException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.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:
  -----------
  Merge pull request #78 from d3scomp/newgen-bures

ProcessTask completed


  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: 80b81e8dd3bedbe35873a0afdfb9f86e6a8a1e2f
      https://github.com/d3scomp/JDEECo/commit/80b81e8dd3bedbe35873a0afdfb9f86e6a8a1e2f
  Author: Ilias Gerostathopoulos <ilias at Iliass-MacBook-Pro.local>
  Date:   2013-11-03 (Sun, 03 Nov 2013)

  Changed paths:
    A jdeeco-architecture/architecture-30.10.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    M jdeeco-core/.classpath
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/KnowledgeManagerNotExistentException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/ExecutionListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/Executor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ValueSetTest.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 branch 'newgen' into newgen-iliasg


  Commit: 710dc112482ac9b96f11e0d8eb8703710ffcd7bb
      https://github.com/d3scomp/JDEECo/commit/710dc112482ac9b96f11e0d8eb8703710ffcd7bb
  Author: Ilias Gerostathopoulos <ilias at Iliass-MacBook-Pro.local>
  Date:   2013-11-04 (Mon, 04 Nov 2013)

  Changed paths:
    M jdeeco-core/pom.xml
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/AnnotationProxy.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Component.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Ensemble.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/IValuedAnnotation.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Knowledge.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/KnowledgeExchange.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Membership.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Process.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/TriggerOnChange.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/exceptions/AnnotationParsingException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/OutWrapper.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PNode.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/ParseException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathGrammar.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathParser.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathParser.jj
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathParserConstants.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathParserTokenManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/SimpleCharStream.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/Token.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/TokenMgrError.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RobotFollowerComponent.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/TestAnnotationProcessor.java

  Log Message:
  -----------
  Annotation parsing (incomplete)

Only Component parsing.
Still without trigger parsing.


Compare: https://github.com/d3scomp/JDEECo/compare/ce0ebedc5018...710dc112482a


More information about the DEECo mailing list