[DEECo] [d3scomp/JDEECo] 8445db: testing forking + code review ….
GitHub
noreply at github.com
Tue Nov 5 13:50:55 CET 2013
Branch: refs/heads/newgen-muradyan
Home: https://github.com/d3scomp/JDEECo
Commit: 8445dbd4df778a67341799acfc24fdc0d3c21feb
https://github.com/d3scomp/JDEECo/commit/8445dbd4df778a67341799acfc24fdc0d3c21feb
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
Log Message:
-----------
testing forking + code review ….
Commit: 2f407db06f526b80f0fbe0b62b6d19d93baccc5c
https://github.com/d3scomp/JDEECo/commit/2f407db06f526b80f0fbe0b62b6d19d93baccc5c
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-10-30 (Wed, 30 Oct 2013)
Changed paths:
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
Log Message:
-----------
Revert "testing forking + code review …."
This reverts commit 8445dbd4df778a67341799acfc24fdc0d3c21feb.
Commit: fb5ece9d385caa4d82a31da8ff4c1d18d2297f73
https://github.com/d3scomp/JDEECo/commit/fb5ece9d385caa4d82a31da8ff4c1d18d2297f73
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-10-31 (Thu, 31 Oct 2013)
Changed paths:
M jdeeco-architecture/architecture-26.10.2013.emx
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/Dummy.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
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.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
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/NotificationsForScheduler.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
R jdeeco-core/test/cz/cuni/mff/d3s/deeco/DummyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ValueSetTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.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 remote-tracking branch 'upstream/newgen' into newgen
Commit: 5bd81d77863b8f805d5e2b74217912ae5fc82d62
https://github.com/d3scomp/JDEECo/commit/5bd81d77863b8f805d5e2b74217912ae5fc82d62
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2013-11-01 (Fri, 01 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/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
Log Message:
-----------
Executor/ExecutionListener interface extension and test, corresponding
changes i the LocalTimeScheduler
SingleThreadedExecutor test.
Commit: d43a52b83622750f196ef6b1b501121b1f3c0e2b
https://github.com/d3scomp/JDEECo/commit/d43a52b83622750f196ef6b1b501121b1f3c0e2b
Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)
Changed paths:
A jdeeco-core/logs/.gitignore
A jdeeco-core/test/logging.properties
Log Message:
-----------
logging setup for tests (console level >= WARNING)
Commit: 42d6ab8a9efcfdd3747905479de17860147111f7
https://github.com/d3scomp/JDEECo/commit/42d6ab8a9efcfdd3747905479de17860147111f7
Author: andranikm <muradian at d3s.mff.cuni.cz>
Date: 2013-11-01 (Fri, 01 Nov 2013)
Changed paths:
A jdeeco-core/logs/.gitignore
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 pull request #72 from keznikl/newgen
executor impl+test, logging
Commit: 100f5c2595c7b57a6a07fd875afdde757355cc44
https://github.com/d3scomp/JDEECo/commit/100f5c2595c7b57a6a07fd875afdde757355cc44
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
Log Message:
-----------
updates in Ecore model
Basically moving from a class-based approach to a prototype-based one.
This is better for fine-grained adaptations (e.g. changing the
scheduling specification of a particular component instance in a jdeeco
runtime)
Commit: 9b744d7b0d5a13eeaae77237840cb781a149897a
https://github.com/d3scomp/JDEECo/commit/9b744d7b0d5a13eeaae77237840cb781a149897a
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
Log Message:
-----------
Merge pull request #74 from iliasger/newgen
Newgen
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
Commit: 78377c4f68da52f29ee94d58329c0a3dd57e18bb
https://github.com/d3scomp/JDEECo/commit/78377c4f68da52f29ee94d58329c0a3dd57e18bb
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)
Log Message:
-----------
Merge branch 'newgen' into newgen-iliasg
Commit: ce0ebedc50185404ccd283149246a26e15c6299f
https://github.com/d3scomp/JDEECo/commit/ce0ebedc50185404ccd283149246a26e15c6299f
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:
-----------
refactoring eCore
changing Process to ComponentProcess and ensemblingControllers to
ensembleControllers
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: 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: 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: 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: 60ffe93053d22041e7943b4f5a773b697593e403
https://github.com/d3scomp/JDEECo/commit/60ffe93053d22041e7943b4f5a773b697593e403
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
Log Message:
-----------
Further work on the ensemble task trigger registration.
The ensemble task should be able to distinguish whether the trigger
implies a coordinator role of the component or a member role. Further it
should indicate which shadow component is involved. However that needs
the new trigger listener interfaces.
Commit: f9fa7dd1050aadbc6f94a7b1044bc7786b248063
https://github.com/d3scomp/JDEECo/commit/f9fa7dd1050aadbc6f94a7b1044bc7786b248063
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Log Message:
-----------
Merge remote-tracking branch 'origin/newgen' into newgen-bures
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.
Commit: 3aa865471bd60d00c0d11135ad01f37972c8e53f
https://github.com/d3scomp/JDEECo/commit/3aa865471bd60d00c0d11135ad01f37972c8e53f
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
R jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RobotFollowerComponent.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/TestAnnotationProcessor.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/Path.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
Log Message:
-----------
Fixing the build
Commit: b049c10645c2e72bada0245f63e36ba0ee1375ac
https://github.com/d3scomp/JDEECo/commit/b049c10645c2e72bada0245f63e36ba0ee1375ac
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
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/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 branch 'newgen' into newgen-iliasg
Commit: 40c8aa13ef0c1ef8ebf4a48fa16ad7e89b66d3cc
https://github.com/d3scomp/JDEECo/commit/40c8aa13ef0c1ef8ebf4a48fa16ad7e89b66d3cc
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
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/model/runtime/api/ComponentInstance.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/PathNodeCoordinator.java
M 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/ParameterImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeCoordinatorImpl.java
M 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/RuntimeMetadataPackage.java
Log Message:
-----------
Updates in Ecore model
1. Changed Parameter -> KnowledgePath from reference to containment
(there was a missing ownership that didn't let the serialization
complete)
2. Set Parameter.direction: 'unsettable="true"' (in order to correctly
serialize all ParameterDirection:EEnum values)
Commit: 52088cec0d94631106a478e6e4ee0e8c745a84d4
https://github.com/d3scomp/JDEECo/commit/52088cec0d94631106a478e6e4ee0e8c745a84d4
Author: Tomas Bures <bures 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/KnowledgeManagersView.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/TriggerListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.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
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.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:
-----------
In development...
Commit: 3d41d8de8849b99c0dc28ad4dcafefbfc5b5a9d3
https://github.com/d3scomp/JDEECo/commit/3d41d8de8849b99c0dc28ad4dcafefbfc5b5a9d3
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
R jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/TestAnnotationProcessor.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
Log Message:
-----------
Component parsing - now complete
With triggers.
Commit: 0f3dd6f18b921d980a48c6428ec28c3ff12584d1
https://github.com/d3scomp/JDEECo/commit/0f3dd6f18b921d980a48c6428ec28c3ff12584d1
Author: Tomas Bures <bures 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/KnowledgeManagerImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
M 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/knowledge/KnowledgeManagersViewTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Log Message:
-----------
Implemented the distinction between trigger listeners.
Some more FIXMEs in the code - enjoy. :-)
Commit: b53a976856e1a1830ea4fd07708a8843af8c53ae
https://github.com/d3scomp/JDEECo/commit/b53a976856e1a1830ea4fd07708a8843af8c53ae
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
A jdeeco-architecture/architecture-04.11.2013.emx
M jdeeco-architecture/architecture-26.10.2013.emx
M jdeeco-architecture/reverse-jdeeco-core.tc
Log Message:
-----------
Reverse engineering of the current implmenetation
Commit: 10c0dcc8ca4502af58313f39aa324393fd1319eb
https://github.com/d3scomp/JDEECo/commit/10c0dcc8ca4502af58313f39aa324393fd1319eb
Author: Tomas Bures <bures at d3s.mff.cuni.cz>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M jdeeco-architecture/architecture-04.11.2013.emx
Log Message:
-----------
Some small tweaks in the architectural diagram.
Commit: 6a8933dd71515e09c58e517a584a7abc47cab3b5
https://github.com/d3scomp/JDEECo/commit/6a8933dd71515e09c58e517a584a7abc47cab3b5
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PNode.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ParseException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.jj
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserTokenManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/SimpleCharStream.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/Token.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/TokenMgrError.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PNode.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/ParseException.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathGrammar.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathParser.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathParser.jj
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathParserConstants.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/PathParserTokenManager.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/SimpleCharStream.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/Token.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/path/grammar/TokenMgrError.java
Log Message:
-----------
changing package of path grammar parser files
Old package: cz.cuni.mff.d3s.deeco.path.grammar
New package: cz.cuni.mff.d3s.deeco.annotations.pathparser
Commit: 90ec61b161060751155adb91098cff13c180bd25
https://github.com/d3scomp/JDEECo/commit/90ec61b161060751155adb91098cff13c180bd25
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M .gitignore
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.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/input/RobotLeaderComponent.java
Log Message:
-----------
'process' method in AnnotationProcesssor receives object instead of class
Commit: 860becaca9f83a7ecb6fcbdb2056c0f8dbae85f9
https://github.com/d3scomp/JDEECo/commit/860becaca9f83a7ecb6fcbdb2056c0f8dbae85f9
Author: mkit <kit at d3s.mff.cuni.cz>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
A jdeeco-architecture/architecture-04.11.2013.emx
M jdeeco-architecture/architecture-26.10.2013.emx
M jdeeco-architecture/reverse-jdeeco-core.tc
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/TriggerListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.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
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.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 #84 from d3scomp/newgen-bures
Implemented the distinction between trigger listeners + some more FIXMEs
Commit: c7e6f7f8a1be5e996ac07d3c3423735b8e0e8b8c
https://github.com/d3scomp/JDEECo/commit/c7e6f7f8a1be5e996ac07d3c3423735b8e0e8b8c
Author: andranikm <muradian at d3s.mff.cuni.cz>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M .gitignore
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/model/RuntimeModel.genmodel
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/pathparser/PNode.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ParseException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.jj
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserTokenManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/SimpleCharStream.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/Token.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/TokenMgrError.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
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/Parameter.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeCoordinator.java
M 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/ParameterImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeCoordinatorImpl.java
M 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/RuntimeMetadataPackage.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/Path.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
Log Message:
-----------
Merge pull request #83 from d3scomp/newgen-iliasg
annotations parsing and constructing of eCore model - part I (only Components)
Commit: 6b2f9f3e6b50d010c33023b06c5d5dd6873a7f3a
https://github.com/d3scomp/JDEECo/commit/6b2f9f3e6b50d010c33023b06c5d5dd6873a7f3a
Author: muradian <muradian at d3s.mff.cuni.cz>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Changed paths:
M .gitignore
A jdeeco-architecture/architecture-04.11.2013.emx
M jdeeco-architecture/architecture-26.10.2013.emx
A jdeeco-architecture/architecture-30.10.2013.emx
M jdeeco-architecture/reverse-jdeeco-core.tc
M jdeeco-core/.classpath
A jdeeco-core/logs/.gitignore
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/model/RuntimeModel.genmodel
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/pathparser/PNode.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ParseException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.jj
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserTokenManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/SimpleCharStream.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/Token.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/TokenMgrError.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
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
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutor.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
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/OutWrapper.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/TriggerListener.java
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
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/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
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeCoordinator.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
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMember.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/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
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/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
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeCoordinatorImpl.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
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMemberImpl.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/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/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
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/Path.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.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
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/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
A jdeeco-core/test/logging.properties
Log Message:
-----------
Merge remote-tracking branch 'origin/newgen' into newgen-muradyan
Conflicts:
jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
Compare: https://github.com/d3scomp/JDEECo/compare/155e89b18f9c...6b2f9f3e6b50
More information about the DEECo
mailing list