[DEECo] [d3scomp/JDEECo] cc230a: Updates, but not working yet.

GitHub noreply at github.com
Fri Nov 15 15:30:35 CET 2013 

  Branch: refs/heads/newgen-iliasg
  Home:   https://github.com/d3scomp/JDEECo
  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: 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: 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: 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: 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


Compare: https://github.com/d3scomp/JDEECo/compare/a08458a7bf9b...574eaa6180d3

More information about the DEECo mailing list