[DEECo] [d3scomp/JDEECo] c4a245: containers comments and FIXME in ShadowKnowledgeMa...

GitHub noreply at github.com
Tue Dec 3 16:52:24 CET 2013 

  Branch: refs/heads/newgen-iliasg
  Home:   https://github.com/d3scomp/JDEECo
  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: c61e36e774297dbb61ae16e8f6f49d756ea38a54
      https://github.com/d3scomp/JDEECo/commit/c61e36e774297dbb61ae16e8f6f49d756ea38a54
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-11-21 (Thu, 21 Nov 2013)

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

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

javadoc added in AnnotationProcessorException


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

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

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


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

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

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


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

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

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


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

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

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


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

  Changed paths:
    M README.md

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


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

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

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


  Commit: c095875601e117bf265bf27747870d8459f34049
      https://github.com/d3scomp/JDEECo/commit/c095875601e117bf265bf27747870d8459f34049
  Author: rima-alali <alali at d3s.mff.cuni.cz>
  Date:   2013-12-01 (Sun, 01 Dec 2013)

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

  Log Message:
  -----------
  try to add changes on comments of containers and
ShadowKnowledgeManagerRegistery


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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/package-info.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java

  Log Message:
  -----------
  Documentation added to classes.
package-info.java added to scheduler package


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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/package-info.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java

  Log Message:
  -----------
  Documentation added to classes.
package-info.java added to scheduler package


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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/package-info.java

  Log Message:
  -----------
  new line added to package-info.java


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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/package-info.java

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

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/package-info.java


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

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

  Log Message:
  -----------
  test


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

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

  Log Message:
  -----------
  test2


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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java

  Log Message:
  -----------
  sorry guys, I have to do this because of the line ending conflict


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

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java

  Log Message:
  -----------
  Final and hopefully automergable


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

  Changed paths:
    M .gitignore
    M README.md
    M jdeeco-architecture/.project
    M jdeeco-architecture/architecture-04.11.2013.emx
    A jdeeco-architecture/architecture-18.11.2013.emx
    M jdeeco-architecture/architecture-24.10.2013.emx
    M jdeeco-architecture/architecture-25.10.2013.emx
    M jdeeco-architecture/architecture-26.10.2013.emx
    M jdeeco-architecture/architecture-30.10.2013.emx
    M jdeeco-architecture/reverse-jdeeco-core.tc
    M jdeeco-core/.classpath
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    M jdeeco-core/model/RuntimeModel.genmodel
    M jdeeco-core/pom.xml
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/AnnotationProxy.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Component.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Ensemble.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/IValuedAnnotation.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/In.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/InOut.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Knowledge.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Membership.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Out.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/PeriodicScheduling.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/Process.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/TriggerOnChange.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/package-info.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/ComponentIdentifier.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/EEnsembleParty.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PNode.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathGrammar.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/PathParser.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/pathparser/package-info.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationParsingException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/package-info.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/ExecutionListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/Executor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/SameThreadExecutor.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/executor/package-info.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainer.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManager.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerException.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImpl.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistry.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersView.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeNotFoundException.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/LocalListener.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/OutWrapper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReadOnlyKnowledgeManager.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaKnowledgeManagerContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ReplicaListener.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistry.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowKnowledgeManagerRegistryImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/knowledge/ShadowsTriggerListener.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/logging/Logger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentInstance.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ComponentProcess.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Condition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleController.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/EnsembleDefinition.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Exchange.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Invocable.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/KnowledgeChangeTrigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/KnowledgePath.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Parameter.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/ParameterDirection.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNode.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeComponentId.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeCoordinator.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeField.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMapKey.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PathNodeMember.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/PeriodicTrigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/RuntimeMetadata.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/api/Trigger.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgeChangeTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/KnowledgePathExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeCoordinatorExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeFieldExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PathNodeMemberExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/PeriodicTriggerExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/custom/RuntimeMetadataFactoryExt.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentInstanceImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ComponentProcessImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ConditionImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleControllerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/EnsembleDefinitionImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ExchangeImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/InvocableImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/KnowledgeChangeTriggerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/KnowledgePathImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/ParameterImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeComponentIdImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeCoordinatorImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeFieldImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMapKeyImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PathNodeMemberImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/PeriodicTriggerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataFactoryImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/RuntimeMetadataPackageImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/impl/TriggerImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataFactory.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/model/runtime/meta/RuntimeMetadataPackage.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/ComponentInstanceRecord.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfiguration.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFramework.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/package-info.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    R jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelper.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ParamHolder.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessTask.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/Task.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskInvocationException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/TaskTriggerListener.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/Path.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotFollowerComponent.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/RobotLeaderComponent.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/C1C2C3E1E2E3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/CorrectE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongC5.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE1.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE2.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE3.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE4.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongE5.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/C1C2C3E1E2E3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectC3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE1.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE2.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/output/CorrectE3.xmi
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Follower.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Leader.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/Waypoint.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/BaseKnowledgeManagerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/ChangeSetTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerContainerTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/CloningKnowledgeManagerTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerRegistryTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagerViewImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/knowledge/KnowledgeManagersViewTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelHelper.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/RuntimeModelTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/model/runtime/SampleRuntimeModel.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeConfigurationTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkBuilderTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/LocalTimeSchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/EnsembleTaskTest.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/KnowledgePathHelperTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/task/ProcessTaskTest.java

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

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


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

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

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


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

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

  Log Message:
  -----------
  javadoc added.
LocalTimeScheduler removed.


  Commit: 211f45bfc2428d7f58c5ee9befb12754b121fb77
      https://github.com/d3scomp/JDEECo/commit/211f45bfc2428d7f58c5ee9befb12754b121fb77
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-12-02 (Mon, 02 Dec 2013)

  Changed paths:
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/.gitignore
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/Scheduler.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedScheduler.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/scheduler/package-info.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SchedulerTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/scheduler/SingleThreadedSchedulerTest.java

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

Newgen muradyan


  Commit: 3e96f0fe67c604f52dec96d39237f5909dc7ba77
      https://github.com/d3scomp/JDEECo/commit/3e96f0fe67c604f52dec96d39237f5909dc7ba77
  Author: keznikl <jaroslav.keznikl at gmail.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

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

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

try to add changes on comments of containers and


  Commit: 319d5da24bb507cf4d0f539c8476bc1eaea50370
      https://github.com/d3scomp/JDEECo/commit/319d5da24bb507cf4d0f539c8476bc1eaea50370
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2013-12-03 (Tue, 03 Dec 2013)

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

  Log Message:
  -----------
  warning added


Compare: https://github.com/d3scomp/JDEECo/compare/7a77e69f052a...319d5da24bb5

More information about the DEECo mailing list