[DEECo] [d3scomp/JDEECo] 78d61e: Merge remote-tracking branch 'origin/newgen' into ...

GitHub noreply at github.com
Thu Nov 21 20:36:22 CET 2013


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


Compare: https://github.com/d3scomp/JDEECo/compare/2e5d9074dc93...a12597aa3159


More information about the DEECo mailing list