[DEECo] [d3scomp/JDEECo] ab1edc: dynamic deployment - in progress

[GitHub]

  Branch: refs/heads/plugin-architecture
  Home:   https://github.com/d3scomp/JDEECo
  Commit: ab1edccb112f0fc1f677ecac690037c4f8717f8c
      https://github.com/d3scomp/JDEECo/commit/ab1edccb112f0fc1f677ecac690037c4f8717f8c
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/EnsembleTask.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/ModelValidatorTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/demo/convoy/ConvoyEnsemble.java
    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/network/TestSerializer.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/security/runtime/SecurityRuntimeModel.java

  Log Message:
  -----------
  dynamic deployment - in progress


  Commit: 0b2afbdb9340bc6e1ca04c561ad843cbaac5fa22
      https://github.com/d3scomp/JDEECo/commit/0b2afbdb9340bc6e1ca04c561ad843cbaac5fa22
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M jdeeco-architecture/.gitignore
    M jdeeco-architecture/.project
    M jdeeco-architecture/2014/OMNetIntegration-Scheduler.dnx
    M jdeeco-architecture/2014/OMNetIntegration-Synchronizer.dnx
    M jdeeco-architecture/2014/architecture-2013-10-24.emx
    M jdeeco-architecture/2014/architecture-2013-10-25.emx
    M jdeeco-architecture/2014/architecture-2013-10-26.emx
    M jdeeco-architecture/2014/architecture-2013-10-30.emx
    M jdeeco-architecture/2014/architecture-2013-11-04.emx
    M jdeeco-architecture/2014/architecture-2013-11-18.emx
    M jdeeco-architecture/2014/architecture-2013-12-11.emx
    M jdeeco-architecture/2014/jDEECo-OMNet-MATSim.dnx
    M jdeeco-architecture/2014/jDEECo-OMNet.dnx
    M jdeeco-architecture/2014/reverse-jdeeco-core.tc
    M jdeeco-architecture/2015/architecture-2015-02-04.emx
    M jdeeco-core/model/RuntimeModel.ecore
    M jdeeco-core/model/RuntimeModel.ecorediag
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/CycleDetectedException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPlugin.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECoPluginContainer.java
    A jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/MissingDependencyException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/PluginDependencyException.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImpl.java
    A jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

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

Conflicts:
	jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
	jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java


  Commit: 2481a631c14243d654318fe91efe02e9786bf3ca
      https://github.com/d3scomp/JDEECo/commit/2481a631c14243d654318fe91efe02e9786bf3ca
  Author: Ilias Gerostathopoulos <iliasger at gmail.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessor.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/runtime/DEECo.java
    M jdeeco-core/src/cz/cuni/mff/d3s/deeco/task/ProcessContext.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/AnnotationProcessorTest.java
    R jdeeco-core/test/cz/cuni/mff/d3s/deeco/annotations/processor/input/samples/WrongCE2.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/DEECoTest.java
    M jdeeco-core/test/cz/cuni/mff/d3s/deeco/runtime/RuntimeFrameworkImplTest.java

  Log Message:
  -----------
  fixing tests for dynamic deployment and plugin functionality


Compare: https://github.com/d3scomp/JDEECo/compare/f27f430ca19e...2481a631c142