[DEECo] [d3scomp/JDEECo] 80b81e: Merge branch 'newgen' into newgen-iliasg
GitHub
noreply at github.com
Tue Nov 5 02:18:51 CET 2013
Branch: refs/heads/newgen
Home: https://github.com/d3scomp/JDEECo
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.
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: 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: 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: 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)
Compare: https://github.com/d3scomp/JDEECo/compare/860becaca9f8...c7e6f7f8a1be
More information about the DEECo
mailing list