[DEECo] [d3scomp/JDEECo] 6bd6d6: Merge branch 'newgen' into newgen-iliasg

Mon Dec 2 13:16:54 CET 2013

  Branch: refs/heads/newgen-muradyan
  Home:   https://github.com/d3scomp/JDEECo
  Commit: 6bd6d63799c4c09e043894bb05f1153611c04612
      https://github.com/d3scomp/JDEECo/commit/6bd6d63799c4c09e043894bb05f1153611c04612
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M jdeeco-architecture/architecture-04.11.2013.emx
    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/executor/Executor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutor.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutor.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Condition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.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/api/Exchange.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/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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMember.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PeriodicTrigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/RuntimeMetadata.java
    R 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
    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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ConditionImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.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/ExchangeImpl.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/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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMemberImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PeriodicTriggerImpl.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
    R 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/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.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/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/ExecutorTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutorTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/executor/SingleThreadedExecutorTest.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/runtime/RuntimeFrameworkBuilderTest.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: cc230ab33f44c69396e4092258f2afa3e8660a3c
      https://github.com/d3scomp/JDEECo/commit/cc230ab33f44c69396e4092258f2afa3e8660a3c
  Author: Tomas Bures <bures at d3s.mff.cuni.cz>
  Date:   2013-11-06 (Wed, 06 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Updates, but not working yet.

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

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Fixed.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  The ensemble task now properly strips the path and takes advantage of
the trigger returned to it by the scheduler to remember where the
trigger occurred.

  Commit: 2e89cc844546c4b7df9bd404ccab2f0786d43a8b
      https://github.com/d3scomp/JDEECo/commit/2e89cc844546c4b7df9bd404ccab2f0786d43a8b
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M jdeeco-core/.classpath
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java

  Log Message:
  -----------
  Merge branch 'newgen' into newgen-iliasg

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

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M 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/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  Formatting fix. (Don't use Team/Add to Index from Eclipse)

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

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

  Log Message:
  -----------
  Author added to exception classes.

  Commit: 24a2e28e19ae535bf936e3548f81aad61aad8635
      https://github.com/d3scomp/JDEECo/commit/24a2e28e19ae535bf936e3548f81aad61aad8635
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M 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/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  Merge pull request #95 from d3scomp/newgen-kit

not ideal but let's hope its working

  Commit: 477243968e452f65eeb546382c70937dfaa30c45
      https://github.com/d3scomp/JDEECo/commit/477243968e452f65eeb546382c70937dfaa30c45
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java

  Log Message:
  -----------
  Refactoring of AnnotationProcessor

  Commit: 78a003131cfbc7b27966caefe774657fa5c06861
      https://github.com/d3scomp/JDEECo/commit/78a003131cfbc7b27966caefe774657fa5c06861
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-07 (Thu, 07 Nov 2013)

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java

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

AnnotationProcessor refactoring.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java

  Log Message:
  -----------
  Tests to KnowledgeManagerViewImpl + Fixes to KnowledgeManagerViewImpl
implementation

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java

  Log Message:
  -----------
  KnowledgeManagerContainer implementation + tests.
Slight modifications to KnowledgeManagerContainer related classes.

  Commit: 8596af0e08e38a1477df46c4d3dfb2fc6edcc095
      https://github.com/d3scomp/JDEECo/commit/8596af0e08e38a1477df46c4d3dfb2fc6edcc095
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  runtime tweeks and tests

  Commit: d8f636253bd979c25dd7c8d4126816d46b1d6019
      https://github.com/d3scomp/JDEECo/commit/d8f636253bd979c25dd7c8d4126816d46b1d6019
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  RuntimeFrameworkImpl tests and autoInit

  Commit: c40b740e3728b1321ba7c59063ca8ba327ae6f75
      https://github.com/d3scomp/JDEECo/commit/c40b740e3728b1321ba7c59063ca8ba327ae6f75
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  RuntimeFrameworkImpl tests

  Commit: bfb313161678682aa5314f28b8cd3d144edb65e3
      https://github.com/d3scomp/JDEECo/commit/bfb313161678682aa5314f28b8cd3d144edb65e3
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  more RuntimeFrameworkImpl tests and fixes

  Commit: 04ba1adc43d7e52f984402cf0e001d18aefe6df6
      https://github.com/d3scomp/JDEECo/commit/04ba1adc43d7e52f984402cf0e001d18aefe6df6
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/EEnsembleParty.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java

  Log Message:
  -----------
  updating in component parsing to handle MapNodeFields

  Commit: aec262f352a1e9571cdd7e663bad1ece18d92938
      https://github.com/d3scomp/JDEECo/commit/aec262f352a1e9571cdd7e663bad1ece18d92938
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  RuntimeFrameworkImplTest javadoc author

  Commit: b07ffeb51c95216ee9c536110a3bc9356b5e3368
      https://github.com/d3scomp/JDEECo/commit/b07ffeb51c95216ee9c536110a3bc9356b5e3368
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-08 (Fri, 08 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

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

RuntimeFrameworkImpl fixes and some tests

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java

  Log Message:
  -----------
  Merging with Rima's tests.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Ensemble task devel.

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

  Changed paths:
    M jdeeco-core/pom.xml
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
    M 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/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-bures

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

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Fix after merge.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java

  Log Message:
  -----------
  Merge pull request #97 from d3scomp/newgen-kit

Merged

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-bures

  Commit: a248241b899b02e969aa3f0fb618661b726d1ede
      https://github.com/d3scomp/JDEECo/commit/a248241b899b02e969aa3f0fb618661b726d1ede
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-09 (Sat, 09 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M 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/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-iliasg

  Commit: 33e79738f7dd1f1a91171c7763d6bf238244a4ae
      https://github.com/d3scomp/JDEECo/commit/33e79738f7dd1f1a91171c7763d6bf238244a4ae
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/C1C2C3E1E2E3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongKP1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongKP2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi

  Log Message:
  -----------
  Ensemble Parsing and acceptance tests

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/Synchronizer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/SynchronizerManager.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/SynchronizerManagerTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/SynchronizerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java

  Log Message:
  -----------
  SynchronizerManager + Synchronizer implementation added together with
tests.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

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

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

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

  Log Message:
  -----------
  Test fix.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java

  Log Message:
  -----------
  BaseKnowledgeManager - id field added.

  Commit: 17cede921bfc6c767af1b5578462e6a615335bf8
      https://github.com/d3scomp/JDEECo/commit/17cede921bfc6c767af1b5578462e6a615335bf8
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Membership.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    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/samples/CorrectC1.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongKP1.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongKP2.java

  Log Message:
  -----------
  Unit tests on annotations processor and some small enhancements

  Commit: a08458a7bf9b1415b4cb9da14044a7accce0a2a0
      https://github.com/d3scomp/JDEECo/commit/a08458a7bf9b1415b4cb9da14044a7accce0a2a0
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java

  Log Message:
  -----------
  small fix (expected files should not be created in the code)

  Commit: 6ee29a51540729edca9a7e4b25f813ba2625afc2
      https://github.com/d3scomp/JDEECo/commit/6ee29a51540729edca9a7e4b25f813ba2625afc2
  Author: andranikm <muradian at d3s.mff.cuni.cz>
  Date:   2013-11-11 (Mon, 11 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Membership.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/EEnsembleParty.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/C1C2C3E1E2E3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi

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

Annotations parsing (complete with tests)

  Commit: 5a929465096c862874779aa33317b6ed6e653fd7
      https://github.com/d3scomp/JDEECo/commit/5a929465096c862874779aa33317b6ed6e653fd7
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  RuntimeFrameworkImpl test commits and improvements

  Commit: 847f3a90302c305e5a62d2b9bc59b0581d2fdc69
      https://github.com/d3scomp/JDEECo/commit/847f3a90302c305e5a62d2b9bc59b0581d2fdc69
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java

  Log Message:
  -----------
  Processor test working for windows

  Commit: 569a136b43606d93ac63d2e7fba66fc0e8ba6673
      https://github.com/d3scomp/JDEECo/commit/569a136b43606d93ac63d2e7fba66fc0e8ba6673
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  RuntimeFrameworkImplTest tests and bugfixes + doc

  Commit: 063eebf4e699e2f321b077db7bd0e8994c440a55
      https://github.com/d3scomp/JDEECo/commit/063eebf4e699e2f321b077db7bd0e8994c440a55
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

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

Tests and tweeks of RuntimeFrameworkImplTest, Small fix to processor test

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Membership.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/EEnsembleParty.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/C1C2C3E1E2E3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-bures

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

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java

  Log Message:
  -----------
  Added equality/hashCode tests of KnowledgeChangeTrigger,
PeriodicTrigger, PathNodeMember, and PathNodeCoordinator.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Membership.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/EEnsembleParty.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/C1C2C3E1E2E3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

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

  Commit: 5bfbcde659a29af287d116e03e0f5ebc428d65e3
      https://github.com/d3scomp/JDEECo/commit/5bfbcde659a29af287d116e03e0f5ebc428d65e3
  Author: mkit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-12 (Tue, 12 Nov 2013)

  Changed paths:
    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/model/runtime/RuntimeModelHelper.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

  Log Message:
  -----------
  Merge pull request #101 from d3scomp/newgen-bures

Added equals/hashCode tests + some devel in EnsembleTask

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java

  Log Message:
  -----------
  Continuation of the EnsembleTask
Helper class for KnowledgePath handling and resolving

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

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Test change.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java

  Log Message:
  -----------
  Merge pull request #102 from d3scomp/newgen-bures

Newgen bures

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

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

  Log Message:
  -----------
  EnsembleTask devel + some update in ProcessTask

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java

  Log Message:
  -----------
  Id field added to the BaseKnowledgeManager + preprocessing of initial
knowledge removed from the BaseKnowledgeManager

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.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:
  -----------
  Seems that EnsembleTask + test is finishe.

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

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

  Log Message:
  -----------
  A small FIXME - not necessary to solve it now.

  Commit: 2eca3ded17a089070089a0d9a15e9c9a512ab178
      https://github.com/d3scomp/JDEECo/commit/2eca3ded17a089070089a0d9a15e9c9a512ab178
  Author: mkit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-13 (Wed, 13 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.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/ProcessTask.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:
  -----------
  Merge pull request #103 from d3scomp/newgen-bures

EnsembleTask + tests seems to be finished

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

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

  Log Message:
  -----------
  BaseKnowledgeManager update

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

  Changed paths:
    M jdeeco-architecture/.project
    M jdeeco-architecture/architecture-04.11.2013.emx
    M jdeeco-architecture/architecture-24.10.2013.emx
    M jdeeco-architecture/architecture-25.10.2013.emx
    M jdeeco-architecture/architecture-26.10.2013.emx
    M jdeeco-architecture/architecture-30.10.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    M jdeeco-core/.classpath
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Condition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.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/api/Exchange.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/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
    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/api/PeriodicTrigger.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/Trigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ConditionImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.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/ExchangeImpl.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/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
    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/PeriodicTriggerImpl.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/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
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
    M 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/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ChangeSetTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelHelper.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java

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

Conflicts:
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/SynchronizerManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/SynchronizerManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  KnowledgeManager container

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

  Changed paths:
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/Synchronizer.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/SynchronizerManager.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/SynchronizerManagerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/SynchronizerTest.java

  Log Message:
  -----------
  Stashing Synchronizer and SynchronizerManager

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

  Changed paths:
    M jdeeco-architecture/.project
    M jdeeco-architecture/architecture-04.11.2013.emx
    M jdeeco-architecture/architecture-24.10.2013.emx
    M jdeeco-architecture/architecture-25.10.2013.emx
    M jdeeco-architecture/architecture-26.10.2013.emx
    M jdeeco-architecture/architecture-30.10.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    M jdeeco-core/.classpath
    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/knowledge/BaseKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManager.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Condition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.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/api/Exchange.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/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
    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/api/PeriodicTrigger.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/Trigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ConditionImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.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/ExchangeImpl.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/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
    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/PeriodicTriggerImpl.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/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/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ChangeSetTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M 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/task/ProcessTaskTest.java

  Log Message:
  -----------
  Merge pull request #105 from d3scomp/newgen-kit

BaseKnowledgeManager update + KnowledgeManagerContainer update

  Commit: 760438f2a304dbe9a6059c255f7ed790e28c40ee
      https://github.com/d3scomp/JDEECo/commit/760438f2a304dbe9a6059c255f7ed790e28c40ee
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-15 (Fri, 15 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/ComponentProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Condition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.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/api/Exchange.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/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
    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/api/PeriodicTrigger.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/Trigger.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ConditionImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.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/ExchangeImpl.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/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
    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/PeriodicTriggerImpl.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/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

  Log Message:
  -----------
  new ecore merged

  Commit: 400a03a0b225631fa34faae047d169b077f2b8ed
      https://github.com/d3scomp/JDEECo/commit/400a03a0b225631fa34faae047d169b077f2b8ed
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ComponentIdentifier.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeComponentId.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeComponentIdImpl.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java

  Log Message:
  -----------
  updates in Annotation Processor

  Commit: 574eaa6180d338185e011c1f8728d6262c93f163
      https://github.com/d3scomp/JDEECo/commit/574eaa6180d338185e011c1f8728d6262c93f163
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-architecture/.project
    M jdeeco-architecture/architecture-04.11.2013.emx
    M jdeeco-architecture/architecture-24.10.2013.emx
    M jdeeco-architecture/architecture-25.10.2013.emx
    M jdeeco-architecture/architecture-26.10.2013.emx
    M 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/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManager.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ChangeSetTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M 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/task/KnowledgePathHelperTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java

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

Resolved Conflicts:
	jdeeco-core/model/RuntimeModel.ecore
	jdeeco-core/model/RuntimeModel.ecorediag
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataFactory.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java

  Commit: 1cb35859e2d778bda5547c4de81ab03304782559
      https://github.com/d3scomp/JDEECo/commit/1cb35859e2d778bda5547c4de81ab03304782559
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-15 (Fri, 15 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/SingleThreadedScheduler.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/scheduler/SingleThreadedSchedulerTest.java

  Log Message:
  -----------
  Merge pull request #104 from d3scomp/newgen-muradyan

SingleThreadedScheduler added with test class.

  Commit: da1d641dc671358adf77c03aca60d6e5ae2dfe6f
      https://github.com/d3scomp/JDEECo/commit/da1d641dc671358adf77c03aca60d6e5ae2dfe6f
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/model/RuntimeModel.ecore
    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

  Log Message:
  -----------
  changing isActive attribute in ecore to true

  Commit: 3d9cb6ca531e4b582bcf981a0c6f197b567a6589
      https://github.com/d3scomp/JDEECo/commit/3d9cb6ca531e4b582bcf981a0c6f197b567a6589
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/.classpath
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java

  Log Message:
  -----------
  fixing build.

  Commit: 43840cc5e00c91e773224af957940acf3db890b0
      https://github.com/d3scomp/JDEECo/commit/43840cc5e00c91e773224af957940acf3db890b0
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/.classpath
    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/pathparser/ComponentIdentifier.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
    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/ComponentProcess.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeComponentId.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/PathNodeComponentIdImpl.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/KnowledgePathHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java

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

updates in score and annotations processor

  Commit: a772d19dad2493bfdc4f40e99211b87196229c31
      https://github.com/d3scomp/JDEECo/commit/a772d19dad2493bfdc4f40e99211b87196229c31
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Follower.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Main.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Waypoint.java

  Log Message:
  -----------
  Testing demo

  Commit: 89fe6b6685e92559413b97ce3f856571a7263209
      https://github.com/d3scomp/JDEECo/commit/89fe6b6685e92559413b97ce3f856571a7263209
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/.classpath
    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/pathparser/ComponentIdentifier.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
    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/ComponentProcess.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeComponentId.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/PathNodeComponentIdImpl.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/KnowledgePathHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-keznikl

  Commit: 397f039e959c854b75e35695d3fc8ba137641c07
      https://github.com/d3scomp/JDEECo/commit/397f039e959c854b75e35695d3fc8ba137641c07
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.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/demo/convoy/ConvoyEnsemble.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Follower.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Main.java

  Log Message:
  -----------
  * convoy test
* a few bugfixes

  Commit: 8be907a41130a2b5115735cab0edc55dcc9aa114
      https://github.com/d3scomp/JDEECo/commit/8be907a41130a2b5115735cab0edc55dcc9aa114
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java

  Log Message:
  -----------
  failing test ignored (waits for AnnotationProcessor to be fixed)

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Follower.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Waypoint.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java

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

Convoy demo + test, some bugfixes

  Commit: 96c32b379d222eae339fcb8146d7a2b40bf0e304
      https://github.com/d3scomp/JDEECo/commit/96c32b379d222eae339fcb8146d7a2b40bf0e304
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.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

  Log Message:
  -----------
  * AnnotationProcessor creates ensemble controllers on the way
* Making convoy test pass

  Commit: 7704c3ef28f9e30c3b2380e848159293f9de99cd
      https://github.com/d3scomp/JDEECo/commit/7704c3ef28f9e30c3b2380e848159293f9de99cd
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi

  Log Message:
  -----------
  Making AnnotationParserTest pass (after introducing ensemble
controllers)

  Commit: 7d259dbdc1f44447b655e7af53a934b0812d6234
      https://github.com/d3scomp/JDEECo/commit/7d259dbdc1f44447b655e7af53a934b0812d6234
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-15 (Fri, 15 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    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

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

AnnotationProcessor convoy test update

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

  Changed paths:
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/OutWrapper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java

  Log Message:
  -----------
  OutWrapper replaced by ParamHolder

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

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

  Log Message:
  -----------
  Removed unused exception.

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

  Changed paths:
    A jdeeco-architecture/architecture-18.11.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    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/executor/SameThreadExecutor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManager.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistryImpl.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/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/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.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/Task.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Clean up.
FIXMEs.
Newly reverse-engineered architecture.

  Commit: d61e7eab50acacd7f0e9033c749bf006a2711b79
      https://github.com/d3scomp/JDEECo/commit/d61e7eab50acacd7f0e9033c749bf006a2711b79
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ComponentIdentifier.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.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/ProcessTask.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/samples/CorrectE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE5.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/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/task/KnowledgePathHelperTest.java

  Log Message:
  -----------
  KnowledgePathHelper and updates in AnnotationProcessor

  Commit: 3a347a1d0795a27cffb2d9215890becf0c37c3ac
      https://github.com/d3scomp/JDEECo/commit/3a347a1d0795a27cffb2d9215890becf0c37c3ac
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-18 (Mon, 18 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Follower.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Waypoint.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-iliasg

  Commit: 9f078fc182042f90790cac5fb8f1734ec286bb91
      https://github.com/d3scomp/JDEECo/commit/9f078fc182042f90790cac5fb8f1734ec286bb91
  Author: mkit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    A jdeeco-architecture/architecture-18.11.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    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/executor/SameThreadExecutor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManager.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    R 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/ShadowKnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistryImpl.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/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/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.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/Task.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/RobotFollowerComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Merge pull request #109 from d3scomp/newgen-bures

Cleanup, FIXMEs, newly reverse-engineered architecture

  Commit: 43a11fb88c9911cd33d3a61f5ece172b8f7cd01a
      https://github.com/d3scomp/JDEECo/commit/43a11fb88c9911cd33d3a61f5ece172b8f7cd01a
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-19 (Tue, 19 Nov 2013)

  Changed paths:
    A jdeeco-architecture/architecture-18.11.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    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/executor/SameThreadExecutor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManager.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    R 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/ShadowKnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistryImpl.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/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/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.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/annotations/processor/AnnotationProcessorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-iliasg

Resolved Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java

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

  Changed paths:
    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/ProcessTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java

  Log Message:
  -----------
  Javadoc on the way...

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

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-bures

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.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:
  -----------
  Javadoc for *.task hopefully finished.
One more FIXME for @mkit.

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.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/ProcessTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java

  Log Message:
  -----------
  Merge pull request #111 from d3scomp/newgen-bures

Javadoc for *.task (except for the Helper that waits for Ilias) finished + one more FIXME

  Commit: 78d61eb792763454bd42ca1fff06df0f90051872
      https://github.com/d3scomp/JDEECo/commit/78d61eb792763454bd42ca1fff06df0f90051872
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.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/ProcessTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/newgen' into newgen-iliasg

  Commit: b70dbff55cb6416590666ab59589281d02a07f54
      https://github.com/d3scomp/JDEECo/commit/b70dbff55cb6416590666ab59589281d02a07f54
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/logging/Logger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/ComponentInstanceRecord.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    M 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/runtime/package-info.java

  Log Message:
  -----------
  Comments and warning/bug fixes in runtime and logging

  Commit: 09369824c61f3d00b711d424fc01e986f95a3586
      https://github.com/d3scomp/JDEECo/commit/09369824c61f3d00b711d424fc01e986f95a3586
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-20 (Wed, 20 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/SameThreadExecutor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/package-info.java

  Log Message:
  -----------
  executor.* docs

  Commit: df924f3ca716dd7562479e43c8acee42918b6bea
      https://github.com/d3scomp/JDEECo/commit/df924f3ca716dd7562479e43c8acee42918b6bea
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Waypoint.java

  Log Message:
  -----------
  fixes in the convoy demo

  Commit: a5b554d95478c0e9a71d015c0473a2b2f49acb77
      https://github.com/d3scomp/JDEECo/commit/a5b554d95478c0e9a71d015c0473a2b2f49acb77
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-20 (Wed, 20 Nov 2013)

  Changed paths:
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  minor fixes in runtime tests

  Commit: d2cdc805334e1341ec58ed586a78c0b51d9dbe6d
      https://github.com/d3scomp/JDEECo/commit/d2cdc805334e1341ec58ed586a78c0b51d9dbe6d
  Author: rima-alali <alali at d3s.mff.cuni.cz>
  Date:   2013-11-20 (Wed, 20 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/SameThreadExecutor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/package-info.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/logging/Logger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/ComponentInstanceRecord.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    M 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/runtime/package-info.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Waypoint.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

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

comments and small bugfixes in packages executor/runtime/logging

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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ComponentIdentifier.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParserConstants.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.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/ProcessTask.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/samples/CorrectE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE5.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/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/task/KnowledgePathHelperTest.java

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

KnowledgePathHelper complete with tests

  Commit: 016d78e1067068d508b986006139779890cc5777
      https://github.com/d3scomp/JDEECo/commit/016d78e1067068d508b986006139779890cc5777
  Author: Jaroslav Keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.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
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  * refactoring of runtime (replacing of KMs goes from RFBuilder to
RFImpl)

* invokeAndWait in Scheduler and RF interface

  Commit: e5fe5a23c809a8e517249ebf246764165a712766
      https://github.com/d3scomp/JDEECo/commit/e5fe5a23c809a8e517249ebf246764165a712766
  Author: Andranik <muradian at d3s.mff.cuni.cz>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.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
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

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

runtime and scheduler updates

  Commit: 29b608ffe9aadaa723d77f1ad3ec54efa9f26d36
      https://github.com/d3scomp/JDEECo/commit/29b608ffe9aadaa723d77f1ad3ec54efa9f26d36
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M .gitignore
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/AnnotationProxy.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Component.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Ensemble.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/IValuedAnnotation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Knowledge.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Process.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/TriggerOnChange.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/package-info.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/EEnsembleParty.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/package-info.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.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/AnnotationProcessorException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/package-info.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/Path.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java

  Log Message:
  -----------
  Javadoc for annotation packages and some clean up

  Commit: 4ebf481b6f17cd764b61a91ba0b5212eccf293f7
      https://github.com/d3scomp/JDEECo/commit/4ebf481b6f17cd764b61a91ba0b5212eccf293f7
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-21 (Thu, 21 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/SameThreadExecutor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/package-info.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/logging/Logger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/ComponentInstanceRecord.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    M 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/runtime/package-info.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
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Waypoint.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/origin/newgen' into newgen-iliasg

  Commit: 2aa2440c67583b1345d90559f8acda5d16cbfe5d
      https://github.com/d3scomp/JDEECo/commit/2aa2440c67583b1345d90559f8acda5d16cbfe5d
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC5.java

  Log Message:
  -----------
  Exception handling in more corner cases in AnnotationProcessor

  Commit: 78f49cc2825b64ac0d671dbb0394ef2df6f3f64e
      https://github.com/d3scomp/JDEECo/commit/78f49cc2825b64ac0d671dbb0394ef2df6f3f64e
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java

  Log Message:
  -----------
  small fix and a TODO

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

  Changed paths:
    M jdeeco-core/.classpath
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistry.java

  Log Message:
  -----------
  containers comments and FIXME in ShadowKnowledgeManagerRegistry

  Commit: 2e5d9074dc93cb25bf959386ac5f6dffde7c706c
      https://github.com/d3scomp/JDEECo/commit/2e5d9074dc93cb25bf959386ac5f6dffde7c706c
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M jdeeco-core/.classpath
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistry.java

  Log Message:
  -----------
  Merge pull request #115 from rima-alali/newgen

Please avoid committing .classpath unless really necessary. Also, check your autoclrf settings of GIT and the line endings of your files to avoid committing change sets involving whole files (all your changes cover the whole files, so each line of the files you committed appears as changed and may lead to significant conflicts, please check this every time before committing since it is really hard to revert it once you do that).

containers comments and FIXME in ShadowKnowledgeManagerRegistry

  Commit: a12597aa3159853307d3344b642158e5ed52ddf6
      https://github.com/d3scomp/JDEECo/commit/a12597aa3159853307d3344b642158e5ed52ddf6
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  Changed paths:
    M .gitignore
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/AnnotationProxy.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Component.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Ensemble.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/IValuedAnnotation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Knowledge.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Process.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/TriggerOnChange.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/package-info.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/EEnsembleParty.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/package-info.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.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/AnnotationProcessorException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/package-info.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/Path.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC5.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java

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

Javadoc + Clean Up + some additions

  Commit: 7a77e69f052acba3b55cf5a9d530afa710850659
      https://github.com/d3scomp/JDEECo/commit/7a77e69f052acba3b55cf5a9d530afa710850659
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  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/AnnotationProcessorException.java

  Log Message:
  -----------
  javadoc added in AnnotationProcessorException

  Commit: c61e36e774297dbb61ae16e8f6f49d756ea38a54
      https://github.com/d3scomp/JDEECo/commit/c61e36e774297dbb61ae16e8f6f49d756ea38a54
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

  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/AnnotationProcessorException.java

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

javadoc added in AnnotationProcessorException

  Commit: 9fd64cd6204a13e70df43ddc7a361bd6e942783d
      https://github.com/d3scomp/JDEECo/commit/9fd64cd6204a13e70df43ddc7a361bd6e942783d
  Author: rima-alali <alali at d3s.mff.cuni.cz>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

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

  Log Message:
  -----------
  comments on ShadowKnowledgeManagerRegistry

  Commit: 111aec2a06b26f92e0fa138c326c6a73588fba51
      https://github.com/d3scomp/JDEECo/commit/111aec2a06b26f92e0fa138c326c6a73588fba51
  Author: rima-alali <alali at d3s.mff.cuni.cz>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

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

  Log Message:
  -----------
  comments on ShaowKowledgeMnagerRegistry

  Commit: 471c9fdae3348fd777853ee173cb86d6f0c15a98
      https://github.com/d3scomp/JDEECo/commit/471c9fdae3348fd777853ee173cb86d6f0c15a98
  Author: rima-alali <alali at d3s.mff.cuni.cz>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

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

  Log Message:
  -----------
  comments on ShadowKnowledgeManagerRegistry

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

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

  Log Message:
  -----------
  trying to use PMD

  Commit: 01b1c07a21e973d8a0668365f4d1645b21d315a0
      https://github.com/d3scomp/JDEECo/commit/01b1c07a21e973d8a0668365f4d1645b21d315a0
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-28 (Thu, 28 Nov 2013)

  Changed paths:
    M README.md

  Log Message:
  -----------
  Update README.md

  Commit: 6c42a57a052367cee5d62f9978a9851107761e33
      https://github.com/d3scomp/JDEECo/commit/6c42a57a052367cee5d62f9978a9851107761e33
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-11-29 (Fri, 29 Nov 2013)

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

  Log Message:
  -----------
  Merge pull request #118 from rima-alali/newgen

  Commit: 6886471884ef54523c2c412ea8d64a77f45a338e
      https://github.com/d3scomp/JDEECo/commit/6886471884ef54523c2c412ea8d64a77f45a338e
  Author: Andranik Muradyan <muradian at d3s.mff.cuni.cz>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    M .gitignore
    M README.md
    M jdeeco-architecture/.project
    M jdeeco-architecture/architecture-04.11.2013.emx
    A jdeeco-architecture/architecture-18.11.2013.emx
    M jdeeco-architecture/architecture-24.10.2013.emx
    M jdeeco-architecture/architecture-25.10.2013.emx
    M jdeeco-architecture/architecture-26.10.2013.emx
    M jdeeco-architecture/architecture-30.10.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    M jdeeco-core/.classpath
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    M jdeeco-core/pom.xml
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/AnnotationProxy.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Component.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Ensemble.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/IValuedAnnotation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Knowledge.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Membership.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Process.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/TriggerOnChange.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/package-info.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ComponentIdentifier.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/EEnsembleParty.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/package-info.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.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/AnnotationProcessorException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/package-info.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/SameThreadExecutor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/package-info.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManager.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistry.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    R 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/ReplicaKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistryImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/logging/Logger.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Condition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.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/api/Exchange.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/PathNodeComponentId.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/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/PathNodeMember.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PeriodicTrigger.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/Trigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.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
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ConditionImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.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/ExchangeImpl.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/PathNodeComponentIdImpl.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/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/PathNodeMemberImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PeriodicTriggerImpl.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/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/runtime/ComponentInstanceRecord.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    M 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/runtime/package-info.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
    M 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/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.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/Path.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/C1C2C3E1E2E3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC5.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE5.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Follower.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Waypoint.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ChangeSetTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelHelper.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
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java

  Log Message:
  -----------
  resolving conflicts
Merge remote-tracking branch 'remotes/origin/newgen' into newgen-muradyan

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java

  Commit: 459751c064fa9859796cf2676b571a4743351825
      https://github.com/d3scomp/JDEECo/commit/459751c064fa9859796cf2676b571a4743351825
  Author: Andranik Muradyan <muradian at d3s.mff.cuni.cz>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/.gitignore
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java

  Log Message:
  -----------
  yet another conflict resolving attempt

Compare: https://github.com/d3scomp/JDEECo/compare/090bc853c56d...459751c064fa