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

GitHub noreply at github.com
Fri Nov 8 09:33:54 CET 2013 

  Branch: refs/heads/newgen-kit
  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: 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: 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


Compare: https://github.com/d3scomp/JDEECo/compare/bb97821a2c78...e0e27a276879

More information about the DEECo mailing list