[DEECo] [d3scomp/JDEECo] 4bcff4: Added ComponentInstance.roles into model.
GitHub
noreply at github.com
Fri Mar 13 16:53:59 CET 2015
Branch: refs/heads/omnet-plugin
Home: https://github.com/d3scomp/JDEECo
Commit: 4bcff4f927957d99faf1e5e6eb717b74ffa9f961
https://github.com/d3scomp/JDEECo/commit/4bcff4f927957d99faf1e5e6eb717b74ffa9f961
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-05 (Thu, 05 Feb 2015)
Changed paths:
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/model/RuntimeModel.genmodel
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/CoordinatorRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/MemberRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Role.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/impl/ComponentInstanceImpl.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 ComponentInstance.roles into model.
Added basic attributes for role definition/verification.
Commit: 1213628228a76a0c5faa6f0f8599ddcafbe12428
https://github.com/d3scomp/JDEECo/commit/1213628228a76a0c5faa6f0f8599ddcafbe12428
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-06 (Fri, 06 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRoleMultiple.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Role.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
Log Message:
-----------
Added class for checking Roles annotations.
Added tests for this class.
Now capable of testing whether a class implements specific role(s).
Commit: af78779b1c66c0d344c424136b2650b92d8e4710
https://github.com/d3scomp/JDEECo/commit/af78779b1c66c0d344c424136b2650b92d8e4710
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-12 (Thu, 12 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.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/ModelValidatorTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java
Log Message:
-----------
Refactor: Extracted methods for creating KnowledgePaths into
KnowledgePathHelper
Preparations for validation of ensemble parameters against role
definitions.
Commit: ec5815924a463c6efe634da38b0b38b2e499aa59
https://github.com/d3scomp/JDEECo/commit/ec5815924a463c6efe634da38b0b38b2e499aa59
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-12 (Thu, 12 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
Log Message:
-----------
Added tests for the checkRolesImplementation(List<Parameter>,
CoordinatorRole[], MemberRole[]) method.
Commit: 26a10e7867738d79c8434e388db74cfe766cfb74
https://github.com/d3scomp/JDEECo/commit/26a10e7867738d79c8434e388db74cfe766cfb74
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
Log Message:
-----------
Partial impelemtation of checkRolesImplementation method.
Commit: 668e6faa8af2c69a877d02615182b4b633ed6268
https://github.com/d3scomp/JDEECo/commit/668e6faa8af2c69a877d02615182b4b633ed6268
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.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/impl/ParameterImpl.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
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
Log Message:
-----------
Added generic type information into the Parameter class.
Some more research needs to be done.
Commit: f2f69d6ea9d329fb093d48de22be60883ddde0d7
https://github.com/d3scomp/JDEECo/commit/f2f69d6ea9d329fb093d48de22be60883ddde0d7
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-16 (Mon, 16 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/ChildOfCorrectC1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi
Log Message:
-----------
Removed role-checking from the Annotation Processor
Commit: b00ebcccbcba72d5626b821c8649a65a53a61921
https://github.com/d3scomp/JDEECo/commit/b00ebcccbcba72d5626b821c8649a65a53a61921
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-16 (Mon, 16 Feb 2015)
Changed paths:
M jdeeco-architecture/.gitignore
M jdeeco-architecture/.project
M jdeeco-architecture/2014/OMNetIntegration-Scheduler.dnx
M jdeeco-architecture/2014/OMNetIntegration-Synchronizer.dnx
M jdeeco-architecture/2014/architecture-2013-10-24.emx
M jdeeco-architecture/2014/architecture-2013-10-25.emx
M jdeeco-architecture/2014/architecture-2013-10-26.emx
M jdeeco-architecture/2014/architecture-2013-10-30.emx
M jdeeco-architecture/2014/architecture-2013-11-04.emx
M jdeeco-architecture/2014/architecture-2013-11-18.emx
M jdeeco-architecture/2014/architecture-2013-12-11.emx
M jdeeco-architecture/2014/jDEECo-OMNet-MATSim.dnx
M jdeeco-architecture/2014/jDEECo-OMNet.dnx
M jdeeco-architecture/2014/reverse-jdeeco-core.tc
M jdeeco-architecture/2015/architecture-2015-02-04.emx
A jdeeco-architecture/refactored_classes-03.02.15/runtime-builders.ucls
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.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/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/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/src/cz/cuni/mff/d3s/deeco/runtime/CycleDetectedException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPlugin.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DuplicateEnsembleDefinitionException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/InvalidOperationException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/PluginDependencyException.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogRecord.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogTimerTaskListener.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogger.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SnapshotProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/CustomStepTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TimerTask.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TimerTaskListener.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/ModelValidatorTest.java
R jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/TestSerializer.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
R jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
R jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DelayedKnowledgeDataHandler.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/SimulationRuntimeBuilder.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/TimerTaskListener.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/matsim/MATSimOMNetSimulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/KnowledgeUpdateTask.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/SimulationStepTask.java
R jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/task/TimerTask.java
Log Message:
-----------
Merge remote-tracking branch 'origin/jDEECo-3' into roles
Commit: 8d37bcc902bd14698d5b654a5d1aa6a55745375a
https://github.com/d3scomp/JDEECo/commit/8d37bcc902bd14698d5b654a5d1aa6a55745375a
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/CoordinatorRole.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/MemberRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationChecker.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationCheckerException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.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/ModelValidatorTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
Log Message:
-----------
Separated annotation processing and validation. General concept of
Annotation Checker introduced. AnnotationProcessorTests modified such
that they test only annotation processing (not validation).
Commit: d6d656c61f077a78bef59879335903b2e6538f99
https://github.com/d3scomp/JDEECo/commit/d6d656c61f077a78bef59879335903b2e6538f99
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
Log Message:
-----------
Removed failing tests from deeco.runtime
Commit: 35316db6c140496e94a5497a77a4338b3f8013f3
https://github.com/d3scomp/JDEECo/commit/35316db6c140496e94a5497a77a4338b3f8013f3
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationChecker.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationCheckerException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
Log Message:
-----------
Added comments
Commit: 202c4aef400ed46f9873bd400fb8dc40a1e688ff
https://github.com/d3scomp/JDEECo/commit/202c4aef400ed46f9873bd400fb8dc40a1e688ff
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-25 (Wed, 25 Feb 2015)
Changed paths:
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RoleAnnotationsHelper.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
Log Message:
-----------
Minor refactoring, introduced RoleAnnotationsHelper class for simpler
work with role annotations.
Commit: f32260ffa9ed0dca0edbc4b7471c205211807852
https://github.com/d3scomp/JDEECo/commit/f32260ffa9ed0dca0edbc4b7471c205211807852
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-02-26 (Thu, 26 Feb 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RoleAnnotationsHelper.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
Log Message:
-----------
Added checks for ensemble membership/knowledge exchange parameters when
using @CoordinatorRole and @MemberRole. Added tests.
Commit: d3c2a16d0127b8ebf6f138854c9eef259b3f55c0
https://github.com/d3scomp/JDEECo/commit/d3c2a16d0127b8ebf6f138854c9eef259b3f55c0
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RoleAnnotationsHelper.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
Log Message:
-----------
Added documentation. Removed failing test.
Commit: 6105e368c1c6710ef2be47c7ab137d2fcf8a29d1
https://github.com/d3scomp/JDEECo/commit/6105e368c1c6710ef2be47c7ab137d2fcf8a29d1
Author: Zbyněk Jiráček <jiracek at d3s.mff.cuni.cz>
Date: 2015-03-02 (Mon, 02 Mar 2015)
Changed paths:
M .gitignore
M jdeeco-architecture/2015/architecture-2015-02-04.emx
M jdeeco-core/pom.xml
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/AbstractHost.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRunner.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoException.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DuplicateEnsembleDefinitionException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogRecord.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/SnapshotProvider.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/NoExecutorAvailableException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogRecord.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogTimerTaskListener.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogger.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SnapshotProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TimerTask.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/DiscreteEventTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/EventTime.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/RunnerTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/SimulationTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/Timer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/TimerEventListener.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/WallTimeTimer.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
A jdeeco-network-plugin/.gitignore
A jdeeco-network-plugin/.project
A jdeeco-network-plugin/pom.xml
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/Address.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/IPAddress.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/MANETBroadcastAddress.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/package-info.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/Device.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/PrintingBroadcastDevice.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/MarshallingException.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/exceptions/UnregistredPacketType.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DataIDSource.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DefaultDataIDSource.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Packet.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1Strategy.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L1StrategyManager.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/L2PacketSender.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/MANETReceivedInfo.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/ReceivedInfo.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/package-info.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L1DataProcessor.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Packet.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2PacketType.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2ReceivedInfo.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2Strategy.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/L2StrategyManager.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/PacketHeader.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/package-info.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/Marshaller.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallerRegistry.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/marshaller/SerializingMarshaller.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/package-info.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/PacketTypeTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/L1PacketTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/marshaller/MarshallingTest.java
A jdeeco-parent/jDEECoFormatter.xml
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
Merge remote-tracking branch 'origin/jDEECo-3' into roles
Commit: e0f959814bcac7b6354d1563e13cdc2d143d84e8
https://github.com/d3scomp/JDEECo/commit/e0f959814bcac7b6354d1563e13cdc2d143d84e8
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-03 (Tue, 03 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
Log Message:
-----------
Fix knowledge inserting L2 strategy
Commit: 8e53fbbf1130ce910f88324422aad6dd5497a4ee
https://github.com/d3scomp/JDEECo/commit/8e53fbbf1130ce910f88324422aad6dd5497a4ee
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-03 (Tue, 03 Mar 2015)
Changed paths:
M jdeeco-architecture/2015/architecture-2015-02-04.emx
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/CoordinatorRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/MemberRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRoleMultiple.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Role.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationChecker.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationCheckerException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RoleAnnotationsHelper.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.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/impl/ParameterImpl.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
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/AbstractHost.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/Host.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/KnowledgeDataManager.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/network/PacketReceiver.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoRunner.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogRecord.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLogger.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtimelog/SnapshotProvider.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/NoExecutorAvailableException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogRecord.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogTimerTaskListener.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SimLogger.java
R jdeeco-core/src/cz/cuni/mff/d3s/deeco/simlog/SnapshotProvider.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleLogger.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TimerTask.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/CurrentTimeProvider.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/DiscreteEventTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/EventTime.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/RunnerTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/SimulationTimer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/Timer.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/TimerEventListener.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/timer/WallTimeTimer.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/ModelValidatorTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/ChildOfCorrectC1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoySimulationTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtimelog/RuntimeLoggerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/DirectSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/Simulation.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/omnet/OMNetSimulationHost.java
M jdeeco-simulation/src/cz/cuni/mff/d3s/deeco/simulation/scheduler/SimulationScheduler.java
Log Message:
-----------
Merge remote-tracking branch 'origin/jDEECo-3' into network
Commit: e498c46faa8c4f9b09d64ab1d9b87ec67b3b9763
https://github.com/d3scomp/JDEECo/commit/e498c46faa8c4f9b09d64ab1d9b87ec67b3b9763
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-03 (Tue, 03 Mar 2015)
Changed paths:
M jdeeco-network-plugin/.gitignore
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
Log Message:
-----------
Partially fix loopback broadcast device
Commit: 1fc7becb745b91f348d930926d10e89b12f34342
https://github.com/d3scomp/JDEECo/commit/1fc7becb745b91f348d930926d10e89b12f34342
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-03 (Tue, 03 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
Log Message:
-----------
Fix knowledge inserting strategy
Commit: 6ac1b96b5a0aaed2af8358153a18e788487af3ef
https://github.com/d3scomp/JDEECo/commit/6ac1b96b5a0aaed2af8358153a18e788487af3ef
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-03 (Tue, 03 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
Log Message:
-----------
Add prelominary fix for sendDelayed in Device output queue
Commit: c7c647af10c5a8ef164976cfbd8ade01cc68af0a
https://github.com/d3scomp/JDEECo/commit/c7c647af10c5a8ef164976cfbd8ade01cc68af0a
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-03 (Tue, 03 Mar 2015)
Changed paths:
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/ConvoyEnsemble.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/ConvoyTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/Follower.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/Leader.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/Waypoint.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/package-info.java
Log Message:
-----------
Add integration test for network with loopback device
Commit: 8b0c57f38b3ab9eadfcbc63fcc3000bb42ae2aeb
https://github.com/d3scomp/JDEECo/commit/8b0c57f38b3ab9eadfcbc63fcc3000bb42ae2aeb
Author: iridin <skoda at d3s.mff.cuni.cz>
Date: 2015-03-04 (Wed, 04 Mar 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/DefaultKnowledgeDataManagerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/SecurityIntegrationTests.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java
Log Message:
-----------
Using RuntimeLogger to log events about checking the validity status of ensembles.
Newly there is the RuntimeLogger instance available from the DEECoContainer.
The necessary propagation of DEECoContainer reference done for the EnsembleTask through
the RuntimeFrameworkImpl.
Commit: a0e8a9b3feedcaf5bf431a525d6f93ea5adc9a65
https://github.com/d3scomp/JDEECo/commit/a0e8a9b3feedcaf5bf431a525d6f93ea5adc9a65
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
Log Message:
-----------
Avoid sending garbage data when L0 packet is not full
Commit: 193548f50330d85150a6d4dfff7a2993453a886d
https://github.com/d3scomp/JDEECo/commit/193548f50330d85150a6d4dfff7a2993453a886d
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M jdeeco-network-plugin/pom.xml
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/ConvoyTest.java
Log Message:
-----------
Update networked convoy integration test
Commit: a0c34de135c553292eb23738103f23e091f6378b
https://github.com/d3scomp/JDEECo/commit/a0c34de135c553292eb23738103f23e091f6378b
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
Log Message:
-----------
Preliminary fix for version and node in knowledge metadata produced by
DummyKnowledgePublisher
Commit: 2dec52159884588c479fa7c3419b97255a6e545d
https://github.com/d3scomp/JDEECo/commit/2dec52159884588c479fa7c3419b97255a6e545d
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/ConvoyEnsemble.java
R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/ConvoyTest.java
R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/Follower.java
R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/Leader.java
R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/Waypoint.java
R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/convoy/package-info.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyEnsemble.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Follower.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Leader.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Waypoint.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/package-info.java
Log Message:
-----------
Fix networked convoy ensamble demo test
Commit: e9088b874a8147b020e2bc92123b2fa25b5970f2
https://github.com/d3scomp/JDEECo/commit/e9088b874a8147b020e2bc92123b2fa25b5970f2
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M jdeeco-architecture/2015/architecture-2015-02-04.emx
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Role.java
Log Message:
-----------
corrections to the RSA diagrams
Commit: e1761565e6208b4b4664838d5179bfec937481b7
https://github.com/d3scomp/JDEECo/commit/e1761565e6208b4b4664838d5179bfec937481b7
Author: Ilias Gerostathopoulos <iliasger at gmail.com>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
Log Message:
-----------
fix in the concatenation of node-wide and node-specific plugins
Commit: 52810f9ea57881d44eac36774cfcd8bc2b4fa593
https://github.com/d3scomp/JDEECo/commit/52810f9ea57881d44eac36774cfcd8bc2b4fa593
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-05 (Thu, 05 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
Log Message:
-----------
Refactor code
Commit: 8721c436b88c5e6d696a6a495294e1bf0b557de9
https://github.com/d3scomp/JDEECo/commit/8721c436b88c5e6d696a6a495294e1bf0b557de9
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
Log Message:
-----------
Refactor KnowledgeInsertingStrategy
Commit: e39433beefeda50d9fa349319c916f5adab4886e
https://github.com/d3scomp/JDEECo/commit/e39433beefeda50d9fa349319c916f5adab4886e
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-10 (Tue, 10 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/MANETBroadcastAddress.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
Log Message:
-----------
Store address in MANETBroadcastAddress as it is needed to identify
sender when a packet is received
Commit: f0f449c72a238b0a7ade52e5530ec5e5e9b4cdd0
https://github.com/d3scomp/JDEECo/commit/f0f449c72a238b0a7ade52e5530ec5e5e9b4cdd0
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java
Log Message:
-----------
Refactor loopback broadcast device
Commit: 2a5119079f2c1672f210ccb4f03ffda40fdecdbe
https://github.com/d3scomp/JDEECo/commit/2a5119079f2c1672f210ccb4f03ffda40fdecdbe
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopback.java
Log Message:
-----------
Add infrastructure loopback device
Commit: dd1af8008d76b105fb4ec25ca138127ff62d8a14
https://github.com/d3scomp/JDEECo/commit/dd1af8008d76b105fb4ec25ca138127ff62d8a14
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopback.java
Log Message:
-----------
Reafactor InfrastructureLoopback code
Commit: 080617bfac6c9703a4f457ffd245bd4df3df8f5c
https://github.com/d3scomp/JDEECo/commit/080617bfac6c9703a4f457ffd245bd4df3df8f5c
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
Log Message:
-----------
Fix Layer 1 intialization in Network
Commit: dd8d0749fe4b747bca430e6d31193e21c0b22f65
https://github.com/d3scomp/JDEECo/commit/dd8d0749fe4b747bca430e6d31193e21c0b22f65
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/IPAddress.java
Log Message:
-----------
Fix missing hashCode override fo IPAddress (we want hash code to be the
same to the same addresses)
Commit: 3f440602fc0f4926644c5adac243d5b6bf893715
https://github.com/d3scomp/JDEECo/commit/3f440602fc0f4926644c5adac243d5b6bf893715
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopback.java
Log Message:
-----------
Fix loopback code to pass tests
Commit: 1c8af57a10f40f4f41a076fa799f8ed95cb76c9d
https://github.com/d3scomp/JDEECo/commit/1c8af57a10f40f4f41a076fa799f8ed95cb76c9d
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/package-info.java
Log Message:
-----------
Add tests for InfrastructureLoopback
Commit: 02f647a6263fb05dc9c59d6d29096895aca91f6b
https://github.com/d3scomp/JDEECo/commit/02f647a6263fb05dc9c59d6d29096895aca91f6b
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
Log Message:
-----------
Format code
Commit: 626b46a65cfaa345f8d40baf5890012a417ffee5
https://github.com/d3scomp/JDEECo/commit/626b46a65cfaa345f8d40baf5890012a417ffee5
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
Log Message:
-----------
Add test for BroadcastLoopback
Commit: 8c2a316b5b9313435f1cb9dff6ba549209dd21d3
https://github.com/d3scomp/JDEECo/commit/8c2a316b5b9313435f1cb9dff6ba549209dd21d3
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-11 (Wed, 11 Mar 2015)
Changed paths:
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
Log Message:
-----------
Fix commets
Commit: 67bd0178dfc993877bdcccc043d60374620b08d5
https://github.com/d3scomp/JDEECo/commit/67bd0178dfc993877bdcccc043d60374620b08d5
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
Log Message:
-----------
Add support for delayed delivery of packets in BroadcastLoopback
Commit: 6047a2ec957707f9f7a8f000885b9e432c624c98
https://github.com/d3scomp/JDEECo/commit/6047a2ec957707f9f7a8f000885b9e432c624c98
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
Log Message:
-----------
Fix BroadcastLoopTest
Commit: b0a6689cd13d33aa02f1833ed52e32cc53e95df8
https://github.com/d3scomp/JDEECo/commit/b0a6689cd13d33aa02f1833ed52e32cc53e95df8
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
Log Message:
-----------
Refactor DummyKnowledgePublisher
Commit: 9c03bca30305c76f019c69b2a3e32cacfd57a5c2
https://github.com/d3scomp/JDEECo/commit/9c03bca30305c76f019c69b2a3e32cacfd57a5c2
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
Log Message:
-----------
Refactor BroadcastLoopback
Commit: 8c28f6e0e8c361e2428ab8b0d5815f89da5833e9
https://github.com/d3scomp/JDEECo/commit/8c28f6e0e8c361e2428ab8b0d5815f89da5833e9
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopback.java
Log Message:
-----------
Implement delayed delivery for InfrastructureLoopback
Commit: fc6ba9577213b82b5175398a3de1974e84e14a5e
https://github.com/d3scomp/JDEECo/commit/fc6ba9577213b82b5175398a3de1974e84e14a5e
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
Log Message:
-----------
Refactor BroadcastLoopback
Commit: 582fbbb10f3c9eec5e43a8808598f48ebe56f924
https://github.com/d3scomp/JDEECo/commit/582fbbb10f3c9eec5e43a8808598f48ebe56f924
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopback.java
Log Message:
-----------
Refactor loopback comments
Commit: da77862dab6bd715c623e7724e628054117a16d7
https://github.com/d3scomp/JDEECo/commit/da77862dab6bd715c623e7724e628054117a16d7
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InstantSchedulerMock.java
Log Message:
-----------
Fix InfrastructureLoopbackTest with delayed packet delivery
Commit: 746fadab00024875e7929be4ad234b3be04f99dd
https://github.com/d3scomp/JDEECo/commit/746fadab00024875e7929be4ad234b3be04f99dd
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
Log Message:
-----------
Fix comment
Commit: 6a3171f54a9c1c9343aac0c13e9508338efb7060
https://github.com/d3scomp/JDEECo/commit/6a3171f54a9c1c9343aac0c13e9508338efb7060
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-12 (Thu, 12 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InstantSchedulerMock.java
Log Message:
-----------
Implement SendDelayed for DeviceOutputQueue
Commit: 5a4ac7b7842416aaac6481ab56accfd33710ee04
https://github.com/d3scomp/JDEECo/commit/5a4ac7b7842416aaac6481ab56accfd33710ee04
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
Log Message:
-----------
Define default device send delay
Commit: b081b001b52cfba48931e584bdc585bdabcfbf31
https://github.com/d3scomp/JDEECo/commit/b081b001b52cfba48931e584bdc585bdabcfbf31
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InstantSchedulerMock.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
Log Message:
-----------
Move InstantSchedulerMock to DEECo core tests, finish DeviceOutputQueue
tests
Commit: 4a88d3e217f1c95c34b3e09a20651e90e7cf9249
https://github.com/d3scomp/JDEECo/commit/4a88d3e217f1c95c34b3e09a20651e90e7cf9249
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
Log Message:
-----------
Refactor code
Commit: 7a981151b678360dbc8b5eb9560d9bee34f3299f
https://github.com/d3scomp/JDEECo/commit/7a981151b678360dbc8b5eb9560d9bee34f3299f
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M jdeeco-network-plugin/.gitignore
M jdeeco-network-plugin/pom.xml
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/IPAddress.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/MANETBroadcastAddress.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopback.java
R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyEnsemble.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Follower.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Leader.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Waypoint.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/package-info.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InstantSchedulerMock.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/package-info.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
Log Message:
-----------
Merge remote-tracking branch 'origin/network' into jDEECo-3
Commit: ae4efa4d9854cf3ce0d93143f5b0ae6ca25f3f2f
https://github.com/d3scomp/JDEECo/commit/ae4efa4d9854cf3ce0d93143f5b0ae6ca25f3f2f
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
R jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InstantSchedulerMock.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/network' into jDEECo-3
Commit: 42c24f7c6e99fb2553ddc86cd2c364d4198efd6a
https://github.com/d3scomp/JDEECo/commit/42c24f7c6e99fb2553ddc86cd2c364d4198efd6a
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
Log Message:
-----------
Fix passing plugins to nodes created by DEECoSimulation
Commit: 890efb2196d92781ba29f3afd26ef8a08bcf52d2
https://github.com/d3scomp/JDEECo/commit/890efb2196d92781ba29f3afd26ef8a08bcf52d2
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M jdeeco-core/model/RuntimeModel.ecore
M jdeeco-core/model/RuntimeModel.ecorediag
M jdeeco-core/model/RuntimeModel.genmodel
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/CoordinatorRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/MemberRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRole.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PlaysRoleMultiple.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Role.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationChecker.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationCheckerException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RoleAnnotationsHelper.java
A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationChecker.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/impl/ParameterImpl.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
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.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/ModelValidatorTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/RolesAnnotationCheckerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/ChildOfCorrectC1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
A jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/InstantSchedulerMock.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java
M jdeeco-network-plugin/.gitignore
M jdeeco-network-plugin/pom.xml
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/Network.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/IPAddress.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/address/MANETBroadcastAddress.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopback.java
A jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopback.java
R jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/device/LoopbackBroadcastDevice.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueue.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l1/Layer1.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/Layer2.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/network/l2/strategy/KnowledgeInsertingStrategy.java
M jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyEnsemble.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/ConvoyTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Follower.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Leader.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/Waypoint.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/demo/convoy/package-info.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/BroadcastLoopbackTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/InfrastructureLoopbackTest.java
A jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/device/package-info.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l1/DeviceOutputQueueTest.java
M jdeeco-network-plugin/test/cz/cuni/mff/d3s/jdeeco/network/l2/L2Test.java
M jdeeco-omnet-plugin/src/cz/cuni/mff/d3s/jdeeco/network/omnet/OMNeTBroadcastDevice.java
Log Message:
-----------
Merge remote-tracking branch 'origin/network' into omnet-plugin
Conflicts:
jdeeco-network-plugin/src/cz/cuni/mff/d3s/jdeeco/publishing/DummyKnowledgePublisher.java
Commit: 0ec9701c2e52c90cbec97dc1a1d0a92054fc5c60
https://github.com/d3scomp/JDEECo/commit/0ec9701c2e52c90cbec97dc1a1d0a92054fc5c60
Author: Vladimir Matena <matena at d3s.mff.cuni.cz>
Date: 2015-03-13 (Fri, 13 Mar 2015)
Changed paths:
M jdeeco-architecture/2015/architecture-2015-02-04.emx
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoContainer.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoException.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/network/DefaultKnowledgeDataManagerTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/SecurityIntegrationTests.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/jDEECo-3' into omnet-plugin
Conflicts:
jdeeco-core/src/cz/cuni/mff/d3s/deeco/runners/DEECoSimulation.java
jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoNode.java
jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java
Compare: https://github.com/d3scomp/JDEECo/compare/cfbda8042fa8...0ec9701c2e52
More information about the DEECo
mailing list