[DEECo] [d3scomp/JDEECo] d61e7e: KnowledgePathHelper and updates in AnnotationProce...

GitHub noreply at github.com
Fri Nov 22 09:44:40 CET 2013 

  Branch: refs/heads/newgen-kit
  Home:   https://github.com/d3scomp/JDEECo
  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: 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: 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: 020a94574aa54489f5793349f1c3967f73d72514
      https://github.com/d3scomp/JDEECo/commit/020a94574aa54489f5793349f1c3967f73d72514
  Author: Michał Kit <kit at d3s.mff.cuni.cz>
  Date:   2013-11-22 (Fri, 22 Nov 2013)

  Changed paths:
    M .gitignore
    M jdeeco-core/.classpath
    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/ComponentIdentifier.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/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
    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
    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
    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/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/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/annotations/processor/input/samples/CorrectE3.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/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/demo/convoy/ConvoyTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/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
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java

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

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java


Compare: https://github.com/d3scomp/JDEECo/compare/b3e7b14ba98d...020a94574aa5

More information about the DEECo mailing list